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

[Alberts Muktupāvels]

Remove GWDSettingsStorageInterface.

Remove GWDSettingsStorageInterface.

[Sam Spilsbury (smspillaz)]

Makes sense to me - I must have had grander visions at the time I wrote this, but there's no sense keeping the abstraction these days.

review: Approve

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

Yeah, cleanup appreciated.

Thanks.

review: Approve

=== modified file 'gtk/window-decorator/CMakeLists.txt'
--- gtk/window-decorator/CMakeLists.txt	2016-05-12 13:05:25 +0000
+++ gtk/window-decorator/CMakeLists.txt	2016-05-12 13:05:25 +0000
@@ -35,9 +35,6 @@
     add_library (gtk_window_decorator_settings STATIC
 		 ${CMAKE_CURRENT_SOURCE_DIR}/gwd-settings.c)
 
-    add_library (gtk_window_decorator_settings_storage_interface STATIC
-		 ${CMAKE_CURRENT_SOURCE_DIR}/gwd-settings-storage-interface.c)
-
     add_library (gtk_window_decorator_settings_writable_interface STATIC
 		 ${CMAKE_CURRENT_SOURCE_DIR}/gwd-settings-writable-interface.c)
 
@@ -49,12 +46,11 @@
 	 gtk_window_decorator_settings_interface
 	 gtk_window_decorator_settings_writable_interface
 	 gtk_window_decorator_settings
-	 gtk_window_decorator_settings_storage_interface
 	 gtk_window_decorator_metacity_window_decoration_util
 	 gtk_window_decorator_cairo_window_decoration_util)
 
     add_library (gtk_window_decorator_settings_storage_gsettings STATIC
-                 ${CMAKE_CURRENT_SOURCE_DIR}/gwd-settings-storage-gsettings.c)
+                 ${CMAKE_CURRENT_SOURCE_DIR}/gwd-settings-storage.c)
 
     compiz_pkg_check_modules (GSETTINGS gio-2.0 glib-2.0)
 

=== removed file 'gtk/window-decorator/gwd-settings-storage-interface.c'
--- gtk/window-decorator/gwd-settings-storage-interface.c	2016-02-22 12:27:13 +0000
+++ gtk/window-decorator/gwd-settings-storage-interface.c	1970-01-01 00:00:00 +0000
@@ -1,70 +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]>
- */
-#include "gwd-settings-storage-interface.h"
-
-static void gwd_settings_storage_interface_default_init (GWDSettingsStorageInterface *settings_interface);
-
-G_DEFINE_INTERFACE (GWDSettingsStorage, gwd_settings_storage_interface, G_TYPE_OBJECT);
-
-static void gwd_settings_storage_interface_default_init (GWDSettingsStorageInterface *settings_interface)
-{
-}
-
-gboolean gwd_settings_storage_update_use_tooltips (GWDSettingsStorage *settings)
-{
-    GWDSettingsStorageInterface *interface = GWD_SETTINGS_STORAGE_GET_INTERFACE (settings);
-    return (*interface->update_use_tooltips) (settings);
-}
-
-gboolean gwd_settings_storage_update_blur (GWDSettingsStorage *settings)
-{
-    GWDSettingsStorageInterface *interface = GWD_SETTINGS_STORAGE_GET_INTERFACE (settings);
-    return (*interface->update_blur) (settings);
-}
-
-gboolean gwd_settings_storage_update_metacity_theme (GWDSettingsStorage *settings)
-{
-    GWDSettingsStorageInterface *interface = GWD_SETTINGS_STORAGE_GET_INTERFACE (settings);
-    return (*interface->update_metacity_theme) (settings);
-}
-
-gboolean gwd_settings_storage_update_opacity (GWDSettingsStorage *settings)
-{
-    GWDSettingsStorageInterface *interface = GWD_SETTINGS_STORAGE_GET_INTERFACE (settings);
-    return (*interface->update_opacity) (settings);
-}
-
-gboolean gwd_settings_storage_update_button_layout (GWDSettingsStorage *settings)
-{
-    GWDSettingsStorageInterface *interface = GWD_SETTINGS_STORAGE_GET_INTERFACE (settings);
-    return (*interface->update_button_layout) (settings);
-}
-
-gboolean gwd_settings_storage_update_font (GWDSettingsStorage *settings)
-{
-    GWDSettingsStorageInterface *interface = GWD_SETTINGS_STORAGE_GET_INTERFACE (settings);
-    return (*interface->update_font) (settings);
-}
-
-gboolean gwd_settings_storage_update_titlebar_actions (GWDSettingsStorage *settings)
-{
-    GWDSettingsStorageInterface *interface = GWD_SETTINGS_STORAGE_GET_INTERFACE (settings);
-    return (*interface->update_titlebar_actions) (settings);
-}

=== removed file 'gtk/window-decorator/gwd-settings-storage-interface.h'
--- gtk/window-decorator/gwd-settings-storage-interface.h	2016-02-22 12:27:13 +0000
+++ gtk/window-decorator/gwd-settings-storage-interface.h	1970-01-01 00:00:00 +0000
@@ -1,63 +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_SETTINGS_STORAGE_INTERFACE_H
-#define _COMPIZ_GWD_SETTINGS_STORAGE_INTERFACE_H
-
-#include <glib-object.h>
-#include <gwd-fwd.h>
-
-G_BEGIN_DECLS
-
-#define GWD_SETTINGS_STORAGE_INTERFACE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
-					     GWD_TYPE_SETTINGS_STORAGE_INTERFACE, \
-					     GWDSettingsStorage))
-#define GWD_SETTINGS_STORAGE_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE (obj, \
-										GWD_TYPE_SETTINGS_STORAGE_INTERFACE, \
-										GWDSettingsStorageInterface))
-#define GWD_TYPE_SETTINGS_STORAGE_INTERFACE (gwd_settings_storage_interface_get_type ())
-
-typedef struct _GWDSettingsStorageInterface GWDSettingsStorageInterface;
-
-struct _GWDSettingsStorageInterface
-{
-    GTypeInterface parent;
-
-    gboolean (*update_use_tooltips) (GWDSettingsStorage *settings);
-    gboolean (*update_blur) (GWDSettingsStorage *settings);
-    gboolean (*update_metacity_theme) (GWDSettingsStorage *settings);
-    gboolean (*update_opacity) (GWDSettingsStorage *settings);
-    gboolean (*update_button_layout) (GWDSettingsStorage *settings);
-    gboolean (*update_font) (GWDSettingsStorage *settings);
-    gboolean (*update_titlebar_actions) (GWDSettingsStorage *settings);
-};
-
-gboolean gwd_settings_storage_update_use_tooltips (GWDSettingsStorage *settings);
-gboolean gwd_settings_storage_update_blur (GWDSettingsStorage *settings);
-gboolean gwd_settings_storage_update_metacity_theme (GWDSettingsStorage *settings);
-gboolean gwd_settings_storage_update_opacity (GWDSettingsStorage *settings);
-gboolean gwd_settings_storage_update_button_layout (GWDSettingsStorage *settings);
-gboolean gwd_settings_storage_update_font (GWDSettingsStorage *settings);
-gboolean gwd_settings_storage_update_titlebar_actions (GWDSettingsStorage *settings);
-
-GType gwd_settings_storage_interface_get_type (void);
-
-G_END_DECLS
-
-#endif

=== renamed file 'gtk/window-decorator/gwd-settings-storage-gsettings.c' => 'gtk/window-decorator/gwd-settings-storage.c'
--- gtk/window-decorator/gwd-settings-storage-gsettings.c	2016-03-11 14:43:02 +0000
+++ gtk/window-decorator/gwd-settings-storage.c	2016-05-12 13:05:25 +0000
@@ -25,8 +25,7 @@
 #include <string.h>
 
 #include "gwd-settings-writable-interface.h"
-#include "gwd-settings-storage-interface.h"
-#include "gwd-settings-storage-gsettings.h"
+#include "gwd-settings-storage.h"
 
 const gchar * ORG_COMPIZ_GWD = "org.compiz.gwd";
 const gchar * ORG_GNOME_METACITY = "org.gnome.metacity";
@@ -57,593 +56,449 @@
 const gchar * ORG_MATE_MARCO_GENERAL_TITLEBAR_FONT = "titlebar-font";
 const gchar * ORG_MATE_MARCO_GENERAL_BUTTON_LAYOUT = "button-layout";
 
-#define GWD_SETTINGS_STORAGE_GSETTINGS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GWD_TYPE_SETTINGS_STORAGE_GSETTINGS, GWDSettingsStorageGSettings));
-#define GWD_SETTINGS_STORAGE_GSETTINGS_CLASS(obj) (G_TYPE_CHECK_CLASS_CAST ((obj), GWD_TYPE_SETTINGS_STORAGE_GSETTINGS, GWDSettingsStorageGSettingsClass));
-#define GWD_IS_MOCK_SETTINGS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GWD_TYPE_SETTINGS_STORAGE_GSETTINGS));
-#define GWD_IS_MOCK_SETTINGS_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE ((obj), GWD_TYPE_SETTINGS_STORAGE_GSETTINGS));
-#define GWD_SETTINGS_STORAGE_GSETTINGS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GWD_TYPE_SETTINGS_STORAGE_GSETTINGS, GWDSettingsStorageGSettingsClass));
-
-typedef struct _GWDSettingsStorageGSettings
-{
-    GObject parent;
-} GWDSettingsStorageGSettings;
-
-typedef struct _GWDSettingsStorageGSettingsClass
-{
-    GObjectClass parent_class;
-} GWDSettingsStorageGSettingsClass;
-
-static void gwd_settings_storage_gsettings_interface_init (GWDSettingsStorageInterface *interface);
-
-G_DEFINE_TYPE_WITH_CODE (GWDSettingsStorageGSettings, gwd_settings_storage_gsettings, G_TYPE_OBJECT,
-			 G_IMPLEMENT_INTERFACE (GWD_TYPE_SETTINGS_STORAGE_INTERFACE,
-						gwd_settings_storage_gsettings_interface_init))
-
-#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GWD_TYPE_SETTINGS_STORAGE_GSETTINGS, GWDSettingsStorageGSettingsPrivate))
+struct _GWDSettingsStorage
+{
+    GObject              parent;
+
+    GWDSettingsWritable *writable;
+    gboolean             connect;
+
+    GSettings           *gwd;
+    GSettings           *desktop;
+    GSettings           *metacity;
+    GSettings           *marco;
+
+    gboolean             is_mate_desktop;
+};
 
 enum
 {
-    GWD_SETTINGS_STORAGE_GSETTINGS_PROPERTY_DESKTOP_GSETTINGS  = 1,
-    GWD_SETTINGS_STORAGE_GSETTINGS_PROPERTY_METACITY_GSETTINGS = 2,
-    GWD_SETTINGS_STORAGE_GSETTINGS_PROPERTY_MARCO_GSETTINGS    = 3,
-    GWD_SETTINGS_STORAGE_GSETTINGS_PROPERTY_GWD_GSETTINGS      = 4,
-    GWD_SETTINGS_STORAGE_GSETTINGS_PROPERTY_WRITABLE_SETTINGS  = 5
+    PROP_0,
+
+    PROP_WRITABLE,
+    PROP_CONNECT,
+
+    LAST_PROP
 };
 
-typedef struct _GWDSettingsStorageGSettingsPrivate
-{
-    GSettings *desktop;
-    GSettings *metacity;
-
-    GSettings *marco;
-    gboolean   is_mate_desktop;
-
-    GSettings *gwd;
-    GWDSettingsWritable *writable;
-} GWDSettingsStorageGSettingsPrivate;
-
-static gboolean
-gwd_settings_storage_gsettings_update_use_tooltips (GWDSettingsStorage *settings)
-{
-    GWDSettingsStorageGSettings	       *storage = GWD_SETTINGS_STORAGE_GSETTINGS (settings);
-    GWDSettingsStorageGSettingsPrivate *priv = GET_PRIVATE (storage);
-
-    if (!priv->gwd)
-	return FALSE;
-
-    return gwd_settings_writable_use_tooltips_changed (priv->writable,
-						       g_settings_get_boolean (priv->gwd,
-									       ORG_COMPIZ_GWD_KEY_USE_TOOLTIPS));
-}
-
-static gboolean
-gwd_settings_storage_gsettings_update_blur (GWDSettingsStorage *settings)
-{
-    GWDSettingsStorageGSettings	       *storage = GWD_SETTINGS_STORAGE_GSETTINGS (settings);
-    GWDSettingsStorageGSettingsPrivate *priv = GET_PRIVATE (storage);
-
-    if (!priv->gwd)
-	return FALSE;
-
-    return gwd_settings_writable_blur_changed (priv->writable,
-					       g_settings_get_string (priv->gwd,
-								      ORG_COMPIZ_GWD_KEY_BLUR_TYPE));
-}
-
-static gboolean
-gwd_settings_storage_gsettings_update_metacity_theme (GWDSettingsStorage *settings)
-{
-    GWDSettingsStorageGSettings *storage;
-    GWDSettingsStorageGSettingsPrivate *priv;
+static GParamSpec *storage_properties[LAST_PROP] = { NULL };
+
+G_DEFINE_TYPE (GWDSettingsStorage, gwd_settings_storage, G_TYPE_OBJECT)
+
+static inline GSettings *
+get_settings_no_abort (const gchar *schema)
+{
+    GSettingsSchemaSource *source;
+    GSettings *settings;
+
+    source = g_settings_schema_source_get_default ();
+    settings = NULL;
+
+    if (g_settings_schema_source_lookup (source, schema, TRUE))
+        settings = g_settings_new (schema);
+
+    return settings;
+}
+
+static inline gchar *
+translate_dashes_to_underscores (const gchar *original)
+{
+    gint i = 0;
+    gchar *copy = g_strdup (original);
+
+    if (!copy)
+        return NULL;
+
+    for (; i < strlen (copy); ++i) {
+        if (copy[i] == '-')
+            copy[i] = '_';
+    }
+
+    return copy;
+}
+
+static void
+org_compiz_gwd_settings_changed (GSettings          *settings,
+                                 const gchar        *key,
+                                 GWDSettingsStorage *storage)
+{
+    if (strcmp (key, ORG_COMPIZ_GWD_KEY_MOUSE_WHEEL_ACTION) == 0)
+        gwd_settings_storage_update_titlebar_actions (storage);
+    else if (strcmp (key, ORG_COMPIZ_GWD_KEY_BLUR_TYPE) == 0)
+        gwd_settings_storage_update_blur (storage);
+    else if (strcmp (key, ORG_COMPIZ_GWD_KEY_USE_METACITY_THEME) == 0)
+        gwd_settings_storage_update_metacity_theme (storage);
+    else if (strcmp (key, ORG_COMPIZ_GWD_KEY_METACITY_THEME_INACTIVE_OPACITY) == 0 ||
+             strcmp (key, ORG_COMPIZ_GWD_KEY_METACITY_THEME_INACTIVE_SHADE_OPACITY) == 0 ||
+             strcmp (key, ORG_COMPIZ_GWD_KEY_METACITY_THEME_ACTIVE_OPACITY) == 0 ||
+             strcmp (key, ORG_COMPIZ_GWD_KEY_METACITY_THEME_ACTIVE_SHADE_OPACITY) == 0)
+        gwd_settings_storage_update_opacity (storage);
+    else if (strcmp (key, ORG_COMPIZ_GWD_KEY_USE_TOOLTIPS) == 0)
+        gwd_settings_storage_update_use_tooltips (storage);
+}
+
+static void
+org_gnome_desktop_wm_preferences_settings_changed (GSettings          *settings,
+                                                   const gchar        *key,
+                                                   GWDSettingsStorage *storage)
+{
+    if (strcmp (key, ORG_GNOME_DESKTOP_WM_PREFERENCES_TITLEBAR_USES_SYSTEM_FONT) == 0 ||
+        strcmp (key, ORG_GNOME_DESKTOP_WM_PREFERENCES_TITLEBAR_FONT) == 0)
+        gwd_settings_storage_update_font (storage);
+    else if (strcmp (key, ORG_GNOME_DESKTOP_WM_PREFERENCES_TITLEBAR_FONT) == 0)
+        gwd_settings_storage_update_font (storage);
+    else if (strcmp (key, ORG_GNOME_DESKTOP_WM_PREFERENCES_ACTION_DOUBLE_CLICK_TITLEBAR) == 0 ||
+             strcmp (key, ORG_GNOME_DESKTOP_WM_PREFERENCES_ACTION_MIDDLE_CLICK_TITLEBAR) == 0 ||
+             strcmp (key, ORG_GNOME_DESKTOP_WM_PREFERENCES_ACTION_RIGHT_CLICK_TITLEBAR) == 0)
+        gwd_settings_storage_update_titlebar_actions (storage);
+    else if (strcmp (key, ORG_GNOME_DESKTOP_WM_PREFERENCES_THEME) == 0)
+        gwd_settings_storage_update_metacity_theme (storage);
+    else if (strcmp (key, ORG_GNOME_DESKTOP_WM_PREFERENCES_BUTTON_LAYOUT) == 0)
+        gwd_settings_storage_update_button_layout (storage);
+}
+
+static void
+org_gnome_metacity_settings_changed (GSettings          *settings,
+                                     const gchar        *key,
+                                     GWDSettingsStorage *storage)
+{
+    if (strcmp (key, ORG_GNOME_METACITY_THEME) == 0)
+        gwd_settings_storage_update_metacity_theme (storage);
+}
+
+static void
+org_mate_marco_general_settings_changed (GSettings          *settings,
+                                         const gchar        *key,
+                                         GWDSettingsStorage *storage)
+{
+    if (strcmp (key, ORG_MATE_MARCO_GENERAL_TITLEBAR_USES_SYSTEM_FONT) == 0 ||
+        strcmp (key, ORG_MATE_MARCO_GENERAL_TITLEBAR_FONT) == 0)
+        gwd_settings_storage_update_font (storage);
+    else if (strcmp (key, ORG_MATE_MARCO_GENERAL_TITLEBAR_FONT) == 0)
+        gwd_settings_storage_update_font (storage);
+    else if (strcmp (key, ORG_MATE_MARCO_GENERAL_ACTION_DOUBLE_CLICK_TITLEBAR) == 0 ||
+             strcmp (key, ORG_MATE_MARCO_GENERAL_ACTION_MIDDLE_CLICK_TITLEBAR) == 0 ||
+             strcmp (key, ORG_MATE_MARCO_GENERAL_ACTION_RIGHT_CLICK_TITLEBAR) == 0)
+        gwd_settings_storage_update_titlebar_actions (storage);
+    else if (strcmp (key, ORG_MATE_MARCO_GENERAL_THEME) == 0)
+        gwd_settings_storage_update_metacity_theme (storage);
+    else if (strcmp (key, ORG_MATE_MARCO_GENERAL_BUTTON_LAYOUT) == 0)
+        gwd_settings_storage_update_button_layout (storage);
+}
+
+static void
+gwd_settings_storage_constructed (GObject *object)
+{
+    GWDSettingsStorage *storage;
+
+    storage = GWD_SETTINGS_STORAGE (object);
+
+    G_OBJECT_CLASS (gwd_settings_storage_parent_class)->constructed (object);
+
+    if (storage->gwd && storage->connect) {
+        g_signal_connect (storage->gwd, "changed",
+                          G_CALLBACK (org_compiz_gwd_settings_changed),
+                          storage);
+    }
+
+    if (storage->desktop && storage->connect) {
+        g_signal_connect (storage->desktop, "changed",
+                          G_CALLBACK (org_gnome_desktop_wm_preferences_settings_changed),
+                          storage);
+    }
+
+    if (storage->metacity && storage->connect) {
+        g_signal_connect (storage->metacity, "changed",
+                          G_CALLBACK (org_gnome_metacity_settings_changed),
+                          storage);
+    }
+
+    if (storage->marco && storage->connect) {
+        g_signal_connect (storage->marco, "changed",
+                          G_CALLBACK (org_mate_marco_general_settings_changed),
+                          storage);
+    }
+}
+
+static void
+gwd_settings_storage_dispose (GObject *object)
+{
+    GWDSettingsStorage *storage;
+
+    storage = GWD_SETTINGS_STORAGE (object);
+
+    g_clear_object (&storage->writable);
+
+    g_clear_object (&storage->gwd);
+    g_clear_object (&storage->desktop);
+    g_clear_object (&storage->metacity);
+    g_clear_object (&storage->marco);
+
+    G_OBJECT_CLASS (gwd_settings_storage_parent_class)->dispose (object);
+}
+
+static void
+gwd_settings_storage_set_property (GObject      *object,
+                                   guint         property_id,
+                                   const GValue *value,
+                                   GParamSpec   *pspec)
+{
+    GWDSettingsStorage *storage;
+
+    storage = GWD_SETTINGS_STORAGE (object);
+
+    switch (property_id) {
+        case PROP_WRITABLE:
+            storage->writable = g_value_dup_object (value);
+            break;
+
+        case PROP_CONNECT:
+            storage->connect = g_value_get_boolean (value);
+            break;
+
+        default:
+            G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+            break;
+    }
+}
+
+static void
+gwd_settings_storage_class_init (GWDSettingsStorageClass *storage_class)
+{
+    GObjectClass *object_class;
+
+    object_class = G_OBJECT_CLASS (storage_class);
+
+    object_class->constructed = gwd_settings_storage_constructed;
+    object_class->dispose = gwd_settings_storage_dispose;
+    object_class->set_property = gwd_settings_storage_set_property;
+
+    storage_properties[PROP_WRITABLE] =
+        g_param_spec_object ("writable", "GWDWritableSettings",
+                             "A GWDWritableSettings object",
+                             GWD_TYPE_WRITABLE_SETTINGS_INTERFACE,
+                             G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE |
+                             G_PARAM_STATIC_STRINGS);
+
+    storage_properties[PROP_CONNECT] =
+        g_param_spec_boolean ("connect", "Connect", "Connect",
+                              TRUE,
+                              G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE |
+                              G_PARAM_STATIC_STRINGS);
+
+    g_object_class_install_properties (object_class, LAST_PROP,
+                                       storage_properties);
+}
+
+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;
+                }
+            }
+
+            g_strfreev (desktops);
+        }
+    }
+}
+
+GWDSettingsStorage *
+gwd_settings_storage_new (GWDSettingsWritable *writable,
+                          gboolean             connect)
+{
+    return g_object_new (GWD_TYPE_SETTINGS_STORAGE,
+                         "writable", writable,
+                         "connect", connect,
+                         NULL);
+}
+
+gboolean
+gwd_settings_storage_update_use_tooltips (GWDSettingsStorage *storage)
+{
+    gboolean use_tooltips;
+
+    if (!storage->gwd)
+        return FALSE;
+
+    use_tooltips = g_settings_get_boolean (storage->gwd, ORG_COMPIZ_GWD_KEY_USE_TOOLTIPS);
+
+    return gwd_settings_writable_use_tooltips_changed (storage->writable, use_tooltips);
+}
+
+gboolean
+gwd_settings_storage_update_blur (GWDSettingsStorage *storage)
+{
+    gchar *blur_type;
+
+    if (!storage->gwd)
+        return FALSE;
+
+    blur_type = g_settings_get_string (storage->gwd, ORG_COMPIZ_GWD_KEY_BLUR_TYPE);
+
+    return gwd_settings_writable_blur_changed (storage->writable, blur_type);
+}
+
+gboolean
+gwd_settings_storage_update_metacity_theme (GWDSettingsStorage *storage)
+{
     gboolean use_metacity_theme;
     gchar *theme;
 
-    storage = GWD_SETTINGS_STORAGE_GSETTINGS (settings);
-    priv = GET_PRIVATE (storage);
-
-    if (!priv->gwd)
+    if (!storage->gwd)
         return FALSE;
 
-    use_metacity_theme = g_settings_get_boolean (priv->gwd, ORG_COMPIZ_GWD_KEY_USE_METACITY_THEME);
+    use_metacity_theme = g_settings_get_boolean (storage->gwd, ORG_COMPIZ_GWD_KEY_USE_METACITY_THEME);
 
-    if (priv->is_mate_desktop)
-	theme = g_settings_get_string (priv->marco, ORG_MATE_MARCO_GENERAL_THEME);
-    else if (priv->metacity)
-    theme = g_settings_get_string (priv->metacity, ORG_GNOME_METACITY_THEME);
+    if (storage->is_mate_desktop)
+        theme = g_settings_get_string (storage->marco, ORG_MATE_MARCO_GENERAL_THEME);
+    else if (storage->metacity)
+        theme = g_settings_get_string (storage->metacity, ORG_GNOME_METACITY_THEME);
     else
-	return FALSE;
+        return FALSE;
 
-    return gwd_settings_writable_metacity_theme_changed (priv->writable,
+    return gwd_settings_writable_metacity_theme_changed (storage->writable,
                                                          use_metacity_theme,
                                                          theme);
 }
 
-static gboolean
-gwd_settings_storage_gsettings_update_opacity (GWDSettingsStorage *settings)
+gboolean
+gwd_settings_storage_update_opacity (GWDSettingsStorage *storage)
 {
-    GWDSettingsStorageGSettings	       *storage = GWD_SETTINGS_STORAGE_GSETTINGS (settings);
-    GWDSettingsStorageGSettingsPrivate *priv = GET_PRIVATE (storage);
-
-    if (!priv->gwd)
-	return FALSE;
-
-    return gwd_settings_writable_opacity_changed (priv->writable,
-						  g_settings_get_double (priv->gwd,
-									 ORG_COMPIZ_GWD_KEY_METACITY_THEME_ACTIVE_OPACITY),
-						  g_settings_get_double (priv->gwd,
-									 ORG_COMPIZ_GWD_KEY_METACITY_THEME_INACTIVE_OPACITY),
-						  g_settings_get_boolean (priv->gwd,
-									  ORG_COMPIZ_GWD_KEY_METACITY_THEME_ACTIVE_SHADE_OPACITY),
-						  g_settings_get_boolean (priv->gwd,
-									  ORG_COMPIZ_GWD_KEY_METACITY_THEME_INACTIVE_SHADE_OPACITY));
+    gdouble active;
+    gdouble inactive;
+    gboolean active_shade;
+    gboolean inactive_shade;
+
+    if (!storage->gwd)
+        return FALSE;
+
+    active = g_settings_get_double (storage->gwd, ORG_COMPIZ_GWD_KEY_METACITY_THEME_ACTIVE_OPACITY);
+    inactive = g_settings_get_double (storage->gwd, ORG_COMPIZ_GWD_KEY_METACITY_THEME_INACTIVE_OPACITY);
+    active_shade = g_settings_get_boolean (storage->gwd, ORG_COMPIZ_GWD_KEY_METACITY_THEME_ACTIVE_SHADE_OPACITY);
+    inactive_shade = g_settings_get_boolean (storage->gwd, ORG_COMPIZ_GWD_KEY_METACITY_THEME_INACTIVE_SHADE_OPACITY);
+
+    return gwd_settings_writable_opacity_changed (storage->writable, active, inactive,
+                                                  active_shade, inactive_shade);
 }
 
-static gboolean
-gwd_settings_storage_gsettings_update_button_layout (GWDSettingsStorage *settings)
+gboolean
+gwd_settings_storage_update_button_layout (GWDSettingsStorage *storage)
 {
-    GWDSettingsStorageGSettings	       *storage = GWD_SETTINGS_STORAGE_GSETTINGS (settings);
-    GWDSettingsStorageGSettingsPrivate *priv = GET_PRIVATE (storage);
     gchar *button_layout;
 
-    if (priv->is_mate_desktop)
-	button_layout = g_settings_get_string (priv->marco, ORG_MATE_MARCO_GENERAL_BUTTON_LAYOUT);
-    else if (priv->desktop)
-	button_layout = g_settings_get_string (priv->desktop, ORG_GNOME_DESKTOP_WM_PREFERENCES_BUTTON_LAYOUT);
+    if (storage->is_mate_desktop)
+        button_layout = g_settings_get_string (storage->marco, ORG_MATE_MARCO_GENERAL_BUTTON_LAYOUT);
+    else if (storage->desktop)
+        button_layout = g_settings_get_string (storage->desktop, ORG_GNOME_DESKTOP_WM_PREFERENCES_BUTTON_LAYOUT);
     else
-	return FALSE;
+        return FALSE;
 
-    return gwd_settings_writable_button_layout_changed (priv->writable,
-							button_layout);
+    return gwd_settings_writable_button_layout_changed (storage->writable, button_layout);
 }
 
-static gboolean
-gwd_settings_storage_gsettings_update_font (GWDSettingsStorage *settings)
+gboolean
+gwd_settings_storage_update_font (GWDSettingsStorage *storage)
 {
-    GWDSettingsStorageGSettings	       *storage = GWD_SETTINGS_STORAGE_GSETTINGS (settings);
-    GWDSettingsStorageGSettingsPrivate *priv = GET_PRIVATE (storage);
     gchar *titlebar_font;
     gboolean titlebar_system_font;
 
-    if (priv->is_mate_desktop) {
-	titlebar_font = g_settings_get_string (priv->marco, ORG_MATE_MARCO_GENERAL_TITLEBAR_FONT);
-	titlebar_system_font = g_settings_get_boolean (priv->marco, ORG_MATE_MARCO_GENERAL_TITLEBAR_USES_SYSTEM_FONT);
-    } else if (priv->desktop) {
-	titlebar_font = g_settings_get_string (priv->desktop, ORG_GNOME_DESKTOP_WM_PREFERENCES_TITLEBAR_FONT);
-	titlebar_system_font = g_settings_get_boolean (priv->desktop, ORG_GNOME_DESKTOP_WM_PREFERENCES_TITLEBAR_USES_SYSTEM_FONT);
+    if (storage->is_mate_desktop) {
+        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_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
-	return FALSE;
-
-    return gwd_settings_writable_font_changed (priv->writable,
-					       titlebar_system_font,
-					       titlebar_font);
-}
-
-static inline gchar *
-translate_dashes_to_underscores (const gchar *original)
-{
-    gint i = 0;
-    gchar *copy = g_strdup (original);
-
-    if (!copy)
-	return NULL;
-
-    for (; i < strlen (copy); ++i)
-    {
-	if (copy[i] == '-')
-	    copy[i] = '_';
-    }
-
-    return copy;
-}
-
-static gboolean
-gwd_settings_storage_gsettings_update_titlebar_actions (GWDSettingsStorage *settings)
-{
-    GWDSettingsStorageGSettings	       *storage = GWD_SETTINGS_STORAGE_GSETTINGS (settings);
-    GWDSettingsStorageGSettingsPrivate *priv = GET_PRIVATE (storage);
-    gchar *double_click_action, *middle_click_action, *right_click_action;
-
-    if (!priv->gwd)
-	return FALSE;
-
-    if (priv->is_mate_desktop) {
-	double_click_action = translate_dashes_to_underscores (g_settings_get_string (priv->marco,
+        return FALSE;
+
+    return gwd_settings_writable_font_changed (storage->writable,
+                                               titlebar_system_font,
+                                               titlebar_font);
+}
+
+gboolean
+gwd_settings_storage_update_titlebar_actions (GWDSettingsStorage *storage)
+{
+    gchar *double_click_action;
+    gchar *middle_click_action;
+    gchar *right_click_action;
+
+    if (!storage->gwd)
+        return FALSE;
+
+    if (storage->is_mate_desktop) {
+        double_click_action = translate_dashes_to_underscores (g_settings_get_string (storage->marco,
 										      ORG_MATE_MARCO_GENERAL_ACTION_DOUBLE_CLICK_TITLEBAR));
-	middle_click_action = translate_dashes_to_underscores (g_settings_get_string (priv->marco,
+        middle_click_action = translate_dashes_to_underscores (g_settings_get_string (storage->marco,
 										      ORG_MATE_MARCO_GENERAL_ACTION_MIDDLE_CLICK_TITLEBAR));
-	right_click_action = translate_dashes_to_underscores (g_settings_get_string (priv->marco,
+        right_click_action = translate_dashes_to_underscores (g_settings_get_string (storage->marco,
 										      ORG_MATE_MARCO_GENERAL_ACTION_RIGHT_CLICK_TITLEBAR));
-    } else if (priv->desktop) {
-	double_click_action = translate_dashes_to_underscores (g_settings_get_string (priv->desktop,
+    } else if (storage->desktop) {
+        double_click_action = translate_dashes_to_underscores (g_settings_get_string (storage->desktop,
 											 ORG_GNOME_DESKTOP_WM_PREFERENCES_ACTION_DOUBLE_CLICK_TITLEBAR));
-	middle_click_action = translate_dashes_to_underscores (g_settings_get_string (priv->desktop,
+        middle_click_action = translate_dashes_to_underscores (g_settings_get_string (storage->desktop,
 											 ORG_GNOME_DESKTOP_WM_PREFERENCES_ACTION_MIDDLE_CLICK_TITLEBAR));
-	right_click_action = translate_dashes_to_underscores (g_settings_get_string (priv->desktop,
+        right_click_action = translate_dashes_to_underscores (g_settings_get_string (storage->desktop,
 											 ORG_GNOME_DESKTOP_WM_PREFERENCES_ACTION_RIGHT_CLICK_TITLEBAR));
     } else
-	return FALSE;
+        return FALSE;
 
-    return gwd_settings_writable_titlebar_actions_changed (priv->writable,
+    return gwd_settings_writable_titlebar_actions_changed (storage->writable,
 							   double_click_action,
 							   middle_click_action,
 							   right_click_action,
-							   g_settings_get_string (priv->gwd,
+							   g_settings_get_string (storage->gwd,
 										  ORG_COMPIZ_GWD_KEY_MOUSE_WHEEL_ACTION));
 
     if (double_click_action)
-	g_free (double_click_action);
+        g_free (double_click_action);
 
     if (middle_click_action)
-	g_free (middle_click_action);
+        g_free (middle_click_action);
 
     if (right_click_action)
-	g_free (right_click_action);
-}
-
-static void
-gwd_settings_storage_gsettings_interface_init (GWDSettingsStorageInterface *interface)
-{
-    interface->update_use_tooltips = gwd_settings_storage_gsettings_update_use_tooltips;
-    interface->update_blur = gwd_settings_storage_gsettings_update_blur;
-    interface->update_metacity_theme = gwd_settings_storage_gsettings_update_metacity_theme;
-    interface->update_opacity = gwd_settings_storage_gsettings_update_opacity;
-    interface->update_button_layout = gwd_settings_storage_gsettings_update_button_layout;
-    interface->update_font = gwd_settings_storage_gsettings_update_font;
-    interface->update_titlebar_actions = gwd_settings_storage_gsettings_update_titlebar_actions;
-}
-
-static void
-gwd_settings_storage_gsettings_set_property (GObject *object,
-					     guint   property_id,
-					     const GValue  *value,
-					     GParamSpec *pspec)
-{
-    GWDSettingsStorageGSettingsPrivate *priv = GET_PRIVATE (object);
-
-    switch (property_id)
-    {
-	case GWD_SETTINGS_STORAGE_GSETTINGS_PROPERTY_DESKTOP_GSETTINGS:
-	    if (priv->desktop)
-		g_object_unref (priv->desktop);
-
-	    priv->desktop = g_value_dup_object (value);
-	    break;
-	case GWD_SETTINGS_STORAGE_GSETTINGS_PROPERTY_METACITY_GSETTINGS:
-	    if (priv->metacity)
-		g_object_unref (priv->metacity);
-
-	    priv->metacity = g_value_dup_object (value);
-	    break;
-	case GWD_SETTINGS_STORAGE_GSETTINGS_PROPERTY_MARCO_GSETTINGS:
-	    if (priv->marco)
-		g_object_unref (priv->marco);
-
-	    priv->marco = g_value_dup_object (value);
-	    break;
-	case GWD_SETTINGS_STORAGE_GSETTINGS_PROPERTY_GWD_GSETTINGS:
-	    if (priv->gwd)
-		g_object_unref (priv->gwd);
-
-	    priv->gwd = g_value_dup_object (value);
-	    break;
-	case GWD_SETTINGS_STORAGE_GSETTINGS_PROPERTY_WRITABLE_SETTINGS:
-	    priv->writable = g_value_get_pointer (value);
-	    break;
-	default:
-	    g_assert_not_reached ();
-    }
-}
-
-static void
-gwd_settings_storage_gsettings_dispose (GObject *object)
-{
-    GWDSettingsStorageGSettingsPrivate *priv = GET_PRIVATE (object);
-
-    G_OBJECT_CLASS (gwd_settings_storage_gsettings_parent_class)->dispose (object);
-
-    if (priv->desktop)
-	g_object_unref (priv->desktop);
-
-    if (priv->metacity)
-	g_object_unref (priv->metacity);
-
-    if (priv->marco)
-	g_object_unref (priv->marco);
-
-    if (priv->gwd)
-	g_object_unref (priv->gwd);
-}
-
-static void
-gwd_settings_storage_gsettings_finalize (GObject *object)
-{
-    G_OBJECT_CLASS (gwd_settings_storage_gsettings_parent_class)->finalize (object);
-}
-
-static void
-gwd_settings_storage_gsettings_class_init (GWDSettingsStorageGSettingsClass *klass)
-{
-    GObjectClass *object_class = G_OBJECT_CLASS (klass);
-    GParamSpec   *properties[] =
-    {
-	NULL,
-	g_param_spec_object ("desktop-gsettings",
-			     ORG_GNOME_DESKTOP_WM_PREFERENCES,
-			     "GSettings Object for org.gnome.desktop.wm.preferences",
-			     G_TYPE_SETTINGS,
-			     G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY),
-	g_param_spec_object ("metacity-gsettings",
-			     ORG_GNOME_METACITY,
-			     "GSettings Object for org.gnome.metacity",
-			     G_TYPE_SETTINGS,
-			     G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY),
-	g_param_spec_object ("marco-gsettings",
-			     ORG_MATE_MARCO_GENERAL,
-			     "GSettings Object for org.mate.Marco.general",
-			     G_TYPE_SETTINGS,
-			     G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY),
-	g_param_spec_object ("gwd-gsettings",
-			     ORG_COMPIZ_GWD,
-			     "GSettings Object for org.compiz.gwd",
-			     G_TYPE_SETTINGS,
-			     G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY),
-	g_param_spec_pointer ("writable-settings",
-			      "GWDWritableSettings",
-			      "A GWDWritableSettings object",
-			      G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)
-    };
-
-    g_type_class_add_private (klass, sizeof (GWDSettingsStorageGSettingsPrivate));
-
-    object_class->dispose = gwd_settings_storage_gsettings_dispose;
-    object_class->finalize = gwd_settings_storage_gsettings_finalize;
-    object_class->set_property = gwd_settings_storage_gsettings_set_property;
-
-    g_object_class_install_properties (object_class,
-				       sizeof (properties) / sizeof (properties[0]),
-				       properties);
-}
-
-void gwd_settings_storage_gsettings_init (GWDSettingsStorageGSettings *self)
-{
-}
-
-GWDSettingsStorage *
-gwd_settings_storage_gsettings_new (GSettings *desktop,
-				    GSettings *metacity,
-				    GSettings *marco,
-				    GSettings *gwd,
-				    GWDSettingsWritable *writable)
-{
-    static const guint gwd_settings_storage_gsettings_n_construction_params = 5;
-    GParameter         param[gwd_settings_storage_gsettings_n_construction_params];
-
-    GValue desktop_value = G_VALUE_INIT;
-    GValue metacity_value = G_VALUE_INIT;
-    GValue marco_value = G_VALUE_INIT;
-    GValue gwd_value = G_VALUE_INIT;
-    GValue writable_value = G_VALUE_INIT;
-
-    GWDSettingsStorage *storage = NULL;
-    GWDSettingsStorageGSettingsPrivate *priv;
-
-    g_return_val_if_fail (writable != NULL, NULL);
-
-    g_value_init (&desktop_value, G_TYPE_OBJECT);
-    g_value_init (&metacity_value, G_TYPE_OBJECT);
-    g_value_init (&marco_value, G_TYPE_OBJECT);
-    g_value_init (&gwd_value, G_TYPE_OBJECT);
-    g_value_init (&writable_value, G_TYPE_POINTER);
-
-    g_value_take_object (&desktop_value, desktop);
-    g_value_take_object (&metacity_value, metacity);
-    g_value_take_object (&marco_value, marco);
-    g_value_take_object (&gwd_value, gwd);
-    g_value_set_pointer (&writable_value, writable);
-
-    param[0].name = "desktop-gsettings";
-    param[0].value = desktop_value;
-    param[1].name = "metacity-gsettings";
-    param[1].value = metacity_value;
-    param[2].name = "marco-gsettings";
-    param[2].value = marco_value;
-    param[3].name = "gwd-gsettings";
-    param[3].value = gwd_value;
-    param[4].name = "writable-settings";
-    param[4].value = writable_value;
-
-    storage = GWD_SETTINGS_STORAGE_INTERFACE (g_object_newv (GWD_TYPE_SETTINGS_STORAGE_GSETTINGS,
-							     gwd_settings_storage_gsettings_n_construction_params,
-							     param));
-
-    g_value_unset (&desktop_value);
-    g_value_unset (&metacity_value);
-    g_value_unset (&marco_value);
-    g_value_unset (&gwd_value);
-    g_value_unset (&writable_value);
-
-    priv = GET_PRIVATE (storage);
-    priv->is_mate_desktop = FALSE;
-
-    if (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) {
-                    priv->is_mate_desktop = TRUE;
-                    break;
-                }
-            }
-
-            g_strfreev (desktops);
-        }
-    }
-
-    return storage;
-}
-
-/* Factory methods */
-
-static inline GSettings *
-get_settings_no_abort (const gchar *schema)
-{
-    GSettings *settings = NULL;
-
-    if (g_settings_schema_source_lookup (g_settings_schema_source_get_default(), schema, TRUE)) {
-    	settings = g_settings_new (schema);
-    }
-
-    return settings;
-}
-
-static void
-org_compiz_gwd_settings_changed (GSettings   *settings,
-				 const gchar *key,
-				 gpointer    user_data)
-{
-    GWDSettingsStorage *storage = GWD_SETTINGS_STORAGE_INTERFACE (user_data);
-
-    if (strcmp (key, ORG_COMPIZ_GWD_KEY_MOUSE_WHEEL_ACTION) == 0)
-	gwd_settings_storage_update_titlebar_actions (storage);
-    else if (strcmp (key, ORG_COMPIZ_GWD_KEY_BLUR_TYPE) == 0)
-	gwd_settings_storage_update_blur (storage);
-    else if (strcmp (key, ORG_COMPIZ_GWD_KEY_USE_METACITY_THEME) == 0)
-	gwd_settings_storage_update_metacity_theme (storage);
-    else if (strcmp (key, ORG_COMPIZ_GWD_KEY_METACITY_THEME_INACTIVE_OPACITY)	     == 0 ||
-	     strcmp (key, ORG_COMPIZ_GWD_KEY_METACITY_THEME_INACTIVE_SHADE_OPACITY)  == 0 ||
-	     strcmp (key, ORG_COMPIZ_GWD_KEY_METACITY_THEME_ACTIVE_OPACITY)          == 0 ||
-	     strcmp (key, ORG_COMPIZ_GWD_KEY_METACITY_THEME_ACTIVE_SHADE_OPACITY)    == 0)
-	gwd_settings_storage_update_opacity (storage);
-    else if (strcmp (key, ORG_COMPIZ_GWD_KEY_USE_TOOLTIPS) == 0)
-	gwd_settings_storage_update_use_tooltips (storage);
-}
-
-void
-gwd_connect_org_compiz_gwd_settings (GSettings		*settings,
-				     GWDSettingsStorage *storage)
-{
-    if (!settings)
-	return;
-
-    g_signal_connect (settings, "changed", (GCallback) org_compiz_gwd_settings_changed, storage);
-}
-
-GSettings *
-gwd_get_org_compiz_gwd_settings ()
-{
-    return get_settings_no_abort (ORG_COMPIZ_GWD);
-}
-
-static void
-org_gnome_metacity_settings_changed (GSettings   *settings,
-                                     const gchar *key,
-                                     gpointer     user_data)
-{
-    GWDSettingsStorage *storage;
-
-    storage = GWD_SETTINGS_STORAGE_INTERFACE (user_data);
-
-    if (strcmp (key, ORG_GNOME_METACITY_THEME) == 0)
-        gwd_settings_storage_update_metacity_theme (storage);
-}
-
-void
-gwd_connect_org_gnome_metacity_settings (GSettings          *settings,
-                                         GWDSettingsStorage *storage)
-{
-    if (!settings)
-        return;
-
-    g_signal_connect (settings, "changed", (GCallback) org_gnome_metacity_settings_changed, storage);
-}
-
-GSettings *
-gwd_get_org_gnome_metacity_settings ()
-{
-    return get_settings_no_abort (ORG_GNOME_METACITY);
-}
-
-static void
-org_gnome_desktop_wm_keybindings_settings_changed (GSettings   *settings,
-						   const gchar *key,
-						   gpointer    user_data)
-{
-    GWDSettingsStorage *storage = GWD_SETTINGS_STORAGE_INTERFACE (user_data);
-
-    if (strcmp (key, ORG_GNOME_DESKTOP_WM_PREFERENCES_TITLEBAR_USES_SYSTEM_FONT) == 0 ||
-	strcmp (key, ORG_GNOME_DESKTOP_WM_PREFERENCES_TITLEBAR_FONT) == 0)
-	gwd_settings_storage_update_font (storage);
-    else if (strcmp (key, ORG_GNOME_DESKTOP_WM_PREFERENCES_TITLEBAR_FONT) == 0)
-	gwd_settings_storage_update_font (storage);
-    else if (strcmp (key, ORG_GNOME_DESKTOP_WM_PREFERENCES_ACTION_DOUBLE_CLICK_TITLEBAR) == 0 ||
-	     strcmp (key, ORG_GNOME_DESKTOP_WM_PREFERENCES_ACTION_MIDDLE_CLICK_TITLEBAR) == 0 ||
-	     strcmp (key, ORG_GNOME_DESKTOP_WM_PREFERENCES_ACTION_RIGHT_CLICK_TITLEBAR) == 0)
-	gwd_settings_storage_update_titlebar_actions (storage);
-    else if (strcmp (key, ORG_GNOME_DESKTOP_WM_PREFERENCES_THEME) == 0)
-	gwd_settings_storage_update_metacity_theme (storage);
-    else if (strcmp (key, ORG_GNOME_DESKTOP_WM_PREFERENCES_BUTTON_LAYOUT) == 0)
-	gwd_settings_storage_update_button_layout (storage);
-}
-
-void
-gwd_connect_org_gnome_desktop_wm_preferences_settings (GSettings	  *settings,
-						       GWDSettingsStorage *storage)
-{
-    if (!settings)
-	return;
-
-    g_signal_connect (settings, "changed",
-		      (GCallback) org_gnome_desktop_wm_keybindings_settings_changed, storage);
-}
-
-GSettings *
-gwd_get_org_gnome_desktop_wm_preferences_settings ()
-{
-    return get_settings_no_abort (ORG_GNOME_DESKTOP_WM_PREFERENCES);
-}
-
-static void
-org_mate_marco_general_settings_changed (GSettings   *settings,
-                                         const gchar *key,
-                                         gpointer     user_data)
-{
-    GWDSettingsStorage *storage;
-
-    storage = GWD_SETTINGS_STORAGE_INTERFACE (user_data);
-
-    if (strcmp (key, ORG_MATE_MARCO_GENERAL_TITLEBAR_USES_SYSTEM_FONT) == 0 ||
-	strcmp (key, ORG_MATE_MARCO_GENERAL_TITLEBAR_FONT) == 0)
-	gwd_settings_storage_update_font (storage);
-    else if (strcmp (key, ORG_MATE_MARCO_GENERAL_TITLEBAR_FONT) == 0)
-	gwd_settings_storage_update_font (storage);
-    else if (strcmp (key, ORG_MATE_MARCO_GENERAL_ACTION_DOUBLE_CLICK_TITLEBAR) == 0 ||
-	     strcmp (key, ORG_MATE_MARCO_GENERAL_ACTION_MIDDLE_CLICK_TITLEBAR) == 0 ||
-	     strcmp (key, ORG_MATE_MARCO_GENERAL_ACTION_RIGHT_CLICK_TITLEBAR) == 0)
-	gwd_settings_storage_update_titlebar_actions (storage);
-    else if (strcmp (key, ORG_MATE_MARCO_GENERAL_THEME) == 0)
-	gwd_settings_storage_update_metacity_theme (storage);
-    else if (strcmp (key, ORG_MATE_MARCO_GENERAL_BUTTON_LAYOUT) == 0)
-	gwd_settings_storage_update_button_layout (storage);
-}
-
-void
-gwd_connect_org_mate_marco_general_settings (GSettings          *settings,
-                                             GWDSettingsStorage *storage)
-{
-    if (!settings)
-        return;
-
-    g_signal_connect (settings, "changed", (GCallback) org_mate_marco_general_settings_changed, storage);
-}
-
-GSettings *
-gwd_get_org_mate_marco_general_settings ()
-{
-    return get_settings_no_abort (ORG_MATE_MARCO_GENERAL);
+        g_free (right_click_action);
+}
+
+GSettings *
+gwd_get_org_compiz_gwd_settings (GWDSettingsStorage *storage)
+{
+    return storage->gwd;
+}
+
+GSettings *
+gwd_get_org_gnome_desktop_wm_preferences_settings (GWDSettingsStorage *storage)
+{
+    return storage->desktop;
+}
+
+GSettings *
+gwd_get_org_gnome_metacity_settings (GWDSettingsStorage *storage)
+{
+    return storage->metacity;
+}
+
+GSettings *
+gwd_get_org_mate_marco_general_settings (GWDSettingsStorage *storage)
+{
+    return storage->marco;
 }

=== renamed file 'gtk/window-decorator/gwd-settings-storage-gsettings.h' => 'gtk/window-decorator/gwd-settings-storage.h'
--- gtk/window-decorator/gwd-settings-storage-gsettings.h	2016-03-11 14:43:02 +0000
+++ gtk/window-decorator/gwd-settings-storage.h	2016-05-12 13:05:25 +0000
@@ -17,52 +17,15 @@
  *
  * Authored By: Sam Spilsbury <[e-mail]>
  */
-#ifndef _COMPIZ_GWD_SETTINGS_STORAGE_GSETTINGS_H
-#define _COMPIZ_GWD_SETTINGS_STORAGE_GSETTINGS_H
+
+#ifndef GWD_SETTINGS_STORAGE_H
+#define GWD_SETTINGS_STORAGE_H
 
 #include <glib-object.h>
 #include <gwd-fwd.h>
 
 G_BEGIN_DECLS
 
-#define GWD_TYPE_SETTINGS_STORAGE_GSETTINGS (gwd_settings_storage_gsettings_get_type ())
-GType gwd_settings_storage_gsettings_get_type ();
-
-GWDSettingsStorage *
-gwd_settings_storage_gsettings_new (GSettings *orgGNOMEDesktopSettings,
-				    GSettings *metacitySettings,
-				    GSettings *marcoSettings,
-				    GSettings *gwdSettings,
-				    GWDSettingsWritable *writableSettings);
-
-void
-gwd_connect_org_compiz_gwd_settings (GSettings		*settings,
-				     GWDSettingsStorage *storage);
-
-GSettings *
-gwd_get_org_compiz_gwd_settings ();
-
-void
-gwd_connect_org_gnome_metacity_settings (GSettings          *settings,
-                                         GWDSettingsStorage *storage);
-
-GSettings *
-gwd_get_org_gnome_metacity_settings ();
-
-void
-gwd_connect_org_gnome_desktop_wm_preferences_settings (GSettings	  *settings,
-						       GWDSettingsStorage *storage);
-
-GSettings *
-gwd_get_org_gnome_desktop_wm_preferences_settings ();
-
-void
-gwd_connect_org_mate_marco_general_settings (GSettings          *settings,
-                                         GWDSettingsStorage *storage);
-
-GSettings *
-gwd_get_org_mate_marco_general_settings ();
-
 extern const gchar * ORG_COMPIZ_GWD;
 extern const gchar * ORG_GNOME_METACITY;
 extern const gchar * ORG_GNOME_DESKTOP_WM_PREFERENCES;
@@ -92,6 +55,47 @@
 extern const gchar * ORG_MATE_MARCO_GENERAL_TITLEBAR_FONT;
 extern const gchar * ORG_MATE_MARCO_GENERAL_BUTTON_LAYOUT;
 
+#define GWD_TYPE_SETTINGS_STORAGE gwd_settings_storage_get_type ()
+G_DECLARE_FINAL_TYPE (GWDSettingsStorage, gwd_settings_storage,
+                      GWD, SETTINGS_STORAGE, GObject)
+
+GWDSettingsStorage *
+gwd_settings_storage_new                          (GWDSettingsWritable *writable,
+                                                   gboolean             connect);
+
+gboolean
+gwd_settings_storage_update_use_tooltips          (GWDSettingsStorage  *storage);
+
+gboolean
+gwd_settings_storage_update_blur                  (GWDSettingsStorage  *storage);
+
+gboolean
+gwd_settings_storage_update_metacity_theme        (GWDSettingsStorage  *storage);
+
+gboolean
+gwd_settings_storage_update_opacity               (GWDSettingsStorage  *storage);
+
+gboolean
+gwd_settings_storage_update_button_layout         (GWDSettingsStorage  *storage);
+
+gboolean
+gwd_settings_storage_update_font                  (GWDSettingsStorage  *storage);
+
+gboolean
+gwd_settings_storage_update_titlebar_actions      (GWDSettingsStorage *storage);
+
+GSettings *
+gwd_get_org_compiz_gwd_settings                   (GWDSettingsStorage  *storage);
+
+GSettings *
+gwd_get_org_gnome_desktop_wm_preferences_settings (GWDSettingsStorage  *storage);
+
+GSettings *
+gwd_get_org_gnome_metacity_settings               (GWDSettingsStorage  *storage);
+
+GSettings *
+gwd_get_org_mate_marco_general_settings           (GWDSettingsStorage  *storage);
+
 G_END_DECLS
 
 #endif

=== modified file 'gtk/window-decorator/settings.c'
--- gtk/window-decorator/settings.c	2016-05-12 13:05:25 +0000
+++ gtk/window-decorator/settings.c	2016-05-12 13:05:25 +0000
@@ -21,8 +21,7 @@
 
 #include "gtk-window-decorator.h"
 #include "gwd-settings-writable-interface.h"
-#include "gwd-settings-storage-interface.h"
-#include "gwd-settings-storage-gsettings.h"
+#include "gwd-settings-storage.h"
 #include "gwd-settings-xproperty-storage.h"
 
 GWDSettingsStorage *storage = NULL;
@@ -30,20 +29,9 @@
 
 gboolean
 init_settings (GWDSettingsWritable *writable,
-	       WnckScreen	    *screen)
+               WnckScreen          *screen)
 {
-    GSettings *compiz = gwd_get_org_compiz_gwd_settings ();
-    GSettings *metacity = gwd_get_org_gnome_metacity_settings ();
-    GSettings *gnome  = gwd_get_org_gnome_desktop_wm_preferences_settings ();
-    GSettings *marco = gwd_get_org_mate_marco_general_settings ();
-
-    storage = gwd_settings_storage_gsettings_new (gnome, metacity, marco, compiz, writable);
-
-    gwd_connect_org_compiz_gwd_settings (compiz, storage);
-    gwd_connect_org_gnome_metacity_settings (metacity, storage);
-    gwd_connect_org_gnome_desktop_wm_preferences_settings (gnome, storage);
-    gwd_connect_org_mate_marco_general_settings (marco, storage);
-
+    storage = gwd_settings_storage_new (writable, TRUE);
     xprop_storage = gwd_settings_xproperty_storage_new (writable);
 
     gwd_settings_storage_update_metacity_theme (storage);
@@ -53,6 +41,7 @@
     gwd_settings_storage_update_titlebar_actions (storage);
     gwd_settings_storage_update_blur (storage);
     gwd_settings_storage_update_use_tooltips (storage);
+
     gwd_process_decor_shadow_property_update ();
 
     return TRUE;

=== modified file 'gtk/window-decorator/tests/CMakeLists.txt'
--- gtk/window-decorator/tests/CMakeLists.txt	2016-05-12 13:05:25 +0000
+++ gtk/window-decorator/tests/CMakeLists.txt	2016-05-12 13:05:25 +0000
@@ -18,12 +18,6 @@
     link_directories (${CMAKE_CURRENT_BINARY_DIR}
 		      ${CMAKE_CURRENT_BINARY_DIR}/..)
 
-    add_library (gtk_window_decorator_mock_settings_storage STATIC
-		 ${CMAKE_CURRENT_SOURCE_DIR}/compiz_gwd_mock_settings_storage.cpp)
-
-    target_link_libraries (gtk_window_decorator_mock_settings_storage
-			   gtk_window_decorator_settings_storage_interface)
-
     add_library (gtk_window_decorator_mock_settings STATIC
 		 ${CMAKE_CURRENT_SOURCE_DIR}/compiz_gwd_mock_settings.cpp)
 
@@ -49,13 +43,11 @@
 	 gtk_window_decorator_settings
 	 gtk_window_decorator_mock_settings
 	 gtk_window_decorator_mock_settings_writable
-	 gtk_window_decorator_mock_settings_storage
 	 gtk_window_decorator_mock_settings_notified)
 
     set (COMPIZ_TEST_GWD_SETTINGS_COVERAGE_TARGETS
 	 gtk_window_decorator_settings
 	 gtk_window_decorator_settings_interface
-	 gtk_window_decorator_settings_storage_interface
 	 gtk_window_decorator_settings_notified_interface)
 
     set (_desktop_gschema_name org.gnome.desktop.wm.preferences)

=== removed file 'gtk/window-decorator/tests/compiz_gwd_mock_settings_storage.cpp'
--- gtk/window-decorator/tests/compiz_gwd_mock_settings_storage.cpp	2016-02-22 12:27:13 +0000
+++ gtk/window-decorator/tests/compiz_gwd_mock_settings_storage.cpp	1970-01-01 00:00:00 +0000
@@ -1,195 +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]>
- */
-#include <gtest/gtest.h>
-#include <gmock/gmock.h>
-
-#include <glib-object.h>
-
-#include "gwd-settings-storage-interface.h"
-#include "compiz_gwd_mock_settings_storage.h"
-
-#define GWD_MOCK_SETTINGS_STORAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GWD_TYPE_MOCK_SETTINGS_STORAGE, GWDMockSettingsStorage));
-#define GWD_MOCK_SETTINGS_STORAGE_CLASS(obj) (G_TYPE_CHECK_CLASS_CAST ((obj), GWD_TYPE_MOCK_SETTINGS_STORAGE, GWDMockSettingsStorageClass));
-#define GWD_IS_MOCK_SETTINGS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GWD_TYPE_MOCK_SETTINGS_STORAGE));
-#define GWD_IS_MOCK_SETTINGS_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE ((obj), GWD_TYPE_MOCK_SETTINGS_STORAGE));
-#define GWD_MOCK_SETTINGS_STORAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GWD_TYPE_MOCK_SETTINGS_STORAGE, GWDMockSettingsStorageClass));
-
-typedef struct _GWDMockSettingsStorage
-{
-    GObject parent;
-} GWDMockSettingsStorage;
-
-typedef struct _GWDMockSettingsStorageClass
-{
-    GObjectClass parent_class;
-} GWDMockSettingsStorageClass;
-
-static void gwd_mock_settings_storage_interface_init (GWDSettingsStorageInterface *interface);
-
-G_DEFINE_TYPE_WITH_CODE (GWDMockSettingsStorage, gwd_mock_settings_storage, G_TYPE_OBJECT,
-			 G_IMPLEMENT_INTERFACE (GWD_TYPE_SETTINGS_STORAGE_INTERFACE,
-						gwd_mock_settings_storage_interface_init))
-
-#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GWD_TYPE_MOCK_SETTINGS_STORAGE, GWDMockSettingsStoragePrivate))
-
-enum
-{
-    GWD_MOCK_SETTINGS_STORAGE_PROPERTY_GMOCK_INTERFACE = 1
-};
-
-typedef struct _GWDMockSettingsStoragePrivate
-{
-    GWDMockSettingsStorageGMockInterface *mock;
-} GWDMockSettingsStoragePrivate;
-
-gboolean gwd_mock_settings_storage_update_use_tooltips (GWDSettingsStorage *settings)
-{
-    GWDMockSettingsStorage *settingsStorageMock = GWD_MOCK_SETTINGS_STORAGE (settings);
-    GWDMockSettingsStorageGMockInterface *settingsGMock = GET_PRIVATE (settingsStorageMock)->mock;
-    return settingsGMock->updateUseTooltips ();
-}
-
-gboolean gwd_mock_settings_storage_update_blur (GWDSettingsStorage *settings)
-{
-    GWDMockSettingsStorage *settingsStorageMock = GWD_MOCK_SETTINGS_STORAGE (settings);
-    GWDMockSettingsStorageGMockInterface *settingsGMock = GET_PRIVATE (settingsStorageMock)->mock;
-    return settingsGMock->updateBlur ();
-}
-
-gboolean gwd_mock_settings_storage_update_metacity_theme (GWDSettingsStorage *settings)
-{
-    GWDMockSettingsStorage *settingsStorageMock = GWD_MOCK_SETTINGS_STORAGE (settings);
-    GWDMockSettingsStorageGMockInterface *settingsGMock = GET_PRIVATE (settingsStorageMock)->mock;
-    return settingsGMock->updateMetacityTheme ();
-}
-
-gboolean gwd_mock_settings_storage_update_opacity (GWDSettingsStorage *settings)
-{
-    GWDMockSettingsStorage *settingsStorageMock = GWD_MOCK_SETTINGS_STORAGE (settings);
-    GWDMockSettingsStorageGMockInterface *settingsGMock = GET_PRIVATE (settingsStorageMock)->mock;
-    return settingsGMock->updateOpacity ();
-}
-
-gboolean gwd_mock_settings_storage_update_button_layout (GWDSettingsStorage *settings)
-{
-    GWDMockSettingsStorage *settingsStorageMock = GWD_MOCK_SETTINGS_STORAGE (settings);
-    GWDMockSettingsStorageGMockInterface *settingsGMock = GET_PRIVATE (settingsStorageMock)->mock;
-    return settingsGMock->updateButtonLayout ();
-}
-
-gboolean gwd_mock_settings_storage_update_font (GWDSettingsStorage *settings)
-{
-    GWDMockSettingsStorage *settingsStorageMock = GWD_MOCK_SETTINGS_STORAGE (settings);
-    GWDMockSettingsStorageGMockInterface *settingsGMock = GET_PRIVATE (settingsStorageMock)->mock;
-    return settingsGMock->updateFont ();
-}
-
-gboolean gwd_mock_settings_storage_update_titlebar_actions (GWDSettingsStorage *settings)
-{
-    GWDMockSettingsStorage *settingsStorageMock = GWD_MOCK_SETTINGS_STORAGE (settings);
-    GWDMockSettingsStorageGMockInterface *settingsGMock = GET_PRIVATE (settingsStorageMock)->mock;
-    return settingsGMock->updateTitlebarActions ();
-}
-
-static void gwd_mock_settings_storage_interface_init (GWDSettingsStorageInterface *interface)
-{
-    interface->update_use_tooltips = gwd_mock_settings_storage_update_use_tooltips;
-    interface->update_blur = gwd_mock_settings_storage_update_blur;
-    interface->update_metacity_theme = gwd_mock_settings_storage_update_metacity_theme;
-    interface->update_opacity = gwd_mock_settings_storage_update_opacity;
-    interface->update_button_layout = gwd_mock_settings_storage_update_button_layout;
-    interface->update_font = gwd_mock_settings_storage_update_font;
-    interface->update_titlebar_actions = gwd_mock_settings_storage_update_titlebar_actions;
-}
-
-static void gwd_mock_settings_storage_set_property (GObject *object,
-						     guint   property_id,
-						     const GValue  *value,
-						     GParamSpec *pspec)
-{
-    GWDMockSettingsStoragePrivate *priv = GET_PRIVATE (object);
-
-    switch (property_id)
-    {
-	case GWD_MOCK_SETTINGS_STORAGE_PROPERTY_GMOCK_INTERFACE:
-	    if (!priv->mock)
-		priv->mock = reinterpret_cast <GWDMockSettingsStorageGMockInterface *> (g_value_get_pointer (value));
-	    break;
-	default:
-	    g_assert_not_reached ();
-    }
-}
-
-static void gwd_mock_settings_storage_dispose (GObject *object)
-{
-    GWDMockSettingsStorageGMockInterface *settingsGMock = GET_PRIVATE (object)->mock;
-    G_OBJECT_CLASS (gwd_mock_settings_storage_parent_class)->dispose (object);
-    settingsGMock->dispose ();
-}
-
-static void gwd_mock_settings_storage_finalize (GObject *object)
-{
-    GWDMockSettingsStorageGMockInterface *settingsGMock = GET_PRIVATE (object)->mock;
-    G_OBJECT_CLASS (gwd_mock_settings_storage_parent_class)->finalize (object);
-    settingsGMock->finalize ();
-}
-
-static void gwd_mock_settings_storage_class_init (GWDMockSettingsStorageClass *klass)
-{
-    GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-    g_type_class_add_private (klass, sizeof (GWDMockSettingsStoragePrivate));
-
-    object_class->dispose = gwd_mock_settings_storage_dispose;
-    object_class->finalize = gwd_mock_settings_storage_finalize;
-    object_class->set_property = gwd_mock_settings_storage_set_property;
-
-    g_object_class_install_property (object_class,
-				     GWD_MOCK_SETTINGS_STORAGE_PROPERTY_GMOCK_INTERFACE,
-				     g_param_spec_pointer ("gmock-interface",
-							   "Google Mock Interface",
-							   "Google Mock Interface",
-							   static_cast <GParamFlags> (G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)));
-}
-
-void gwd_mock_settings_storage_init (GWDMockSettingsStorage *self)
-{
-}
-
-GWDSettingsStorage *
-gwd_mock_settings_storage_new (GWDMockSettingsStorageGMockInterface *gmock)
-{
-    GValue gmock_interface_v = G_VALUE_INIT;
-
-    g_value_init (&gmock_interface_v, G_TYPE_POINTER);
-
-    g_value_set_pointer (&gmock_interface_v, reinterpret_cast <gpointer> (gmock));
-
-    GParameter param[1] =
-    {
-	{ "gmock-interface", gmock_interface_v }
-    };
-
-    GWDSettingsStorage *storage = GWD_SETTINGS_STORAGE_INTERFACE (g_object_newv (GWD_TYPE_MOCK_SETTINGS_STORAGE, 1, param));
-
-    g_value_unset (&gmock_interface_v);
-
-    return storage;
-}

=== removed file 'gtk/window-decorator/tests/compiz_gwd_mock_settings_storage.h'
--- gtk/window-decorator/tests/compiz_gwd_mock_settings_storage.h	2012-09-06 10:08:25 +0000
+++ gtk/window-decorator/tests/compiz_gwd_mock_settings_storage.h	1970-01-01 00:00:00 +0000
@@ -1,80 +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_MOCK_SETTINGS_STORAGE_H
-#define _COMPIZ_GWD_MOCK_SETTINGS_STORAGE_H
-
-#include <gtest/gtest.h>
-#include <gmock/gmock.h>
-
-#include <glib-object.h>
-
-typedef struct _GWDSettingsStorage GWDSettingsStorage;
-
-class GWDMockSettingsStorageGMockInterface;
-
-G_BEGIN_DECLS
-
-#define GWD_TYPE_MOCK_SETTINGS_STORAGE (gwd_mock_settings_storage_get_type ())
-GType gwd_mock_settings_storage_get_type ();
-
-GWDSettingsStorage *
-gwd_mock_settings_storage_new (GWDMockSettingsStorageGMockInterface *);
-
-G_END_DECLS
-
-class GWDMockSettingsStorageGMockInterface
-{
-    public:
-
-	virtual ~GWDMockSettingsStorageGMockInterface () {}
-
-	virtual gboolean updateUseTooltips () = 0;
-	virtual gboolean updateDraggableBorderWidth () = 0;
-	virtual gboolean updateAttachModalDialogs () = 0;
-	virtual gboolean updateBlur () = 0;
-	virtual gboolean updateMetacityTheme () = 0;
-	virtual gboolean updateOpacity () = 0;
-	virtual gboolean updateButtonLayout () = 0;
-	virtual gboolean updateFont () = 0;
-	virtual gboolean updateTitlebarActions () = 0;
-
-	virtual void dispose () = 0;
-	virtual void finalize () = 0;
-};
-
-class GWDMockSettingsStorageGMock :
-    public GWDMockSettingsStorageGMockInterface
-{
-    public:
-
-	MOCK_METHOD0 (updateUseTooltips, gboolean ());
-	MOCK_METHOD0 (updateDraggableBorderWidth, gboolean ());
-	MOCK_METHOD0 (updateAttachModalDialogs, gboolean ());
-	MOCK_METHOD0 (updateBlur, gboolean ());
-	MOCK_METHOD0 (updateMetacityTheme, gboolean ());
-	MOCK_METHOD0 (updateOpacity, gboolean ());
-	MOCK_METHOD0 (updateButtonLayout, gboolean ());
-	MOCK_METHOD0 (updateFont, gboolean ());
-	MOCK_METHOD0 (updateTitlebarActions, gboolean ());
-	MOCK_METHOD0 (dispose, void ());
-	MOCK_METHOD0 (finalize, void ());
-};
-
-#endif

=== modified file 'gtk/window-decorator/tests/test_gwd_settings.cpp'
--- gtk/window-decorator/tests/test_gwd_settings.cpp	2016-05-12 13:05:25 +0000
+++ gtk/window-decorator/tests/test_gwd_settings.cpp	2016-05-12 13:05:25 +0000
@@ -43,16 +43,14 @@
 
 #include "gwd-settings-interface.h"
 #include "gwd-settings.h"
-#include "gwd-settings-storage-gsettings.h"
+#include "gwd-settings-storage.h"
 #include "gwd-settings-writable-interface.h"
-#include "gwd-settings-storage-interface.h"
 #include "gwd-settings-notified-interface.h"
 
 #include "decoration.h"
 
 #include "compiz_gwd_mock_settings.h"
 #include "compiz_gwd_mock_settings_writable.h"
-#include "compiz_gwd_mock_settings_storage.h"
 #include "compiz_gwd_mock_settings_notified.h"
 
 using ::testing::TestWithParam;
@@ -1288,152 +1286,6 @@
     gwd_settings_storage_update_titlebar_actions (storage);
 }
 
-class GWDMockSettingsStorageFactoryWrapper :
-    public GWDSettingsStorageFactoryWrapperInterface
-{
-    public:
-
-	virtual void SetUp (GWDSettingsWritable *writable)
-	{
-	    mWritable = writable;
-	    mStorageMock.reset (new GWDMockSettingsStorageGMock ());
-	    mStorage.reset (gwd_mock_settings_storage_new (mStorageMock.get ()),
-			    boost::bind (gwd_settings_storage_unref, _1));
-	}
-
-	virtual GWDSettingsStorage * GetStorage ()
-	{
-	    return mStorage.get ();
-	}
-
-	virtual void SetUseTooltips (gboolean useTooltips)
-	{
-	    EXPECT_CALL (*mStorageMock, updateUseTooltips ())
-		    .WillOnce (
-			InvokeFunctor (
-			    boost::bind (
-				gwd_settings_writable_use_tooltips_changed, mWritable, useTooltips)));
-	}
-
-	virtual void SetBlur (const std::string &blurType)
-	{
-	    EXPECT_CALL (*mStorageMock, updateBlur ())
-		    .WillOnce (
-			InvokeFunctor (
-			    boost::bind (
-				gwd_settings_writable_blur_changed, mWritable, blurType.c_str ())));
-	}
-
-	virtual void SetOpacity (gdouble activeOpacity,
-				 gdouble inactiveOpacity,
-				 gboolean activeShadeOpacity,
-				 gboolean inactiveShadeOpacity)
-	{
-	    EXPECT_CALL (*mStorageMock, updateOpacity ())
-		    .WillOnce (
-			InvokeFunctor (
-			    boost::bind (
-				gwd_settings_writable_opacity_changed,
-				mWritable,
-				activeOpacity,
-				inactiveOpacity,
-				activeShadeOpacity,
-				inactiveShadeOpacity)));
-	}
-
-	virtual void SetMetacityTheme (gboolean useMetacityTheme,
-				       const std::string &metacityTheme)
-	{
-	    EXPECT_CALL (*mStorageMock, updateMetacityTheme ())
-		    .WillOnce (
-			InvokeFunctor (
-			    boost::bind (
-				gwd_settings_writable_metacity_theme_changed,
-				mWritable,
-				useMetacityTheme,
-				metacityTheme.c_str ())));
-	}
-
-	virtual void SetButtonLayout (const std::string &buttonLayout)
-	{
-	    EXPECT_CALL (*mStorageMock, updateButtonLayout ())
-		    .WillOnce (
-			InvokeFunctor (
-			    boost::bind (
-				gwd_settings_writable_button_layout_changed, mWritable, buttonLayout.c_str ())));
-	}
-
-	virtual void SetFont (gboolean useSystemFont, const std::string &titlebarFont)
-	{
-	    EXPECT_CALL (*mStorageMock, updateFont ())
-		    .WillOnce (
-			InvokeFunctor (
-			    boost::bind (
-				gwd_settings_writable_font_changed,
-				mWritable,
-				useSystemFont,
-				titlebarFont.c_str ())));
-	}
-
-	virtual void SetTitlebarActions (const std::string &doubleClickAction,
-					 const std::string &middleClickAction,
-					 const std::string &rightClickAction,
-					 const std::string &mouseWheelAction)
-	{
-	    EXPECT_CALL (*mStorageMock, updateTitlebarActions ())
-		    .WillOnce (
-			InvokeFunctor (
-			    boost::bind (
-				gwd_settings_writable_titlebar_actions_changed,
-				mWritable,
-				doubleClickAction.c_str (),
-				middleClickAction.c_str (),
-				rightClickAction.c_str (),
-				mouseWheelAction.c_str ())));
-	}
-
-	virtual void TearDown ()
-	{
-	    if (mStorage)
-	    {
-		EXPECT_CALL (*mStorageMock, dispose ());
-		EXPECT_CALL (*mStorageMock, finalize ());
-	    }
-
-	    mStorage.reset ();
-	    mStorageMock.reset ();
-	}
-
-    private:
-
-	GWDSettingsWritable *mWritable;
-	boost::shared_ptr <GWDMockSettingsStorageGMock> mStorageMock;
-	boost::shared_ptr <GWDSettingsStorage> mStorage;
-};
-
-INSTANTIATE_TEST_CASE_P (MockStorageUpdates, GWDSettingsTestStorageUpdates,
-			 ::testing::Values (boost::shared_ptr <GWDSettingsStorageFactoryWrapperInterface> (new GWDMockSettingsStorageFactoryWrapper ())));
-
-class GWDSettingsStorageGSettingsTest :
-    public GWDSettingsTestCommon
-{
-};
-
-TEST_F (GWDSettingsStorageGSettingsTest, TestNoDeathOnConnectingSignalToNULLObject)
-{
-    boost::shared_ptr <GWDMockSettingsStorageGMock> mStorageMock (new GWDMockSettingsStorageGMock ());
-    boost::shared_ptr <GWDSettingsStorage>          mStorage (gwd_mock_settings_storage_new  (mStorageMock.get ()),
-							      boost::bind (gwd_settings_storage_unref, _1));
-
-    gwd_connect_org_compiz_gwd_settings (NULL, mStorage.get ());
-    gwd_connect_org_gnome_metacity_settings (NULL, mStorage.get ());
-    gwd_connect_org_gnome_desktop_wm_preferences_settings (NULL, mStorage.get ());
-    gwd_connect_org_mate_marco_general_settings (NULL, mStorage.get ());
-
-    EXPECT_CALL (*mStorageMock, dispose ());
-    EXPECT_CALL (*mStorageMock, finalize ());
-}
-
 class GWDSettingsStorageGSettingsFactoryWrapper :
     public GWDSettingsStorageFactoryWrapperInterface
 {
@@ -1444,18 +1296,14 @@
 	    gsliceEnv.SetUpEnv ();
 	    gsettingsEnv.SetUpEnv (MOCK_PATH);
 
+	    mStorage.reset (gwd_settings_storage_new (writable, FALSE),
+			    boost::bind (gwd_settings_storage_unref, _1));
+
 	    /* We do not need to keep a reference to these */
-	    mGWDSettings = gwd_get_org_compiz_gwd_settings ();
-	    mMetacitySettings = gwd_get_org_gnome_metacity_settings ();
-	    mDesktopSettings = gwd_get_org_gnome_desktop_wm_preferences_settings ();
-	    mMarcoSettings = gwd_get_org_mate_marco_general_settings ();
-
-	    mStorage.reset (gwd_settings_storage_gsettings_new (mDesktopSettings,
-								mMetacitySettings,
-								mMarcoSettings,
-								mGWDSettings,
-								writable),
-			    boost::bind (gwd_settings_storage_unref, _1));
+	    mGWDSettings = gwd_get_org_compiz_gwd_settings (GetStorage ());
+	    mMetacitySettings = gwd_get_org_gnome_metacity_settings (GetStorage ());
+	    mDesktopSettings = gwd_get_org_gnome_desktop_wm_preferences_settings (GetStorage ());
+	    mMarcoSettings = gwd_get_org_mate_marco_general_settings (GetStorage ());
 	}
 
 	virtual GWDSettingsStorage * GetStorage ()