From 997eb9a66bf410fe13520dedd6b07c613d529ab3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= Date: Mon, 13 Oct 2014 22:18:22 +0200 Subject: [PATCH] Move button-layout to metacity schema The default in gsettings-desktop-schemas has changed to not include minimize and maximize to match the default of client-side decorations in GTK+, so start using our schema to bring them back by default. --- src/core/prefs.c | 2 +- src/org.gnome.metacity.gschema.xml.in | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/core/prefs.c b/src/core/prefs.c index 3820ba9..dc448b8 100644 --- a/src/core/prefs.c +++ b/src/core/prefs.c @@ -394,7 +394,7 @@ static MetaStringPreference preferences_string[] = }, { { "button-layout", - SCHEMA_GENERAL, + SCHEMA_METACITY, META_PREF_BUTTON_LAYOUT, }, button_layout_handler, diff --git a/src/org.gnome.metacity.gschema.xml.in b/src/org.gnome.metacity.gschema.xml.in index 6b4eb0d..b1c0ed7 100644 --- a/src/org.gnome.metacity.gschema.xml.in +++ b/src/org.gnome.metacity.gschema.xml.in @@ -53,7 +53,21 @@ workspaces, or "random" to place new windows at random locations within their workspaces. - + + + ':minimize,maximize,close' + <_summary>Arrangement of buttons on the titlebar + <_description> + Arrangement of buttons on the titlebar. The value should be a string, + such as "menu:minimize,maximize,spacer,close"; the colon separates + the left corner of the window from the right corner, and the button + names are comma-separated. Duplicate buttons are not allowed. Unknown + button names are silently ignored so that buttons can be added in + future metacity versions without breaking older versions. A special + spacer tag can be used to insert some space between + two adjacent buttons. + + -- 2.1.2