From 28585a817a9ab72d6bc9331b9331d0cc75bdb88d Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 28 Nov 2012 19:21:15 +0100 Subject: [PATCH] workspace: Use the schema for the current mode to get 'button-layout' https://bugzilla.gnome.org/show_bug.cgi?id=689234 --- js/ui/workspace.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/js/ui/workspace.js b/js/ui/workspace.js index ef7c9d62a..afe748d33 100644 --- a/js/ui/workspace.js +++ b/js/ui/workspace.js @@ -30,9 +30,6 @@ const CLOSE_BUTTON_FADE_TIME = 0.1; const DRAGGING_WINDOW_OPACITY = 100; -const BUTTON_LAYOUT_SCHEMA = 'org.gnome.shell.overrides'; -const BUTTON_LAYOUT_KEY = 'button-layout'; - // When calculating a layout, we calculate the scale of windows and the percent // of the available area the new layout uses. If the values for the new layout, // when weighted with the values as below, are worse than the previous layout's, @@ -554,8 +551,8 @@ const WindowOverlay = new Lang.Class({ let button = this.closeButton; let title = this.title; - let settings = new Gio.Settings({ schema: BUTTON_LAYOUT_SCHEMA }); - let layout = settings.get_string(BUTTON_LAYOUT_KEY); + let settings = new Gio.Settings({ schema: Main.sessionMode.buttonLayout[1] }); + let layout = settings.get_string(Main.sessionMode.buttonLayout[0]); let rtl = Clutter.get_default_text_direction() == Clutter.TextDirection.RTL; let split = layout.split(":");