Merge lp:~muktupavels/compiz/gwd-improve-settings-storage into lp:compiz/0.9.12

[Alberts Muktupāvels]

gtk-window-decorator: improve GWDSettingsStorage

- Remove unused GSettings schemas from tests.
- If gtk-window-decorator is used with GNOME session other than GNOME-Flashback then use theme from org.gnome.desktop.wm.preferences schema.
- Don't create GSettings objects for schemas that is not needed in current desktop.

- Remove unused GSettings schemas from tests.
- If gtk-window-decorator is used with GNOME session other than GNOME-Flashback then use theme from org.gnome.desktop.wm.preferences schema.
- Don't create GSettings objects for schemas that is not needed in current desktop.

[Sam Spilsbury (smspillaz)]

Have some minor nits and questions

[Marco Trevisan (Treviño) (3v1n0)]

Good one

review: Approve

=== modified file 'gtk/window-decorator/gwd-settings-storage.c'
--- gtk/window-decorator/gwd-settings-storage.c	2016-05-21 10:36:31 +0000
+++ gtk/window-decorator/gwd-settings-storage.c	2016-06-01 13:36:56 +0000
@@ -1,3 +1,5 @@
+/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4; tab-width: 4 -*- */
+
 /*
  * Copyright © 2012 Canonical Ltd
  *
@@ -18,16 +20,18 @@
  * Authored By: Sam Spilsbury <[e-mail]>
  */
 
-#include <glib-object.h>
-#include <glib.h>
-
-#include <gio/gio.h>
-
-#include <string.h>
+#include "config.h"
+
+#include <gtk/gtk.h>
 
 #include "gwd-settings.h"
 #include "gwd-settings-storage.h"
 
+static const gchar * ORG_COMPIZ_GWD = "org.compiz.gwd";
+static const gchar * ORG_GNOME_DESKTOP_WM_PREFERENCES = "org.gnome.desktop.wm.preferences";
+static const gchar * ORG_GNOME_METACITY = "org.gnome.metacity";
+static const gchar * ORG_MATE_MARCO_GENERAL = "org.mate.Marco.general";
+
 static const gchar * ORG_COMPIZ_GWD_KEY_USE_TOOLTIPS = "use-tooltips";
 static const gchar * ORG_COMPIZ_GWD_KEY_BLUR_TYPE = "blur-type";
 static const gchar * ORG_COMPIZ_GWD_KEY_METACITY_THEME_ACTIVE_OPACITY = "metacity-theme-active-opacity";
@@ -55,18 +59,27 @@
 static const gchar * ORG_MATE_MARCO_GENERAL_TITLEBAR_FONT = "titlebar-font";
 static const gchar * ORG_MATE_MARCO_GENERAL_BUTTON_LAYOUT = "button-layout";
 
+typedef enum
+{
+    GWD_DESKTOP_GNOME,
+    GWD_DESKTOP_GNOME_FLASHBACK,
+    GWD_DESKTOP_MATE
+} GWDDesktop;
+
 struct _GWDSettingsStorage
 {
     GObject      parent;
 
     GWDSettings *settings;
 
+    GWDDesktop   current_desktop;
+
     GSettings   *gwd;
     GSettings   *desktop;
     GSettings   *metacity;
     GSettings   *marco;
 
-    gboolean     is_mate_desktop;
+    gulong       gtk_decoration_layout_id;
 };
 
 enum
@@ -82,14 +95,48 @@
 
 G_DEFINE_TYPE (GWDSettingsStorage, gwd_settings_storage, G_TYPE_OBJECT)
 
+static gchar *
+button_layout_from_gtk_decoration_layout (const gchar *gtk_decoration_layout)
+{
+    gchar **sides = g_strsplit (gtk_decoration_layout, ":", -1);
+    gchar *button_layout;
+    gint i;
+
+    for (i = 0; sides[i]; i++) {
+        gchar **buttons = g_strsplit (sides[i], ",", -1);
+        gint j;
+
+        for (j = 0; buttons[j]; j++) {
+            const gchar *button = NULL;
+
+            if (g_strcmp0 (buttons[j], "icon") == 0)
+                button = "menu";
+            else if (g_strcmp0 (buttons[j], "menu") == 0)
+                button = "appmenu";
+
+            if (button) {
+                g_free (buttons[j]);
+                buttons[j] = g_strdup (button);
+            }
+        }
+
+        g_free (sides[i]);
+        sides[i] = g_strjoinv (",", buttons);
+
+        g_strfreev (buttons);
+    }
+
+    button_layout = g_strjoinv (":", sides);
+    g_strfreev (sides);
+
+    return button_layout;
+}
+
 static inline GSettings *
 get_settings_no_abort (const gchar *schema)
 {
-    GSettingsSchemaSource *source;
-    GSettings *settings;
-
-    source = g_settings_schema_source_get_default ();
-    settings = NULL;
+    GSettingsSchemaSource *source = g_settings_schema_source_get_default ();
+    GSettings *settings = NULL;
 
     if (g_settings_schema_source_lookup (source, schema, TRUE))
         settings = g_settings_new (schema);
@@ -145,12 +192,15 @@
 
     use_metacity_theme = g_settings_get_boolean (storage->gwd, ORG_COMPIZ_GWD_KEY_USE_METACITY_THEME);
 
-    if (storage->is_mate_desktop)
+    if (storage->current_desktop == GWD_DESKTOP_MATE && storage->marco) {
         theme = g_settings_get_string (storage->marco, ORG_MATE_MARCO_GENERAL_THEME);
-    else if (storage->metacity)
+    } else if (storage->current_desktop == GWD_DESKTOP_GNOME_FLASHBACK && storage->metacity) {
         theme = g_settings_get_string (storage->metacity, ORG_GNOME_METACITY_THEME);
-    else
+    } else if (storage->desktop) {
+        theme = g_settings_get_string (storage->desktop, ORG_GNOME_DESKTOP_WM_PREFERENCES_THEME);
+    } else {
         return;
+    }
 
     gwd_settings_metacity_theme_changed (storage->settings, use_metacity_theme, theme);
     g_free (theme);
@@ -181,12 +231,21 @@
 {
     gchar *button_layout;
 
-    if (storage->is_mate_desktop)
+    if (storage->current_desktop == GWD_DESKTOP_MATE && storage->marco) {
         button_layout = g_settings_get_string (storage->marco, ORG_MATE_MARCO_GENERAL_BUTTON_LAYOUT);
-    else if (storage->desktop)
+    } else if (storage->current_desktop == GWD_DESKTOP_GNOME_FLASHBACK) {
+        GtkSettings *settings = gtk_settings_get_default ();
+        gchar *gtk_decoration_layout = NULL;
+
+        g_object_get (settings, "gtk-decoration-layout", &gtk_decoration_layout, NULL);
+
+        button_layout = button_layout_from_gtk_decoration_layout (gtk_decoration_layout);
+        g_free (gtk_decoration_layout);
+    } else if (storage->desktop) {
         button_layout = g_settings_get_string (storage->desktop, ORG_GNOME_DESKTOP_WM_PREFERENCES_BUTTON_LAYOUT);
-    else
+    } else {
         return;
+    }
 
     gwd_settings_button_layout_changed (storage->settings, button_layout);
     g_free (button_layout);
@@ -195,17 +254,18 @@
 void
 update_font (GWDSettingsStorage *storage)
 {
+    gboolean titlebar_system_font;
     gchar *titlebar_font;
-    gboolean titlebar_system_font;
 
-    if (storage->is_mate_desktop) {
+    if (storage->current_desktop == GWD_DESKTOP_MATE && storage->marco) {
+        titlebar_system_font = g_settings_get_boolean (storage->marco, ORG_MATE_MARCO_GENERAL_TITLEBAR_USES_SYSTEM_FONT);
         titlebar_font = g_settings_get_string (storage->marco, ORG_MATE_MARCO_GENERAL_TITLEBAR_FONT);
-        titlebar_system_font = g_settings_get_boolean (storage->marco, ORG_MATE_MARCO_GENERAL_TITLEBAR_USES_SYSTEM_FONT);
     } else if (storage->desktop) {
+        titlebar_system_font = g_settings_get_boolean (storage->desktop, ORG_GNOME_DESKTOP_WM_PREFERENCES_TITLEBAR_USES_SYSTEM_FONT);
         titlebar_font = g_settings_get_string (storage->desktop, ORG_GNOME_DESKTOP_WM_PREFERENCES_TITLEBAR_FONT);
-        titlebar_system_font = g_settings_get_boolean (storage->desktop, ORG_GNOME_DESKTOP_WM_PREFERENCES_TITLEBAR_USES_SYSTEM_FONT);
-    } else
+    } else {
         return;
+    }
 
     gwd_settings_font_changed (storage->settings, titlebar_system_font, titlebar_font);
     g_free (titlebar_font);
@@ -222,7 +282,7 @@
     if (!storage->gwd)
         return;
 
-    if (storage->is_mate_desktop) {
+    if (storage->current_desktop == GWD_DESKTOP_MATE && storage->marco) {
         double_click_action = g_settings_get_string (storage->marco, ORG_MATE_MARCO_GENERAL_ACTION_DOUBLE_CLICK_TITLEBAR);
         middle_click_action = g_settings_get_string (storage->marco, ORG_MATE_MARCO_GENERAL_ACTION_MIDDLE_CLICK_TITLEBAR);
         right_click_action = g_settings_get_string (storage->marco, ORG_MATE_MARCO_GENERAL_ACTION_RIGHT_CLICK_TITLEBAR);
@@ -230,8 +290,9 @@
         double_click_action = g_settings_get_string (storage->desktop, ORG_GNOME_DESKTOP_WM_PREFERENCES_ACTION_DOUBLE_CLICK_TITLEBAR);
         middle_click_action = g_settings_get_string (storage->desktop, ORG_GNOME_DESKTOP_WM_PREFERENCES_ACTION_MIDDLE_CLICK_TITLEBAR);
         right_click_action = g_settings_get_string (storage->desktop, ORG_GNOME_DESKTOP_WM_PREFERENCES_ACTION_RIGHT_CLICK_TITLEBAR);
-    } else
+    } else {
         return;
+    }
 
     translate_dashes_to_underscores (double_click_action);
     translate_dashes_to_underscores (middle_click_action);
@@ -319,11 +380,17 @@
 }
 
 static void
+gtk_decoration_layout_changed (GtkSettings        *settings,
+                               GParamSpec         *pspec,
+                               GWDSettingsStorage *storage)
+{
+    update_button_layout (storage);
+}
+
+static void
 gwd_settings_storage_constructed (GObject *object)
 {
-    GWDSettingsStorage *storage;
-
-    storage = GWD_SETTINGS_STORAGE (object);
+    GWDSettingsStorage *storage = GWD_SETTINGS_STORAGE (object);
 
     G_OBJECT_CLASS (gwd_settings_storage_parent_class)->constructed (object);
 
@@ -363,9 +430,7 @@
 static void
 gwd_settings_storage_dispose (GObject *object)
 {
-    GWDSettingsStorage *storage;
-
-    storage = GWD_SETTINGS_STORAGE (object);
+    GWDSettingsStorage *storage = GWD_SETTINGS_STORAGE (object);
 
     g_clear_object (&storage->settings);
 
@@ -374,6 +439,13 @@
     g_clear_object (&storage->metacity);
     g_clear_object (&storage->marco);
 
+    if (storage->gtk_decoration_layout_id > 0) {
+        GtkSettings *settings = gtk_settings_get_default ();
+
+        g_signal_handler_disconnect (settings, storage->gtk_decoration_layout_id);
+        storage->gtk_decoration_layout_id = 0;
+    }
+
     G_OBJECT_CLASS (gwd_settings_storage_parent_class)->dispose (object);
 }
 
@@ -383,9 +455,7 @@
                                    const GValue *value,
                                    GParamSpec   *pspec)
 {
-    GWDSettingsStorage *storage;
-
-    storage = GWD_SETTINGS_STORAGE (object);
+    GWDSettingsStorage *storage = GWD_SETTINGS_STORAGE (object);
 
     switch (property_id) {
         case PROP_SETTINGS:
@@ -401,9 +471,7 @@
 static void
 gwd_settings_storage_class_init (GWDSettingsStorageClass *storage_class)
 {
-    GObjectClass *object_class;
-
-    object_class = G_OBJECT_CLASS (storage_class);
+    GObjectClass *object_class = G_OBJECT_CLASS (storage_class);
 
     object_class->constructed = gwd_settings_storage_constructed;
     object_class->dispose = gwd_settings_storage_dispose;
@@ -422,31 +490,48 @@
 void
 gwd_settings_storage_init (GWDSettingsStorage *storage)
 {
-    storage->gwd = get_settings_no_abort ("org.compiz.gwd");
-    storage->desktop = get_settings_no_abort ("org.gnome.desktop.wm.preferences");
-    storage->metacity = get_settings_no_abort ("org.gnome.metacity");
-    storage->marco = get_settings_no_abort ("org.mate.Marco.general");
-
-    if (storage->marco) {
-        const gchar *xdg_current_desktop;
-
-        xdg_current_desktop = g_getenv ("XDG_CURRENT_DESKTOP");
-
-        if (xdg_current_desktop) {
-            gchar **desktops;
-            gint i;
-
-            desktops = g_strsplit (xdg_current_desktop, ":", -1);
-
-            for (i = 0; desktops[i] != NULL; i++) {
-                if (g_strcmp0 (desktops[i], "MATE") == 0) {
-                    storage->is_mate_desktop = TRUE;
-                    break;
-                }
+    const gchar *xdg_current_desktop = g_getenv ("XDG_CURRENT_DESKTOP");
+
+    storage->current_desktop = GWD_DESKTOP_GNOME;
+
+    if (xdg_current_desktop != NULL) {
+        gchar **desktops = g_strsplit (xdg_current_desktop, ":", -1);
+        gint i;
+
+        for (i = 0; desktops[i] != NULL; i++) {
+            if (g_strcmp0 (desktops[i], "GNOME-Flashback") == 0) {
+                storage->current_desktop = GWD_DESKTOP_GNOME_FLASHBACK;
+                break;
+            } else if (g_strcmp0 (desktops[i], "MATE") == 0) {
+                storage->current_desktop = GWD_DESKTOP_MATE;
+                break;
             }
-
-            g_strfreev (desktops);
         }
+
+        g_strfreev (desktops);
+    }
+
+    switch (storage->current_desktop) {
+        case GWD_DESKTOP_GNOME_FLASHBACK:
+            storage->gwd = get_settings_no_abort (ORG_COMPIZ_GWD);
+            storage->desktop = get_settings_no_abort (ORG_GNOME_DESKTOP_WM_PREFERENCES);
+            storage->metacity = get_settings_no_abort (ORG_GNOME_METACITY);
+
+            storage->gtk_decoration_layout_id =
+                g_signal_connect (gtk_settings_get_default (), "notify::gtk-decoration-layout",
+                                  G_CALLBACK (gtk_decoration_layout_changed), storage);
+            break;
+
+        case GWD_DESKTOP_MATE:
+            storage->gwd = get_settings_no_abort (ORG_COMPIZ_GWD);
+            storage->marco = get_settings_no_abort (ORG_MATE_MARCO_GENERAL);
+            break;
+
+        case GWD_DESKTOP_GNOME:
+        default:
+            storage->gwd = get_settings_no_abort (ORG_COMPIZ_GWD);
+            storage->desktop = get_settings_no_abort (ORG_GNOME_DESKTOP_WM_PREFERENCES);
+            break;
     }
 }
 
 
=== modified file 'gtk/window-decorator/gwd-settings-storage.h'
--- gtk/window-decorator/gwd-settings-storage.h	2016-05-20 23:30:30 +0000
+++ gtk/window-decorator/gwd-settings-storage.h	2016-06-01 13:36:56 +0000
@@ -1,3 +1,5 @@
+/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4; tab-width: 4 -*- */
+
 /*
  * Copyright © 2012 Canonical Ltd
  *
 
=== modified file 'gtk/window-decorator/tests/CMakeLists.txt'
--- gtk/window-decorator/tests/CMakeLists.txt	2016-05-21 11:06:24 +0000
+++ gtk/window-decorator/tests/CMakeLists.txt	2016-06-01 13:36:56 +0000
@@ -6,9 +6,6 @@
                      ${CMAKE_SOURCE_DIR}/tests/shared
                      ${CMAKE_SOURCE_DIR}/tests/shared/glib)
 
-configure_file (${CMAKE_CURRENT_SOURCE_DIR}/compiz_gwd_tests.h.in
-		${CMAKE_CURRENT_BINARY_DIR}/compiz_gwd_tests.h)
-
 pkg_check_modules (COMPIZ_TEST_GTK_WINDOW_DECORATOR
 		   glib-2.0>=2.28
 		   gio-2.0>=2.25.0)
@@ -27,51 +24,6 @@
     set (COMPIZ_TEST_GWD_SETTINGS_COVERAGE_TARGETS
 	 gtk_window_decorator_settings)
 
-    set (_desktop_gschema_name org.gnome.desktop.wm.preferences)
-    set (_desktop_gschema_filename ${_desktop_gschema_name}.gschema.xml)
-    set (_desktop_gschema_filepath ${CMAKE_CURRENT_SOURCE_DIR}/${_desktop_gschema_filename})
-    set (_desktop_gschema_generated_location ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/${_desktop_gschema_filename})
-
-    add_custom_command (OUTPUT ${_desktop_gschema_generated_location}
-                        COMMAND cp -r ${_desktop_gschema_filepath} ${_desktop_gschema_generated_location}
-                        DEPENDS ${_desktop_gschema_filepath}
-                        VERBATIM)
-
-    add_custom_target (compiz_gwd_gsettings_org_gnome_desktop_wm_preferences_schema ALL
-                       DEPENDS ${_desktop_gschema_generated_location})
-
-    add_gsettings_schema_to_recompilation_list (compiz_gwd_gsettings_org_gnome_desktop_wm_preferences_schema)
-
-    set (_metacity_gschema_name org.gnome.metacity)
-    set (_metacity_gschema_filename ${_metacity_gschema_name}.gschema.xml)
-    set (_metacity_gschema_filepath ${CMAKE_CURRENT_SOURCE_DIR}/${_metacity_gschema_filename})
-    set (_metacity_gschema_generated_location ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/${_metacity_gschema_filename})
-
-    add_custom_command (OUTPUT ${_metacity_gschema_generated_location}
-                        COMMAND cp -r ${_metacity_gschema_filepath} ${_metacity_gschema_generated_location}
-                        DEPENDS ${_metacity_gschema_filepath}
-                        VERBATIM)
-
-    add_custom_target (compiz_gwd_gsettings_org_gnome_metacity_schema ALL
-                       DEPENDS ${_metacity_gschema_generated_location})
-
-    add_gsettings_schema_to_recompilation_list (compiz_gwd_gsettings_org_gnome_metacity_schema)
-
-    set (_marco_gschema_name org.mate.marco)
-    set (_marco_gschema_filename ${_marco_gschema_name}.gschema.xml)
-    set (_marco_gschema_filepath ${CMAKE_CURRENT_SOURCE_DIR}/${_marco_gschema_filename})
-    set (_marco_gschema_generated_location ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/${_marco_gschema_filename})
-
-    add_custom_command (OUTPUT ${_marco_gschema_generated_location}
-                        COMMAND cp -r ${_marco_gschema_filepath} ${_marco_gschema_generated_location}
-                        DEPENDS ${_marco_gschema_filepath}
-                        VERBATIM)
-
-    add_custom_target (compiz_gwd_gsettings_org_mate_marco_schema ALL
-                       DEPENDS ${_marco_gschema_generated_location})
-
-    add_gsettings_schema_to_recompilation_list (compiz_gwd_gsettings_org_mate_marco_schema)
-
     set (COMPIZ_TEST_GWD_SETTINGS_ADDITIONAL_LIBRARIES
          ${COMPIZ_TEST_GWD_SETTINGS_ADDITIONAL_LIBRARIES}
          gtk_window_decorator_settings_storage_gsettings)
 
=== removed file 'gtk/window-decorator/tests/compiz_gwd_tests.h.in'
--- gtk/window-decorator/tests/compiz_gwd_tests.h.in	2012-09-06 10:08:25 +0000
+++ gtk/window-decorator/tests/compiz_gwd_tests.h.in	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-/*
- * Copyright © 2012 Canonical Ltd
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * Authored By: Sam Spilsbury <[e-mail]>
- */
-#ifndef _COMPIZ_GWD_TESTS_CONFIG_H
-#define _COMPIZ_GWD_TESTS_CONFIG_H
-
-#define MOCK_SCHEMA_PATH "@CMAKE_BINARY_DIR@/generated/glib-2.0/schemas"
-
-namespace
-{
-const std::string MOCK_PATH (MOCK_SCHEMA_PATH);
-}
-
-#endif
-
 
=== removed file 'gtk/window-decorator/tests/org.gnome.desktop.wm.preferences.gschema.xml'
--- gtk/window-decorator/tests/org.gnome.desktop.wm.preferences.gschema.xml	2012-08-22 07:29:26 +0000
+++ gtk/window-decorator/tests/org.gnome.desktop.wm.preferences.gschema.xml	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schemalist>
-  <enum id='org.gnome.desktop.GDesktopTitlebarAction'>
-    <value nick='toggle-shade' value='0'/>
-    <value nick='toggle-maximize' value='1'/>
-    <value nick='toggle-maximize-horizontally' value='2'/>
-    <value nick='toggle-maximize-vertically' value='3'/>
-    <value nick='minimize' value='4'/>
-    <value nick='none' value='5'/>
-    <value nick='lower' value='6'/>
-    <value nick='menu' value='7'/>
-  </enum>
-  <schema path="/org/gnome/desktop/wm/preferences/" id="org.gnome.desktop.wm.preferences" gettext-domain="gsettings-desktop-schemas">
-    <key type="s" name="button-layout">
-      <default>':minimize,maximize,close'</default>
-      <summary>Arrangement of buttons on the titlebar</summary>
-      <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.</description>
-    </key>
-    <key name="action-double-click-titlebar" enum="org.gnome.desktop.GDesktopTitlebarAction">
-      <default>'toggle-maximize'</default>
-      <summary>Action on title bar double-click</summary>
-      <description>This option determines the effects of double-clicking on the title bar. Current valid options are 'toggle-shade', which will shade/unshade the window, 'toggle-maximize' which will maximize/unmaximize the window, 'toggle-maximize-horizontally' and 'toggle-maximize-vertically' which will maximize/unmaximize the window in that direction only, 'minimize' which will minimize the window, 'shade' which will roll the window up, 'menu' which will display the window menu, 'lower' which will put the window behind all the others, and 'none' which will not do anything.</description>
-      
-      <aliases>
-        <alias value="toggle_shade" target="toggle-shade"/>
-        <alias value="toggle_maximize" target="toggle-maximize"/>
-        <alias value="toggle_maximize_horizontally" target="toggle-maximize-horizontally"/>
-        <alias value="toggle_maximize_vertically" target="toggle-maximize-vertically"/>
-      </aliases>
-    </key>
-    <key name="action-middle-click-titlebar" enum="org.gnome.desktop.GDesktopTitlebarAction">
-      <default>'lower'</default>
-      <summary>Action on title bar middle-click</summary>
-      <description>This option determines the effects of middle-clicking on the title bar. Current valid options are 'toggle-shade', which will shade/unshade the window, 'toggle-maximize' which will maximize/unmaximize the window, 'toggle-maximize-horizontally' and 'toggle-maximize-vertically' which will maximize/unmaximize the window in that direction only, 'minimize' which will minimize the window, 'shade' which will roll the window up, 'menu' which will display the window menu, 'lower' which will put the window behind all the others, and 'none' which will not do anything.</description>
-      
-      <aliases>
-        <alias value="toggle_shade" target="toggle-shade"/>
-        <alias value="toggle_maximize" target="toggle-maximize"/>
-        <alias value="toggle_maximize_horizontally" target="toggle-maximize-horizontally"/>
-        <alias value="toggle_maximize_vertically" target="toggle-maximize-vertically"/>
-      </aliases>
-    </key>
-    <key name="action-right-click-titlebar" enum="org.gnome.desktop.GDesktopTitlebarAction">
-      <default>'menu'</default>
-      <summary>Action on title bar right-click</summary>
-      <description>This option determines the effects of right-clicking on the title bar. Current valid options are 'toggle-shade', which will shade/unshade the window, 'toggle-maximize' which will maximize/unmaximize the window, 'toggle-maximize-horizontally' and 'toggle-maximize-vertically' which will maximize/unmaximize the window in that direction only, 'minimize' which will minimize the window, 'shade' which will roll the window up, 'menu' which will display the window menu, 'lower' which will put the window behind all the others, and 'none' which will not do anything.</description>
-      
-      <aliases>
-        <alias value="toggle_shade" target="toggle-shade"/>
-        <alias value="toggle_maximize" target="toggle-maximize"/>
-        <alias value="toggle_maximize_horizontally" target="toggle-maximize-horizontally"/>
-        <alias value="toggle_maximize_vertically" target="toggle-maximize-vertically"/>
-      </aliases>
-    </key>
-    <key type="s" name="theme">
-      <default>'Adwaita'</default>
-      <summary>Current theme</summary>
-      <description>The theme determines the appearance of window borders, titlebar, and so forth.</description>
-    </key>
-    <key type="b" name="titlebar-uses-system-font">
-      <default>false</default>
-      <summary>Use standard system font in window titles</summary>
-      <description>If true, ignore the titlebar-font option, and use the standard application font for window titles.</description>
-    </key>
-    <key type="s" name="titlebar-font">
-      <default>'Cantarell Bold 11'</default>
-      <summary>Window title font</summary>
-      <description>A font description string describing a font for window titlebars. The size from the description will only be used if the titlebar-font-size option is set to 0. Also, this option is disabled if the titlebar-uses-desktop-font option is set to true.</description>
-    </key>
-  </schema>
-
-</schemalist>
 
=== removed file 'gtk/window-decorator/tests/org.gnome.metacity.gschema.xml'
--- gtk/window-decorator/tests/org.gnome.metacity.gschema.xml	2015-04-06 17:34:00 +0000
+++ gtk/window-decorator/tests/org.gnome.metacity.gschema.xml	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schemalist>
-  <schema path="/org/gnome/metacity/" id="org.gnome.metacity" gettext-domain="@GETTEXT_DOMAIN">
-    <key type="s" name="theme">
-      <default>'Adwaita'</default>
-      <summary>Current theme</summary>
-      <description>The theme determines the appearance of window borders, titlebar, and so forth.</description>
-    </key>
-  </schema>
-</schemalist>
 
=== removed file 'gtk/window-decorator/tests/org.mate.marco.gschema.xml'
--- gtk/window-decorator/tests/org.mate.marco.gschema.xml	2016-03-02 16:42:14 +0000
+++ gtk/window-decorator/tests/org.mate.marco.gschema.xml	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-<schemalist>
-  <enum id="org.mate.Marco.ActionTitlebar">
-    <value nick="toggle_shade" value="0"/>
-    <value nick="toggle_maximize" value="1"/>
-    <value nick="toggle_maximize_horizontally" value="2"/>
-    <value nick="toggle_maximize_vertically" value="3"/>
-    <value nick="minimize" value="4"/>
-    <value nick="none" value="5"/>
-    <value nick="lower" value="6"/>
-    <value nick="menu" value="7"/>
-    <value nick="last" value="8"/>
-  </enum>
-  <schema id="org.mate.Marco" path="/org/mate/marco/">
-    <child name="general" schema="org.mate.Marco.general"/>
-  </schema>
-  <schema id="org.mate.Marco.general" path="/org/mate/marco/general/">
-    <key name="button-layout" type="s">
-      <default>'menu:minimize,maximize,close'</default>
-      <summary>Arrangement of buttons on the titlebar</summary>
-      <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 marco versions without breaking older versions. A special spacer tag can be used to insert some space between two adjacent buttons.</description>
-    </key>
-    <key name="action-double-click-titlebar" enum="org.mate.Marco.ActionTitlebar">
-      <default>'toggle_maximize'</default>
-      <summary>Action on title bar double-click</summary>
-      <description>This option determines the effects of double-clicking on the title bar.  Current valid options are 'toggle_shade', which will shade/unshade the window, 'toggle_maximize' which will maximize/unmaximize the window, 'toggle_maximize_horizontally' and 'toggle_maximize_vertically' which will maximize/unmaximize the window in that direction only, 'minimize' which will minimize the window, 'shade' which will roll the window up, 'menu' which will display the window menu, 'lower' which will put the window behind all the others, and 'none' which will not do anything.</description>
-    </key>
-    <key name="action-middle-click-titlebar" enum="org.mate.Marco.ActionTitlebar">
-      <default>'lower'</default>
-      <summary>Action on title bar middle-click</summary>
-      <description>This option determines the effects of middle-clicking on the title bar.  Current valid options are 'toggle_shade', which will shade/unshade the window, 'toggle_maximize' which will maximize/unmaximize the window, 'toggle_maximize_horizontally' and 'toggle_maximize_vertically' which will maximize/unmaximize the window in that direction only, 'minimize' which will minimize the window, 'shade' which will roll the window up, 'menu' which will display the window menu, 'lower' which will put the window behind all the others, and 'none' which will not do anything.</description>
-    </key>
-    <key name="action-right-click-titlebar" enum="org.mate.Marco.ActionTitlebar">
-      <default>'menu'</default>
-      <summary>Action on title bar right-click</summary>
-      <description>This option determines the effects of right-clicking on the title bar.  Current valid options are 'toggle_shade', which will shade/unshade the window, 'toggle_maximize' which will maximize/unmaximize the window, 'toggle_maximize_horizontally' and 'toggle_maximize_vertically' which will maximize/unmaximize the window in that direction only, 'minimize' which will minimize the window, 'shade' which will roll the window up, 'menu' which will display the window menu, 'lower' which will put the window behind all the others, and 'none' which will not do anything.</description>
-    </key>
-    <key name="theme" type="s">
-      <default>'Menta'</default>
-      <summary>Current theme</summary>
-      <description>The theme determines the appearance of window borders, titlebar, and so forth.</description>
-    </key>
-    <key name="titlebar-uses-system-font" type="b">
-      <default>false</default>
-      <summary>Use standard system font in window titles</summary>
-      <description>If true, ignore the titlebar_font option, and use the standard application font for window titles.</description>
-    </key>
-    <key name="titlebar-font" type="s">
-      <default>'Sans Bold 10'</default>
-      <summary>Window title font</summary>
-      <description>A font description string describing a font for window titlebars. The size from the description will only be used if the titlebar_font_size option is set to 0. Also, this option is disabled if the titlebar_uses_desktop_font option is set to true.</description>
-    </key>
-  </schema>
-</schemalist>
 
=== modified file 'gtk/window-decorator/tests/test_gwd_settings.cpp'
--- gtk/window-decorator/tests/test_gwd_settings.cpp	2016-05-21 20:34:55 +0000
+++ gtk/window-decorator/tests/test_gwd_settings.cpp	2016-06-01 13:36:56 +0000
@@ -42,7 +42,6 @@
 #include "compiz_gwd_tests.h"
 
 #include "gwd-settings.h"
-#include "gwd-settings-storage.h"
 
 using ::testing::Eq;
 using ::testing::Action;