[gnome-shell/wip/classic: 3/4] main: Use the schema for the current mode to override 'button-layout'

[Debarshi Ray <debarshir src gnome org>]

commit 8b5d07c1a5afd44e46598b691b77349416c1c2d4
Author: Debarshi Ray <debarshir gnome org>
Date:   Wed Nov 28 19:20:02 2012 +0100

    main: Use the schema for the current mode to override 'button-layout'
    
    https://bugzilla.gnome.org/show_bug.cgi?id=689234

 js/ui/main.js |    2 ++
 src/main.c    |    2 --
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/js/ui/main.js b/js/ui/main.js
index d9ffda7..477b77e 100644
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -109,6 +109,8 @@ function start() {
     Gio.DesktopAppInfo.set_desktop_env('GNOME');
 
     sessionMode = new SessionMode.SessionMode();
+    Meta.prefs_override_preference_schema(sessionMode.buttonLayout[0], sessionMode.buttonLayout[1]);
+
     shellDBusService = new ShellDBus.GnomeShell();
     shellMountOpDBusService = new ShellMountOperation.GnomeShellMountOpHandler();
 
diff --git a/src/main.c b/src/main.c
index a07b5c4..179eef5 100644
--- a/src/main.c
+++ b/src/main.c
@@ -174,8 +174,6 @@ shell_prefs_init (void)
                                          OVERRIDES_SCHEMA);
   meta_prefs_override_preference_schema ("workspaces-only-on-primary",
                                          OVERRIDES_SCHEMA);
-  meta_prefs_override_preference_schema ("button-layout",
-                                         OVERRIDES_SCHEMA);
   meta_prefs_override_preference_schema ("edge-tiling",
                                          OVERRIDES_SCHEMA);
   meta_prefs_override_preference_schema ("focus-change-on-pointer-rest",