Merge lp:~compiz-team/compiz/compiz.fix_1064791 into lp:compiz/0.9.9

[Sam Spilsbury]

Don't write plugins-with-set-keys every single time we read a schema, if
the value is already in plugins-with-set-keys. Added tests to demonstrate
behaviour.
(LP: #1064791)

vanvugt says: This also seems to fix LP: #1044662, somehow.

Don't write plugins-with-set-keys every single time we read a schema, if the value is already in plugins-with-set-keys. Added tests to demonstrate behaviour.

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:3421
http://jenkins.qa.ubuntu.com/job/compiz-ci/167/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/167/console

review: Needs Fixing (continuous-integration)

[Sam Spilsbury (smspillaz)]

As above.

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:3421
http://jenkins.qa.ubuntu.com/job/compiz-ci/174/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/174/console

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

I am concerned about very long identifiers...
  typedef struct _CCSGNOMEIntegrationGSettingsWrapperFactoryPrivate CCSGNOMEIntegrationGSettingsWrapperFactoryPrivate;
I cannot read that. The words are too long for my feeble human brain to recognize symbolically. And I'm sure most humans would agree. It is however very important for code to be readable by human beings for the sake of maintenance.

I know there's a lot of existing code written that way already. However it was landed without review due to limited time before release. So I'd like to say: No more new code with unreadably long identifiers please.

AFAIK, C/C++ should only accept up to 32 characters. And I've never seen anything even that long before now.

Secondly, "Bug #1064791: Redundant writes to plugins-with-set-keys" suggests a very simple problem that should have a very simple solution. So why "1663 lines (+1030/-243) 21 files modified" ?

review: Needs Fixing

[Sam Spilsbury (smspillaz)]

> I am concerned about very long identifiers...
> typedef struct _CCSGNOMEIntegrationGSettingsWrapperFactoryPrivate
> CCSGNOMEIntegrationGSettingsWrapperFactoryPrivate;
> I cannot read that. The words are too long for my feeble human brain to
> recognize symbolically. And I'm sure most humans would agree. It is however
> very important for code to be readable by human beings for the sake of
> maintenance.
>
> I know there's a lot of existing code written that way already. However it was
> landed without review due to limited time before release. So I'd like to say:
> No more new code with unreadably long identifiers please.

Yeah this sucks, but it does accurately describe its role. Its a libcompizconfig gnome-integration gsettings-wrapper factory private-data. That's not really something that can be shortened, and c's lack of namespaces makes it a lot harder to do so. I can perhaps drop the CCS and Integration to just have GNOMEGSettingsWrapperFactoryPrivate or just WrapperFactoryPrivate since its exclusive to this file.

>
> AFAIK, C/C++ should only accept up to 32 characters. And I've never seen
> anything even that long before now.

That would be a god-awful old compiler that did that. Sure you're not typing this on a VT-100 ;-) ?

>
> Secondly, "Bug #1064791: Redundant writes to plugins-with-set-keys" suggests a
> very simple problem that should have a very simple solution. So why "1663
> lines (+1030/-243) 21 files modified" ?

Tests basically, and the fun-stuff that comes with that. I need to instantiate CCSGSettingsBackend independently, and it turned out that this wasn't trivial with the current design because CCSGSettingsBackend creates a lot of objects on construction.

[lp:~compiz-team/compiz/compiz.fix_1064791]

3422. By Sam Spilsbury on 2012-10-12

Drop reference to factory as the integrated setting factory takes one. Fixes
a memory leak

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:3422
http://jenkins.qa.ubuntu.com/job/compiz-ci/178/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/178/console

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

Certainly if the type, or any identifier at all, is local to one file then you don't need to over-prefix it like a namespace. The identifier only needs to be unique within the file. Yes, "Integration" is a redundant word. And while "Wrapper", "Factory" and "Private" may be accurate you should re-evaluate if you need to have things wrapped, from factories or pimpl'd at all.

32 characters is too long already. I'm sure you can find some literature about how human beings read text. You will find that we recognise words as symbols and do not look at the individual letters. However this readability breaks down at some length (which IMHO is shorter than 32).

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3422
http://jenkins.qa.ubuntu.com/job/compiz-ci/183/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/183/console

review: Needs Fixing (continuous-integration)

[Sam Spilsbury (smspillaz)]

> Certainly if the type, or any identifier at all, is local to one file then you
> don't need to over-prefix it like a namespace. The identifier only needs to be
> unique within the file. Yes, "Integration" is a redundant word. And while
> "Wrapper", "Factory" and "Private" may be accurate you should re-evaluate if
> you need to have things wrapped, from factories or pimpl'd at all.

Wrappers - required for testing purposes
Private - that's fundamentally how libcompizconfig's object system works
Factory - need to delay instance creation until later, need to change the way instance creation works (we can't ever create a wrapper around a real GSettings object in testing)

>
> 32 characters is too long already. I'm sure you can find some literature about
> how human beings read text. You will find that we recognise words as symbols
> and do not look at the individual letters. However this readability breaks
> down at some length (which IMHO is shorter than 32).

To be fair, type names don't come up all that much - long names is more of a problem for variables than it is types, because types need to be searchable and not recognizable.

[Daniel van Vugt (vanvugt)]

OK, I don't claim to understand it. And I still think it's not readable (although that problem mostly pre-dates this proposal).

All tests pass. Clang is happy. Valgrind is happy. I don't know of any functional problems.

In fact, this branch fixes bug 1044662 for me. Don't know why, but I have triple checked. So that's awesome.

[Daniel van Vugt (vanvugt)]

review: Approve

=== modified file 'compizconfig/gsettings/CMakeLists.txt'
--- compizconfig/gsettings/CMakeLists.txt	2012-09-27 09:28:59 +0000
+++ compizconfig/gsettings/CMakeLists.txt	2012-10-12 01:30:30 +0000
@@ -21,9 +21,19 @@
 add_subdirectory (gsettings_backend_shared)
 
 include_directories (${CMAKE_CURRENT_SOURCE_DIR}/gsettings_backend_shared
-                     ${CMAKE_SOURCE_DIR}/compizconfig/integration/gnome/gsettings/include)
-
-compizconfig_backend (gsettings PKGDEPS ${_deps} LIBRARIES compizconfig_gsettings_backend)
+                     ${CMAKE_SOURCE_DIR}/compizconfig/integration/gnome/gsettings/include
+                     ${CMAKE_SOURCE_DIR}/compizconfig/integration/gnome/include)
+
+set (COMPIZCONFIG_GSETTINGS_BACKEND_LIBRARIES
+     compizconfig_gsettings_wrapper
+     compizconfig_gnome_integration
+     compizconfig_gnome_integration_gsettings_setting_factory
+     compizconfig_gnome_integration_gsettings_wrapper_factory
+     compizconfig_gsettings_wrapper_factory_interface
+     compizconfig_gsettings_wrapper_factory
+     compizconfig_gsettings_backend)
+
+compizconfig_backend (gsettings PKGDEPS ${_deps} LIBRARIES ${COMPIZCONFIG_GSETTINGS_BACKEND_LIBRARIES})
 
 find_program (GLIB_COMPILE_SCHEMAS glib-compile-schemas)
 

=== modified file 'compizconfig/gsettings/gsettings_backend_shared/CMakeLists.txt'
--- compizconfig/gsettings/gsettings_backend_shared/CMakeLists.txt	2012-10-06 16:11:05 +0000
+++ compizconfig/gsettings/gsettings_backend_shared/CMakeLists.txt	2012-10-12 01:30:30 +0000
@@ -24,6 +24,12 @@
     add_library (compizconfig_gsettings_backend_interface STATIC
                  ${CMAKE_CURRENT_SOURCE_DIR}/ccs_gsettings_backend_interface.c)
 
+    add_library (compizconfig_gsettings_wrapper_factory_interface STATIC
+                 ${CMAKE_CURRENT_SOURCE_DIR}/ccs_gsettings_wrapper_factory_interface.c)
+
+    add_library (compizconfig_gsettings_wrapper_factory STATIC
+                 ${CMAKE_CURRENT_SOURCE_DIR}/ccs_gsettings_wrapper_factory.c)
+
     add_library (compizconfig_gsettings_wrapper_interface STATIC
                  ${CMAKE_CURRENT_SOURCE_DIR}/ccs_gsettings_interface.c)
 
@@ -53,6 +59,8 @@
 	 compizconfig_gsettings_wrapper
 	 compizconfig_gnome_integration
 	 compizconfig_gnome_integration_gsettings_setting_factory
+	 compizconfig_gsettings_wrapper_factory_interface
+	 compizconfig_gsettings_wrapper_factory
 	 compizconfig)
 
     if (USE_GCONF)

=== modified file 'compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend.c'
--- compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend.c	2012-09-23 04:35:00 +0000
+++ compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend.c	2012-10-12 01:30:30 +0000
@@ -8,22 +8,24 @@
 #include "ccs_gsettings_backend_interface.h"
 #include "ccs_gsettings_interface.h"
 #include "ccs_gsettings_interface_wrapper.h"
+#include "ccs_gsettings_wrapper_factory_interface.h"
 #include "ccs_gnome_integration.h"
 #include "ccs_gnome_integration_gsettings_integrated_setting_factory.h"
 #include "gsettings_shared.h"
 
 struct _CCSGSettingsBackendPrivate
 {
-    GList	   *settingsList;
-    CCSGSettingsWrapper *compizconfigSettings;
-    CCSGSettingsWrapper *currentProfileSettings;
+    GList	               *settingsList;
+    CCSGSettingsWrapper        *compizconfigSettings;
+    CCSGSettingsWrapper        *currentProfileSettings;
+    CCSGSettingsWrapperFactory *wrapperFactory;
 
     char	    *currentProfile;
     CCSContext	    *context;
 
     CCSIntegration *integration;
 
-    CCSGNOMEValueChangeData valueChangeData;
+    CCSGNOMEValueChangeData *valueChangeData;
 };
 
 void
@@ -112,7 +114,7 @@
 
     /* No existing settings object found for this schema, create one */
     
-    settingsObj = ccsGSettingsWrapperNewForSchemaWithPath (schemaName, path, &ccsDefaultObjectAllocator);
+    settingsObj = ccsGSettingsWrapperFactoryNewGSettingsWrapperWithPath (priv->wrapperFactory, schemaName, path, &ccsDefaultObjectAllocator);
     ccsGSettingsBackendConnectToChangedSignal (backend, settingsObj);
     priv->settingsList = g_list_append (priv->settingsList, (void *) settingsObj);
 
@@ -124,11 +126,12 @@
 
     writtenPlugins = ccsGSettingsWrapperGetValue (priv->currentProfileSettings, "plugins-with-set-keys");
 
-    appendToPluginsWithSetKeysList (plugin, writtenPlugins, &newWrittenPlugins, &newWrittenPluginsSize);
-
-    GVariant *newWrittenPluginsVariant = g_variant_new_strv ((const gchar * const *) newWrittenPlugins, newWrittenPluginsSize);
-
-    ccsGSettingsWrapperSetValue (priv->currentProfileSettings, "plugins-with-set-keys", newWrittenPluginsVariant);
+    if (appendToPluginsWithSetKeysList (plugin, writtenPlugins, &newWrittenPlugins, &newWrittenPluginsSize))
+    {
+	GVariant *newWrittenPluginsVariant = g_variant_new_strv ((const gchar * const *) newWrittenPlugins, newWrittenPluginsSize);
+
+	ccsGSettingsWrapperSetValue (priv->currentProfileSettings, "plugins-with-set-keys", newWrittenPluginsVariant);
+    }
 
     g_variant_unref (writtenPlugins);
     g_free (schemaName);
@@ -367,26 +370,6 @@
     return priv;
 }
 
-static char*
-getCurrentProfileName (CCSBackend *backend)
-{
-    GVariant *value;
-    char     *ret = NULL;
-
-    CCSGSettingsBackendPrivate *priv = (CCSGSettingsBackendPrivate *) ccsObjectGetPrivate (backend);
-
-    value = ccsGSettingsWrapperGetValue (priv->compizconfigSettings, "current-profile");
-
-    if (value)
-	ret = strdup (g_variant_get_string (value, NULL));
-    else
-	ret = strdup (DEFAULTPROF);
-
-    g_variant_unref (value);
-
-    return ret;
-}
-
 static void
 ccsGSettingsWrapperDestroyNotify (gpointer o)
 {
@@ -418,6 +401,9 @@
     priv->compizconfigSettings = NULL;
 
     ccsIntegrationUnref (priv->integration);
+    ccsGSettingsWrapperFactoryUnref (priv->wrapperFactory);
+
+    free (priv->valueChangeData);
 
     free (priv);
     ccsObjectSetPrivate (backend, NULL);
@@ -425,41 +411,26 @@
 }
 
 Bool
-ccsGSettingsBackendAttachNewToBackend (CCSBackend *backend, CCSContext *context)
+ccsGSettingsBackendAttachNewToBackend (CCSBackend                 *backend,
+				       CCSContext                 *context,
+				       CCSGSettingsWrapper        *compizconfigSettings,
+				       CCSGSettingsWrapper        *currentProfileSettings,
+				       CCSGSettingsWrapperFactory *wrapperFactory,
+				       CCSIntegration             *integration,
+				       CCSGNOMEValueChangeData    *valueChangeData,
+				       char                       *currentProfile)
 {
-    char       *currentProfilePath;
-
     ccsObjectAddInterface (backend, (CCSInterface *) &gsettingsAdditionalDefaultInterface, GET_INTERFACE_TYPE (CCSGSettingsBackendInterface));
 
     CCSGSettingsBackendPrivate *priv = addPrivateToBackend (backend, backend->object.object_allocation);
 
-    priv->compizconfigSettings = ccsGSettingsWrapperNewForSchema (COMPIZCONFIG_SCHEMA_ID,
-								  backend->object.object_allocation);
-    priv->currentProfile = getCurrentProfileName (backend);
-    currentProfilePath = makeCompizProfilePath (priv->currentProfile);
-    priv->currentProfileSettings = ccsGSettingsWrapperNewForSchemaWithPath (PROFILE_SCHEMA_ID,
-									    currentProfilePath,
-									    backend->object.object_allocation);
+    priv->compizconfigSettings = compizconfigSettings;
+    priv->currentProfile = currentProfile;
+    priv->currentProfileSettings = currentProfileSettings;
     priv->context = context;
-
-    CCSGNOMEIntegrationGSettingsWrapperFactory *wrapperFactory = ccsGNOMEIntegrationGSettingsWrapperDefaultImplNew (&ccsDefaultObjectAllocator);
-    CCSIntegratedSettingsStorage *storage = ccsIntegratedSettingsStorageDefaultImplNew (&ccsDefaultObjectAllocator);
-
-    priv->valueChangeData.storage = storage;
-    priv->valueChangeData.context = priv->context;
-
-    CCSIntegratedSettingFactory *factory = ccsGSettingsIntegratedSettingFactoryNew (wrapperFactory,
-										    &priv->valueChangeData,
-										    &ccsDefaultObjectAllocator);
-
-    priv->valueChangeData.factory = factory;
-
-    priv->integration = ccsGNOMEIntegrationBackendNew (backend, context, factory, storage, backend->object.object_allocation);
-
-
-
-    priv->valueChangeData.integration = priv->integration;
-
-    g_free (currentProfilePath);
+    priv->valueChangeData = valueChangeData;
+    priv->integration = integration;
+    priv->wrapperFactory = wrapperFactory;
+
     return TRUE;
 }

=== modified file 'compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend.h'
--- compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend.h	2012-10-06 16:11:05 +0000
+++ compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend.h	2012-10-12 01:30:30 +0000
@@ -4,12 +4,20 @@
 #include <ccs-defs.h>
 #include <ccs-backend.h>
 #include <ccs_gsettings_backend_fwd.h>
+#include <ccs_gnome_fwd.h>
 #include <glib.h>
 
 COMPIZCONFIG_BEGIN_DECLS
 
 Bool
-ccsGSettingsBackendAttachNewToBackend (CCSBackend *backend, CCSContext *context);
+ccsGSettingsBackendAttachNewToBackend (CCSBackend                 *backend,
+				       CCSContext                 *context,
+				       CCSGSettingsWrapper        *compizconfigSettings,
+				       CCSGSettingsWrapper        *currentProfileSettings,
+				       CCSGSettingsWrapperFactory *wrapperFactory,
+				       CCSIntegration             *integration,
+				       CCSGNOMEValueChangeData    *valueChangeData,
+				       char                       *currentProfile);
 
 void
 ccsGSettingsBackendDetachFromBackend (CCSBackend *backend);

=== modified file 'compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend_fwd.h'
--- compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend_fwd.h	2012-10-06 16:11:05 +0000
+++ compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend_fwd.h	2012-10-12 01:30:30 +0000
@@ -7,6 +7,7 @@
 
 typedef struct _CCSGSettingsWrapper CCSGSettingsWrapper;
 typedef struct _CCSGSettingsBackend CCSGSettingsBackend;
+typedef struct _CCSGSettingsWrapperFactory CCSGSettingsWrapperFactory;
 
 COMPIZCONFIG_END_DECLS
 

=== added file 'compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_wrapper_factory.c'
--- compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_wrapper_factory.c	1970-01-01 00:00:00 +0000
+++ compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_wrapper_factory.c	2012-10-12 01:30:30 +0000
@@ -0,0 +1,96 @@
+/**
+ *
+ * GSettings libcompizconfig backend
+ *
+ * ccs_gsettings_wrapper_factory.c
+ *
+ * Copyright (c) 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.
+ *
+ * Authored By:
+ *	Sam Spilsbury <[e-mail]>
+ *
+ **/
+#include <ccs-object.h>
+#include "ccs_gsettings_wrapper_factory.h"
+#include "ccs_gsettings_wrapper_factory_interface.h"
+#include "ccs_gsettings_interface.h"
+#include "ccs_gsettings_interface_wrapper.h"
+
+/* CCSGSettingsWrapperFactory implementation */
+typedef struct _CCSGSettingsWrapperFactoryPrivate CCSGSettingsWrapperFactoryPrivate;
+struct _CCSGSettingsWrapperFactoryPrivate
+{
+};
+
+static void
+ccsGSettingsWrapperDefaultImplFree (CCSGSettingsWrapperFactory *wrapperFactory)
+{
+    ccsObjectFinalize (wrapperFactory);
+    (*wrapperFactory->object.object_allocation->free_) (wrapperFactory->object.object_allocation->allocator,
+							wrapperFactory);
+}
+
+static CCSGSettingsWrapper *
+ccsGSettingsWrapperFactoryNewGSettingsWrapperDefault (CCSGSettingsWrapperFactory   *factory,
+						      const gchar                  *schemaName,
+						      CCSObjectAllocationInterface *ai)
+{
+    CCSGSettingsWrapper *wrapper = ccsGSettingsWrapperNewForSchema (schemaName, ai);
+
+    return wrapper;
+}
+
+CCSGSettingsWrapper *
+ccsGSettingsWrapperFactoryNewGSettingsWrapperWithPathDefault (CCSGSettingsWrapperFactory   *wrapperFactory,
+							      const gchar                  *schemaName,
+							      const gchar                  *path,
+							      CCSObjectAllocationInterface *ai)
+{
+    CCSGSettingsWrapper *wrapper = ccsGSettingsWrapperNewForSchemaWithPath (schemaName,
+									    path,
+									    ai);
+
+    return wrapper;
+}
+
+const CCSGSettingsWrapperFactoryInterface ccsGSettingsWrapperFactoryInterface =
+{
+    ccsGSettingsWrapperFactoryNewGSettingsWrapperDefault,
+    ccsGSettingsWrapperFactoryNewGSettingsWrapperWithPathDefault,
+    ccsGSettingsWrapperDefaultImplFree
+};
+
+CCSGSettingsWrapperFactory *
+ccsGSettingsWrapperFactoryDefaultImplNew (CCSObjectAllocationInterface *ai)
+{
+    CCSGSettingsWrapperFactory *wrapperFactory = (*ai->calloc_) (ai->allocator, 1, sizeof (CCSGSettingsWrapperFactory));
+
+    if (!wrapperFactory)
+	return NULL;
+
+    CCSGSettingsWrapperFactoryPrivate *priv = (*ai->calloc_) (ai->allocator, 1, sizeof (CCSGSettingsWrapperFactoryPrivate));
+
+    if (!priv)
+    {
+	(*ai->free_) (ai->allocator, wrapperFactory);
+	return NULL;
+    }
+
+    ccsObjectInit (wrapperFactory, ai);
+    ccsObjectAddInterface (wrapperFactory, (const CCSInterface *) &ccsGSettingsWrapperFactoryInterface, GET_INTERFACE_TYPE (CCSGSettingsWrapperFactoryInterface));
+    ccsObjectSetPrivate (wrapperFactory, (CCSPrivate *) priv);
+
+    ccsGSettingsWrapperFactoryRef (wrapperFactory);
+
+    return wrapperFactory;
+}

=== added file 'compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_wrapper_factory.h'
--- compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_wrapper_factory.h	1970-01-01 00:00:00 +0000
+++ compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_wrapper_factory.h	2012-10-12 01:30:30 +0000
@@ -0,0 +1,38 @@
+/**
+ *
+ * GSettings libcompizconfig backend
+ *
+ * ccs_gsettings_wrapper_factory.h
+ *
+ * Copyright (c) 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.
+ *
+ * Authored By:
+ *	Sam Spilsbury <[e-mail]>
+ *
+ **/
+#ifndef _CCS_GSETTINGS_WRAPPER_FACTORY_H
+#define _CCS_GSETTINGS_WRAPPER_FACTORY_H
+
+#include <ccs-defs.h>
+
+COMPIZCONFIG_BEGIN_DECLS
+
+#include <ccs-fwd.h>
+#include <ccs_gsettings_backend_fwd.h>
+
+CCSGSettingsWrapperFactory *
+ccsGSettingsWrapperFactoryDefaultImplNew (CCSObjectAllocationInterface *ai);
+
+COMPIZCONFIG_END_DECLS
+
+#endif

=== added file 'compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_wrapper_factory_interface.c'
--- compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_wrapper_factory_interface.c	1970-01-01 00:00:00 +0000
+++ compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_wrapper_factory_interface.c	2012-10-12 01:30:30 +0000
@@ -0,0 +1,51 @@
+/**
+ *
+ * GSettings libcompizconfig backend
+ *
+ * ccs_gsettings_wrapper_factory_interface.c
+ *
+ * Copyright (c) 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.
+ *
+ * Authored By:
+ *	Sam Spilsbury <[e-mail]>
+ *
+ **/
+#include <ccs-object.h>
+#include "ccs_gsettings_wrapper_factory_interface.h"
+
+INTERFACE_TYPE (CCSGSettingsWrapperFactoryInterface);
+
+CCSGSettingsWrapper *
+ccsGSettingsWrapperFactoryNewGSettingsWrapper (CCSGSettingsWrapperFactory   *factory,
+					       const gchar                  *schemaName,
+					       CCSObjectAllocationInterface *ai)
+{
+    return (*(GET_INTERFACE (CCSGSettingsWrapperFactoryInterface, factory))->newGSettingsWrapper) (factory, schemaName, ai);
+}
+
+CCSGSettingsWrapper *
+ccsGSettingsWrapperFactoryNewGSettingsWrapperWithPath (CCSGSettingsWrapperFactory   *factory,
+						       const gchar                  *schemaName,
+						       const gchar                  *path,
+						       CCSObjectAllocationInterface *ai)
+{
+    return (*(GET_INTERFACE (CCSGSettingsWrapperFactoryInterface, factory))->newGSettingsWrapperWithPath) (factory, schemaName, path, ai);
+}
+
+void
+ccsFreeGSettingsWrapperFactory (CCSGSettingsWrapperFactory *factory)
+{
+    return (*(GET_INTERFACE (CCSGSettingsWrapperFactoryInterface, factory))->free) (factory);
+}
+
+CCSREF_OBJ (GSettingsWrapperFactory, CCSGSettingsWrapperFactory)

=== added file 'compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_wrapper_factory_interface.h'
--- compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_wrapper_factory_interface.h	1970-01-01 00:00:00 +0000
+++ compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_wrapper_factory_interface.h	2012-10-12 01:30:30 +0000
@@ -0,0 +1,82 @@
+/**
+ *
+ * GSettings libcompizconfig backend
+ *
+ * ccs_gsettings_wrapper_factory_interface.h
+ *
+ * Copyright (c) 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.
+ *
+ * Authored By:
+ *	Sam Spilsbury <[e-mail]>
+ *
+ **/
+
+#ifndef _CCS_GSETTINGS_WRAPPER_FACTORY_INTERFACE_H
+#define _CCS_GSETTINGS_WRAPPER_FACTORY_INTERFACE_H
+
+#include <ccs-defs.h>
+
+COMPIZCONFIG_BEGIN_DECLS
+
+#include <gio/gio.h>
+#include <ccs-fwd.h>
+#include <ccs-object.h>
+#include <ccs_gsettings_backend_fwd.h>
+
+typedef struct _CCSGSettingsWrapperFactoryInterface CCSGSettingsWrapperFactoryInterface;
+
+typedef CCSGSettingsWrapper * (*CCSGSettingsWrapperFactoryNewGSettingsWrapper) (CCSGSettingsWrapperFactory   *wrapperFactory,
+										const gchar                  *schema,
+										CCSObjectAllocationInterface *ai);
+typedef CCSGSettingsWrapper * (*CCSGSettingsWrapperFactoryNewGSettingsWrapperWithPath) (CCSGSettingsWrapperFactory   *wrapperFactory,
+											const gchar                  *schema,
+											const gchar                  *path,
+											CCSObjectAllocationInterface *ai);
+
+typedef void (*CCSGSettingsWrapperFactoryFree) (CCSGSettingsWrapperFactory *wrapperFactory);
+
+struct _CCSGSettingsWrapperFactoryInterface
+{
+    CCSGSettingsWrapperFactoryNewGSettingsWrapper newGSettingsWrapper;
+    CCSGSettingsWrapperFactoryNewGSettingsWrapperWithPath newGSettingsWrapperWithPath;
+    CCSGSettingsWrapperFactoryFree free;
+};
+
+/**
+ * @brief The _CCSGSettingsWrapperFactory struct
+ *
+ * Will create new CCSGSettingsIntegratedSetting objects on demand
+ */
+struct _CCSGSettingsWrapperFactory
+{
+    CCSObject object;
+};
+
+unsigned int ccsCCSGSettingsWrapperFactoryInterfaceGetType ();
+
+CCSREF_HDR (GSettingsWrapperFactory, CCSGSettingsWrapperFactory);
+
+CCSGSettingsWrapper *
+ccsGSettingsWrapperFactoryNewGSettingsWrapper (CCSGSettingsWrapperFactory   *wrapperFactory,
+					       const gchar                  *schema,
+					       CCSObjectAllocationInterface *ai);
+
+CCSGSettingsWrapper *
+ccsGSettingsWrapperFactoryNewGSettingsWrapperWithPath (CCSGSettingsWrapperFactory   *factory,
+						       const gchar                  *schemaName,
+						       const gchar                  *path,
+						       CCSObjectAllocationInterface *ai);
+
+COMPIZCONFIG_END_DECLS
+
+#endif

=== modified file 'compizconfig/gsettings/mocks/CMakeLists.txt'
--- compizconfig/gsettings/mocks/CMakeLists.txt	2012-09-11 17:37:45 +0000
+++ compizconfig/gsettings/mocks/CMakeLists.txt	2012-10-12 01:30:30 +0000
@@ -8,12 +8,16 @@
 			 ${CMAKE_CURRENT_SOURCE_DIR}/../gsettings_backend_shared
 			 ${GLIB_INCLUDE_DIRS})
 
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
 
     add_library (compizconfig_ccs_gsettings_wrapper_mock STATIC
 	         ${CMAKE_CURRENT_SOURCE_DIR}/ccs_gsettings_wrapper_mock.cpp
 	         ${CMAKE_CURRENT_SOURCE_DIR}/ccs_gsettings_wrapper_mock.h)
 
+    add_library (compizconfig_ccs_gsettings_wrapper_factory_mock STATIC
+	         ${CMAKE_CURRENT_SOURCE_DIR}/ccs_gsettings_wrapper_factory_mock.cpp
+	         ${CMAKE_CURRENT_SOURCE_DIR}/ccs_gsettings_wrapper_factory_mock.h)
+
     add_library (compizconfig_ccs_gsettings_backend_mock STATIC
 	         ${CMAKE_CURRENT_SOURCE_DIR}/ccs_gsettings_backend_mock.cpp
 	         ${CMAKE_CURRENT_SOURCE_DIR}/ccs_gsettings_backend_mock.h)

=== added file 'compizconfig/gsettings/mocks/ccs_gsettings_wrapper_factory_mock.cpp'
--- compizconfig/gsettings/mocks/ccs_gsettings_wrapper_factory_mock.cpp	1970-01-01 00:00:00 +0000
+++ compizconfig/gsettings/mocks/ccs_gsettings_wrapper_factory_mock.cpp	2012-10-12 01:30:30 +0000
@@ -0,0 +1,47 @@
+#include <ccs_gsettings_wrapper_factory_mock.h>
+#include <ccs-object.h>
+
+const CCSGSettingsWrapperFactoryInterface mockInterface =
+{
+    CCSGSettingsWrapperFactoryGMock::ccsGSettingsWrapperFactoryNewGSettingsWrapper,
+    CCSGSettingsWrapperFactoryGMock::ccsGSettingsWrapperFactoryNewGSettingsWrapperWithPath,
+    CCSGSettingsWrapperFactoryGMock::ccsFreeGSettingsWrapperFactory
+};
+
+CCSGSettingsWrapperFactory *
+ccsMockGSettingsWrapperFactoryNew ()
+{
+    CCSGSettingsWrapperFactory *wrapper = (CCSGSettingsWrapperFactory *) calloc (1, sizeof (CCSGSettingsWrapperFactory));
+
+    if (!wrapper)
+	return NULL;
+
+    CCSGSettingsWrapperFactoryGMock *gmockWrapper = new CCSGSettingsWrapperFactoryGMock (wrapper);
+
+    if (!gmockWrapper)
+    {
+	free (wrapper);
+	return NULL;
+    }
+
+    ccsObjectInit (wrapper, &ccsDefaultObjectAllocator);
+    ccsObjectAddInterface (wrapper, (const CCSInterface *) &mockInterface, GET_INTERFACE_TYPE (CCSGSettingsWrapperFactoryInterface));
+    ccsObjectSetPrivate (wrapper, (CCSPrivate *) gmockWrapper);
+
+    ccsGSettingsWrapperFactoryRef (wrapper);
+
+    return wrapper;
+}
+
+void
+ccsMockGSettingsWrapperFactoryFree (CCSGSettingsWrapperFactory *wrapper)
+{
+    CCSGSettingsWrapperFactoryGMock *gmockWrapper = reinterpret_cast <CCSGSettingsWrapperFactoryGMock *> (ccsObjectGetPrivate (wrapper));
+
+    delete gmockWrapper;
+
+    ccsObjectSetPrivate (wrapper, NULL);
+    ccsObjectFinalize (wrapper);
+    free (wrapper);
+}
+    

=== added file 'compizconfig/gsettings/mocks/ccs_gsettings_wrapper_factory_mock.h'
--- compizconfig/gsettings/mocks/ccs_gsettings_wrapper_factory_mock.h	1970-01-01 00:00:00 +0000
+++ compizconfig/gsettings/mocks/ccs_gsettings_wrapper_factory_mock.h	2012-10-12 01:30:30 +0000
@@ -0,0 +1,92 @@
+/**
+ *
+ * GSettings libcompizconfig backend
+ *
+ * ccs_gsettings_wrapper_factory_mock.h
+ *
+ * Copyright (c) 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.
+ *
+ * Authored By:
+ *	Sam Spilsbury <[e-mail]>
+ *
+ **/
+#ifndef _COMPIZCONFIG_CCS_GSETTINGS_WRAPPER_FACTORY_MOCK
+#define _COMPIZCONFIG_CCS_GSETTINGS_WRAPPER_FACTORY_MOCK
+
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+
+#include <ccs_gsettings_wrapper_factory_interface.h>
+
+CCSGSettingsWrapperFactory * ccsMockGSettingsWrapperFactoryNew ();
+void ccsMockGSettingsWrapperFactoryFree (CCSGSettingsWrapperFactory *);
+
+class CCSGSettingsWrapperFactoryMockInterface
+{
+    public:
+
+	virtual ~CCSGSettingsWrapperFactoryMockInterface () {}
+	virtual CCSGSettingsWrapper * newGSettingsWrapper (const gchar                  *schema,
+							   CCSObjectAllocationInterface *ai) = 0;
+	virtual CCSGSettingsWrapper * newGSettingsWrapperWithPath (const gchar                  *schema,
+								   const gchar                  *path,
+								   CCSObjectAllocationInterface *ai) = 0;
+};
+
+class CCSGSettingsWrapperFactoryGMock :
+    public CCSGSettingsWrapperFactoryMockInterface
+{
+    public:
+
+	CCSGSettingsWrapperFactoryGMock (CCSGSettingsWrapperFactory *wrapper) :
+	    mWrapper (wrapper)
+	{
+	}
+
+	MOCK_METHOD2 (newGSettingsWrapper, CCSGSettingsWrapper * (const gchar                  *schema,
+								  CCSObjectAllocationInterface *ai));
+	MOCK_METHOD3 (newGSettingsWrapperWithPath, CCSGSettingsWrapper * (const gchar                  *schema,
+									  const gchar                  *path,
+									  CCSObjectAllocationInterface *ai));
+
+    private:
+
+	CCSGSettingsWrapperFactory *mWrapper;
+
+    public:
+
+	static CCSGSettingsWrapper *
+	ccsGSettingsWrapperFactoryNewGSettingsWrapper (CCSGSettingsWrapperFactory   *wrapperFactory,
+						       const gchar                  *schema,
+						       CCSObjectAllocationInterface *ai)
+	{
+	    return reinterpret_cast <CCSGSettingsWrapperFactoryMockInterface *> (ccsObjectGetPrivate (wrapperFactory))->newGSettingsWrapper (schema, ai);
+	}
+
+	static CCSGSettingsWrapper *
+	ccsGSettingsWrapperFactoryNewGSettingsWrapperWithPath (CCSGSettingsWrapperFactory   *wrapperFactory,
+							       const gchar                  *schema,
+							       const gchar                  *path,
+							       CCSObjectAllocationInterface *ai)
+	{
+	    return reinterpret_cast <CCSGSettingsWrapperFactoryMockInterface *> (ccsObjectGetPrivate (wrapperFactory))->newGSettingsWrapperWithPath (schema, path, ai);
+	}
+
+	static void
+	ccsFreeGSettingsWrapperFactory (CCSGSettingsWrapperFactory *wrapperFactory)
+	{
+	    ccsMockGSettingsWrapperFactoryFree (wrapperFactory);
+	}
+};
+
+#endif

=== modified file 'compizconfig/gsettings/src/gsettings.c'
--- compizconfig/gsettings/src/gsettings.c	2012-09-25 06:12:24 +0000
+++ compizconfig/gsettings/src/gsettings.c	2012-10-12 01:30:30 +0000
@@ -39,6 +39,11 @@
 #include "ccs_gsettings_backend.h"
 #include "ccs_gsettings_interface.h"
 #include "ccs_gsettings_interface_wrapper.h"
+#include "ccs_gsettings_wrapper_factory_interface.h"
+#include "ccs_gsettings_wrapper_factory.h"
+#include "ccs_gnome_integration_gsettings_wrapper_factory.h"
+#include "ccs_gnome_integration_gsettings_integrated_setting_factory.h"
+#include "ccs_gnome_integration.h"
 
 GVariant *
 getVariantForCCSSetting (CCSBackend *backend, CCSSetting *setting)
@@ -437,12 +442,72 @@
     }
 }
 
+static char *
+getCurrentProfileName (CCSGSettingsWrapper *compizconfigSettings)
+{
+    GVariant *value;
+    char     *ret = NULL;
+
+    value = ccsGSettingsWrapperGetValue (compizconfigSettings, "current-profile");
+
+    if (value)
+	ret = strdup (g_variant_get_string (value, NULL));
+    else
+	ret = strdup (DEFAULTPROF);
+
+    g_variant_unref (value);
+
+    return ret;
+}
+
 static Bool
 initBackend (CCSBackend *backend, CCSContext * context)
 {
     g_type_init ();
 
-    return ccsGSettingsBackendAttachNewToBackend (backend, context);
+    CCSGSettingsWrapper *compizconfigSettings = ccsGSettingsWrapperNewForSchema (COMPIZCONFIG_SCHEMA_ID,
+										 backend->object.object_allocation);
+    char *currentProfile = getCurrentProfileName (compizconfigSettings);
+    char *currentProfilePath = currentProfilePath = makeCompizProfilePath (currentProfile);
+    CCSGSettingsWrapper *currentProfileSettings = ccsGSettingsWrapperNewForSchemaWithPath (PROFILE_SCHEMA_ID,
+									    currentProfilePath,
+									    backend->object.object_allocation);
+    CCSGNOMEValueChangeData *valueChangeData = calloc (1, sizeof (CCSGNOMEValueChangeData));
+    CCSGSettingsWrapperFactory *wrapperFactory = ccsGSettingsWrapperFactoryDefaultImplNew (backend->object.object_allocation);
+    CCSGSettingsWrapperFactory *gnomeWrapperFactory = ccsGNOMEIntegrationGSettingsWrapperFactoryDefaultImplNew (backend->object.object_allocation,
+														wrapperFactory,
+														ccsGSettingsIntegratedSettingsChangeCallback (),
+														valueChangeData);
+    CCSIntegratedSettingsStorage *storage = ccsIntegratedSettingsStorageDefaultImplNew (backend->object.object_allocation);
+
+    valueChangeData->storage = storage;
+    valueChangeData->context = context;
+
+    CCSIntegratedSettingFactory *factory = ccsGSettingsIntegratedSettingFactoryNew (gnomeWrapperFactory,
+										    valueChangeData,
+										    backend->object.object_allocation);
+
+    valueChangeData->factory = factory;
+
+    CCSIntegration *integration = ccsGNOMEIntegrationBackendNew (backend, context, factory, storage, backend->object.object_allocation);
+
+
+
+    valueChangeData->integration = integration;
+
+    g_free (currentProfilePath);
+
+    /* Drop our reference to the wrapper factory */
+    ccsGSettingsWrapperFactoryUnref (gnomeWrapperFactory);
+
+    return ccsGSettingsBackendAttachNewToBackend (backend,
+						  context,
+						  compizconfigSettings,
+						  currentProfileSettings,
+						  wrapperFactory,
+						  integration,
+						  valueChangeData,
+						  currentProfile);
 }
 
 static Bool

=== modified file 'compizconfig/gsettings/tests/CMakeLists.txt'
--- compizconfig/gsettings/tests/CMakeLists.txt	2012-10-04 06:14:43 +0000
+++ compizconfig/gsettings/tests/CMakeLists.txt	2012-10-12 01:30:30 +0000
@@ -39,8 +39,10 @@
 			   compizconfig_ccs_setting_mock
 			   compizconfig_ccs_plugin_mock
 			   compizconfig_ccs_context_mock
+			   compizconfig_ccs_integration_mock
 			   compizconfig_ccs_gsettings_backend_mock
 			   compizconfig_ccs_gsettings_wrapper_mock
+			   compizconfig_ccs_gsettings_wrapper_factory_mock
 			   compizconfig_ccs_test_value_combinations
 			   ${COMPIZCONFIG_TEST_GSETTINGS_LIBRARIES}
 			   ${GTEST_BOTH_LIBRARIES}

=== modified file 'compizconfig/gsettings/tests/test_gsettings_tests.cpp'
--- compizconfig/gsettings/tests/test_gsettings_tests.cpp	2012-10-04 09:19:38 +0000
+++ compizconfig/gsettings/tests/test_gsettings_tests.cpp	2012-10-12 01:30:30 +0000
@@ -7,13 +7,21 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/scoped_array.hpp>
 
+#include "gtest_shared_autodestroy.h"
+
 #include "test_gsettings_tests.h"
 #include "gsettings.h"
 #include "ccs_gsettings_backend.h"
+#include "ccs_gsettings_backend_interface.h"
 #include "ccs_gsettings_backend_mock.h"
 #include "compizconfig_ccs_context_mock.h"
 #include "compizconfig_ccs_plugin_mock.h"
 #include "compizconfig_ccs_setting_mock.h"
+#include "compizconfig_ccs_integration_mock.h"
+#include "ccs_gsettings_wrapper_mock.h"
+#include "ccs_gsettings_wrapper_factory_mock.h"
+#include "ccs_gsettings_wrapper_factory_interface.h"
+#include "ccs_gnome_integration.h"
 #include "gtest_shared_characterwrapper.h"
 #include "compizconfig_test_value_combiners.h"
 #include "compizconfig_ccs_mocked_allocator.h"
@@ -1959,8 +1967,6 @@
     boost::shared_ptr <CCSContext> context (ccsMockContextNew (),
 					    boost::bind (ccsFreeMockContext, _1));
 
-    GVariantBuilder pluginsWithChangedKeysBuilder;
-
     const unsigned short NUM_KEYS = 3;
 
     gchar ** fooKeys = (gchar **) calloc (1, sizeof (char *) * (NUM_KEYS + 1));
@@ -1975,6 +1981,8 @@
     barKeys[2] = g_strdup (KEY_EXAMPLE_THREE.c_str ());
     barKeys[3] = NULL;
 
+    GVariantBuilder pluginsWithChangedKeysBuilder;
+
     g_variant_builder_init (&pluginsWithChangedKeysBuilder, G_VARIANT_TYPE ("as"));
     g_variant_builder_add (&pluginsWithChangedKeysBuilder, "s", PLUGIN_FOO.c_str ());
     g_variant_builder_add (&pluginsWithChangedKeysBuilder, "s", PLUGIN_BAR.c_str ());
@@ -2017,3 +2025,235 @@
 								  pluginsWithChangedKeys.get (),
 								  "mock");
 }
+
+namespace
+{
+    const CCSBackendInfo stubBackendInfo =
+    {
+	"stub",
+	"stub",
+	"stub",
+	FALSE,
+	FALSE
+    };
+
+    const CCSBackendInfo *
+    stubBackendGetInfo (CCSBackend *backend)
+    {
+	return &stubBackendInfo;
+    }
+
+    Bool
+    stubBackendInit (CCSBackend *backend, CCSContext *context)
+    {
+	return TRUE;
+    }
+
+    Bool
+    stubBackendFini (CCSBackend *backend)
+    {
+	return TRUE;
+    }
+
+    CCSBackendInterface stubBackendInterface =
+    {
+	stubBackendGetInfo,
+	NULL,
+	stubBackendInit,
+	stubBackendFini,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL
+    };
+}
+
+namespace
+{
+    const std::string MOCK_PLUGIN_NAME ("mock");
+    const std::string MOCK_SCHEMA_NAME ("org.compiz.mock");
+    const std::string MOCK_PROFILE_NAME ("mock");
+    const std::string MOCK_GSCHEMA_PATH ("/org/compiz/profiles/mock/plugins/mock");
+    const std::string PLUGINS_WITH_SET_KEYS ("plugins-with-set-keys");
+
+    boost::shared_ptr <GVariant>
+    GetEmptyPluginsWithSetKeys ()
+    {
+	GVariantBuilder pluginsWithChangedKeysBuilder;
+
+	g_variant_builder_init (&pluginsWithChangedKeysBuilder, G_VARIANT_TYPE ("as"));
+	return AutoDestroy (g_variant_ref_sink (g_variant_builder_end (&pluginsWithChangedKeysBuilder)),
+						g_variant_unref);
+    }
+}
+
+class CCSGSettingsTestCCSGSettingsBackend :
+    public CCSGSettingsTestIndependent
+{
+    public:
+
+	CCSGSettingsTestCCSGSettingsBackend () :
+	    mockContext (AutoDestroy (ccsMockContextNew (), ccsFreeMockContext)),
+	    stubBackend (AutoDestroy (ccsBackendNewWithDynamicInterface (mockContext.get (), &stubBackendInterface),
+				      ccsBackendUnref)),
+	    mockCompizconfigSettings (ccsMockGSettingsWrapperNew ()),
+	    mockCurrentProfileSettings (ccsMockGSettingsWrapperNew ()),
+	    mockWrapperFactory (ccsMockGSettingsWrapperFactoryNew ()),
+	    mockIntegration (ccsMockIntegrationBackendNew (&ccsDefaultObjectAllocator)),
+	    valueChangeData (reinterpret_cast <CCSGNOMEValueChangeData *> (calloc (1, sizeof (CCSGNOMEValueChangeData)))),
+	    currentProfile (strdup (MOCK_PROFILE_NAME.c_str ())),
+	    mockMockPluginWrapper (ccsMockGSettingsWrapperNew ()),
+	    gmockWrapperFactory (reinterpret_cast <CCSGSettingsWrapperFactoryGMock *> (ccsObjectGetPrivate (mockWrapperFactory))),
+	    gmockWrapper (reinterpret_cast <CCSGSettingsWrapperGMock *> (ccsObjectGetPrivate (mockMockPluginWrapper))),
+	    gmockCurrentProfileSettings (reinterpret_cast <CCSGSettingsWrapperGMock *> (ccsObjectGetPrivate (mockCurrentProfileSettings)))
+
+	{
+	    valueChangeData->integration = mockIntegration;
+	    valueChangeData->factory = NULL;
+	    valueChangeData->storage = NULL;
+	    valueChangeData->context = mockContext.get ();
+
+	    if (!ccsGSettingsBackendAttachNewToBackend (stubBackend.get (),
+							mockContext.get (),
+							mockCompizconfigSettings,
+							mockCurrentProfileSettings,
+							mockWrapperFactory,
+							mockIntegration,
+							valueChangeData,
+							currentProfile))
+		throw std::runtime_error ("Failed to attach GSettings backend");
+	}
+
+	virtual void TearDown ()
+	{
+	    ccsGSettingsBackendDetachFromBackend (stubBackend.get ());
+
+	    CCSGSettingsTestIndependent::TearDown ();
+	}
+
+	boost::shared_ptr <CCSContext> mockContext;
+	boost::shared_ptr <CCSBackend> stubBackend;
+	CCSGSettingsWrapper *mockCompizconfigSettings;
+	CCSGSettingsWrapper *mockCurrentProfileSettings;
+	CCSGSettingsWrapperFactory *mockWrapperFactory;
+	CCSIntegration *mockIntegration;
+	CCSGNOMEValueChangeData           *valueChangeData;
+	char                *currentProfile;
+	CCSGSettingsWrapper *mockMockPluginWrapper;
+
+	CCSGSettingsWrapperFactoryGMock *gmockWrapperFactory;
+	CCSGSettingsWrapperGMock        *gmockWrapper;
+	CCSGSettingsWrapperGMock        *gmockCurrentProfileSettings;
+
+};
+
+TEST_F (CCSGSettingsTestCCSGSettingsBackend, TestWriteOutSetKeysOnGetSettingsObject)
+{
+    /* Should create a new wrapper for this "plugin" */
+    EXPECT_CALL (*gmockWrapperFactory, newGSettingsWrapperWithPath (Eq (MOCK_SCHEMA_NAME),
+								    Eq (MOCK_GSCHEMA_PATH),
+								    _)).WillOnce (Return (mockMockPluginWrapper));
+    EXPECT_CALL (*gmockWrapper, connectToChangedSignal (_, stubBackend.get ()));
+
+
+    boost::shared_ptr <GVariant> pluginsWithSetKeysVariantEmpty (GetEmptyPluginsWithSetKeys ());
+
+    /* Should now get the value of plugins-with-set-keys from
+     * mockCurrentProfileSettings */
+    EXPECT_CALL (*gmockCurrentProfileSettings, getValue (Eq (PLUGINS_WITH_SET_KEYS)))
+	    .WillOnce (Return (g_variant_ref (pluginsWithSetKeysVariantEmpty.get ())));
+
+    /* Should acknowledge that we wrote to this schema */
+    EXPECT_CALL (*gmockCurrentProfileSettings, setValue (Eq (PLUGINS_WITH_SET_KEYS),
+							 GVariantHasValueInArray <const gchar *> ("s",
+												  MOCK_PLUGIN_NAME.c_str (),
+												  boost::bind (streq, _1, _2))))
+	    .WillOnce (WithArgs <1> (Invoke (g_variant_unref)));;
+
+    CCSGSettingsWrapper *wrapper = ccsGSettingsGetSettingsObjectForPluginWithPath (stubBackend.get (),
+										   MOCK_PLUGIN_NAME.c_str (),
+										   MOCK_GSCHEMA_PATH.c_str (),
+										   mockContext.get ());
+
+    EXPECT_EQ (wrapper, mockMockPluginWrapper);
+}
+
+TEST_F (CCSGSettingsTestCCSGSettingsBackend, TestNoWriteOutSetKeysOnGetSettingsObjectIfAlreadyWritten)
+{
+    /* Should create a new wrapper for this "plugin" */
+    EXPECT_CALL (*gmockWrapperFactory, newGSettingsWrapperWithPath (Eq (MOCK_SCHEMA_NAME),
+								    Eq (MOCK_GSCHEMA_PATH),
+								    _)).WillOnce (Return (mockMockPluginWrapper));
+    EXPECT_CALL (*gmockWrapper, connectToChangedSignal (_, stubBackend.get ()));
+
+
+    GVariantBuilder pluginsWithChangedKeysBuilder;
+
+    g_variant_builder_init (&pluginsWithChangedKeysBuilder, G_VARIANT_TYPE ("as"));
+    g_variant_builder_add (&pluginsWithChangedKeysBuilder, "s", MOCK_PLUGIN_NAME.c_str ());
+    boost::shared_ptr <GVariant> pluginsWithSetKeysVariantNonEmpty (AutoDestroy (g_variant_ref_sink (g_variant_builder_end (&pluginsWithChangedKeysBuilder)),
+										 g_variant_unref));
+
+    /* Should now get the value of plugins-with-set-keys from
+     * mockCurrentProfileSettings */
+    EXPECT_CALL (*gmockCurrentProfileSettings, getValue (Eq (PLUGINS_WITH_SET_KEYS)))
+	    .WillOnce (Return (g_variant_ref (pluginsWithSetKeysVariantNonEmpty.get ())));
+
+    /* No acknowledgement */
+    EXPECT_CALL (*gmockCurrentProfileSettings, setValue (_, _)).Times (0);
+
+    CCSGSettingsWrapper *wrapper = ccsGSettingsGetSettingsObjectForPluginWithPath (stubBackend.get (),
+										   MOCK_PLUGIN_NAME.c_str (),
+										   MOCK_GSCHEMA_PATH.c_str (),
+										   mockContext.get ());
+
+    EXPECT_EQ (wrapper, mockMockPluginWrapper);
+}
+
+TEST_F (CCSGSettingsTestCCSGSettingsBackend, TestReturnExistingWrapper)
+{
+    /* Should create a new wrapper for this "plugin" */
+    EXPECT_CALL (*gmockWrapperFactory, newGSettingsWrapperWithPath (Eq (MOCK_SCHEMA_NAME),
+								    Eq (MOCK_GSCHEMA_PATH),
+								    _)).WillOnce (Return (mockMockPluginWrapper));
+    EXPECT_CALL (*gmockWrapper, connectToChangedSignal (_, stubBackend.get ()));
+
+
+    boost::shared_ptr <GVariant> pluginsWithSetKeysVariantEmpty (GetEmptyPluginsWithSetKeys ());
+
+    /* Should now get the value of plugins-with-set-keys from
+     * mockCurrentProfileSettings */
+    EXPECT_CALL (*gmockCurrentProfileSettings, getValue (Eq (PLUGINS_WITH_SET_KEYS)))
+	    .WillOnce (Return (g_variant_ref (pluginsWithSetKeysVariantEmpty.get ())));
+
+    /* Should acknowledge that we wrote to this schema */
+    EXPECT_CALL (*gmockCurrentProfileSettings, setValue (Eq (PLUGINS_WITH_SET_KEYS),
+							 _))
+	    .WillOnce (WithArgs <1> (Invoke (g_variant_unref)));
+
+    CCSGSettingsWrapper *wrapper = ccsGSettingsGetSettingsObjectForPluginWithPath (stubBackend.get (),
+										   MOCK_PLUGIN_NAME.c_str (),
+										   MOCK_GSCHEMA_PATH.c_str (),
+										   mockContext.get ());
+
+    EXPECT_CALL (*gmockWrapper, getSchemaName ()).WillOnce (Return (MOCK_SCHEMA_NAME.c_str ()));
+
+    /* Shouldn't be called again */
+    EXPECT_CALL (*gmockWrapperFactory, newGSettingsWrapperWithPath (_, _, _)).Times (0);
+
+    wrapper = ccsGSettingsGetSettingsObjectForPluginWithPath (stubBackend.get (),
+							      MOCK_PLUGIN_NAME.c_str (),
+							      MOCK_GSCHEMA_PATH.c_str (),
+							      mockContext.get ());
+
+    /* It should return the cached one */
+    EXPECT_EQ (mockMockPluginWrapper, wrapper);
+}

=== modified file 'compizconfig/integration/gnome/gsettings/CMakeLists.txt'
--- compizconfig/integration/gnome/gsettings/CMakeLists.txt	2012-09-25 08:17:14 +0000
+++ compizconfig/integration/gnome/gsettings/CMakeLists.txt	2012-10-12 01:30:30 +0000
@@ -37,12 +37,21 @@
 		     ${CMAKE_CURRENT_SOURCE_DIR}/src/ccs_gnome_integration_gsettings_integrated_setting_factory.c)
 
 	target_link_libraries (compizconfig_gnome_integration_gsettings_setting_factory
+			       compizconfig_gsettings_wrapper_factory_interface
 			       compizconfig_gnome_integration_constants
 			       compizconfig_gnome_integrated_setting
 			       compizconfig_gnome_integration_gsettings_integrated_setting
 			       compizconfig
                                compizconfig_gsettings_util
-			       ${COMPIZCONFIG_GNOME_GSETTINGS_INTEGRATIONLIBRARIES})
+			       ${COMPIZCONFIG_GNOME_GSETTINGS_INTEGRATION_LIBRARIES})
+
+	add_library (compizconfig_gnome_integration_gsettings_wrapper_factory STATIC
+		     ${CMAKE_CURRENT_SOURCE_DIR}/src/ccs_gnome_integration_gsettings_wrapper_factory.c)
+
+	target_link_libraries (compizconfig_gnome_integration_gsettings_setting_factory
+			       compizconfig_gsettings_wrapper_factory_interface
+			       compizconfig
+			       ${COMPIZCONFIG_GNOME_GSETTINGS_INTEGRATION_LIBRARIES})
 
 	find_program (GLIB_COMPILE_SCHEMAS glib-compile-schemas)
 

=== removed file 'compizconfig/integration/gnome/gsettings/include/ccs_gnome_gsettings_fwd.h'
--- compizconfig/integration/gnome/gsettings/include/ccs_gnome_gsettings_fwd.h	2012-10-06 16:11:05 +0000
+++ compizconfig/integration/gnome/gsettings/include/ccs_gnome_gsettings_fwd.h	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-#ifndef _CCS_GNOME_INTEGRATION_GSETTINGS_FWD_H
-#define _CCS_GNOME_INTEGRATION_GSETTINGS_FWD_H
-
-#include <ccs-defs.h>
-
-COMPIZCONFIG_BEGIN_DECLS
-
-typedef struct _CCSGNOMEIntegrationGSettingsWrapperFactory CCSGNOMEIntegrationGSettingsWrapperFactory;
-
-COMPIZCONFIG_END_DECLS
-
-#endif

=== modified file 'compizconfig/integration/gnome/gsettings/include/ccs_gnome_integration_gsettings_integrated_setting_factory.h'
--- compizconfig/integration/gnome/gsettings/include/ccs_gnome_integration_gsettings_integrated_setting_factory.h	2012-10-06 16:11:05 +0000
+++ compizconfig/integration/gnome/gsettings/include/ccs_gnome_integration_gsettings_integrated_setting_factory.h	2012-10-12 01:30:30 +0000
@@ -1,41 +1,14 @@
-#ifndef _CCS_GNOME_GCONF_INTEGRATED_SETTING_FACTORY_H
-#define _CCS_GNOME_GCONF_INTEGRATED_SETTING_FACTORY_H
+#ifndef _CCS_GNOME_GSETTINGS_INTEGRATED_SETTING_FACTORY_H
+#define _CCS_GNOME_GSETTINGS_INTEGRATED_SETTING_FACTORY_H
 
 #include <ccs-defs.h>
 #include <ccs-fwd.h>
 #include <ccs_gnome_fwd.h>
-#include <ccs_gnome_gsettings_fwd.h>
+#include <ccs_gsettings_backend_fwd.h>
 #include <gio/gio.h>
 
 COMPIZCONFIG_BEGIN_DECLS
 
-typedef struct _CCSGNOMEIntegrationGSettingsWrapperFactoryInterface CCSGNOMEIntegrationGSettingsWrapperFactoryInterface;
-
-typedef void (*CCSGNOMEIntegrationGSettingsChangedCallback) (GSettings *, gchar *, gpointer);
-
-typedef CCSGSettingsWrapper * (*CCSGNOMEIntegrationGSettingsWrapperFactoryNewGSettingsWrapper) (CCSGNOMEIntegrationGSettingsWrapperFactory *,
-												const gchar				   *schema,
-												CCSGNOMEIntegrationGSettingsChangedCallback callback,
-												CCSGNOMEValueChangeData			  *data,
-												CCSObjectAllocationInterface		   *ai);
-
-struct _CCSGNOMEIntegrationGSettingsWrapperFactoryInterface
-{
-    CCSGNOMEIntegrationGSettingsWrapperFactoryNewGSettingsWrapper newGSettingsWrapper;
-};
-
-/**
- * @brief The _CCSGNOMEIntegrationGSettingsWrapperFactory struct
- *
- * Will create new CCSGSettingsIntegratedSetting objects on demand
- */
-struct _CCSGNOMEIntegrationGSettingsWrapperFactory
-{
-    CCSObject object;
-};
-
-unsigned int ccsCCSGNOMEIntegrationGSettingsWrapperFactoryInterfaceGetType ();
-
 /**
  * @brief ccsGSettingsIntegratedSettingsTranslateNewGNOMEKeyForCCS
  * @param key the old style gnome key to translate
@@ -47,22 +20,25 @@
 char *
 ccsGSettingsIntegratedSettingsTranslateNewGNOMEKeyForCCS (const char *key);
 
-CCSGSettingsWrapper *
-ccsGNOMEIntegrationGSettingsWrapperFactoryNewGSettingsWrapper (CCSGNOMEIntegrationGSettingsWrapperFactory *factory,
-							       const gchar				  *schemaName,
-							       CCSGNOMEIntegrationGSettingsChangedCallback callback,
-							       CCSGNOMEValueChangeData			  *data,
-							       CCSObjectAllocationInterface		  *ai);
-
-CCSGNOMEIntegrationGSettingsWrapperFactory *
-ccsGNOMEIntegrationGSettingsWrapperDefaultImplNew (CCSObjectAllocationInterface *ai);
-
-void
-ccsGNOMEIntegrationGSettingsWrapperDefaultImplFree (CCSGNOMEIntegrationGSettingsWrapperFactory *wrapperFactory);
+/**
+ * @brief ccsGSettingsIntegratedSettingsChangeCallback
+ * @return callback for settings change data
+ *
+ * This returns the default callback used for settings changes
+ *
+ * TODO: This API doesn't make a whole lot of sense, but we need
+ * it if we want to inject CCSGSettingsWrapperFactory into
+ * ccsGSettingsIntegratedSettingFactoryNew.
+ *
+ * The return type is GCallback to hide the details of this function
+ * from callers
+ */
+GCallback
+ccsGSettingsIntegratedSettingsChangeCallback ();
 
 CCSIntegratedSettingFactory *
-ccsGSettingsIntegratedSettingFactoryNew (CCSGNOMEIntegrationGSettingsWrapperFactory	   *wrapperFactory,
-					 CCSGNOMEValueChangeData	  *data,
+ccsGSettingsIntegratedSettingFactoryNew (CCSGSettingsWrapperFactory   *wrapperFactory,
+					 CCSGNOMEValueChangeData      *data,
 					 CCSObjectAllocationInterface *ai);
 
 COMPIZCONFIG_END_DECLS

=== added file 'compizconfig/integration/gnome/gsettings/include/ccs_gnome_integration_gsettings_wrapper_factory.h'
--- compizconfig/integration/gnome/gsettings/include/ccs_gnome_integration_gsettings_wrapper_factory.h	1970-01-01 00:00:00 +0000
+++ compizconfig/integration/gnome/gsettings/include/ccs_gnome_integration_gsettings_wrapper_factory.h	2012-10-12 01:30:30 +0000
@@ -0,0 +1,44 @@
+/**
+ *
+ * GSettings libcompizconfig backend
+ *
+ * ccs_gsettings_wrapper_factory.h
+ *
+ * Copyright (c) 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.
+ *
+ * Authored By:
+ *	Sam Spilsbury <[e-mail]>
+ *
+ **/
+#ifndef _CCS_GNOME_INTEGRATION_GSETTINGS_WRAPPER_FACTORY_H
+#define _CCS_GNOME_INTEGRATION_GSETTINGS_WRAPPER_FACTORY_H
+
+#include <ccs-defs.h>
+
+COMPIZCONFIG_BEGIN_DECLS
+
+#include <gio/gio.h>
+
+#include <ccs-fwd.h>
+#include <ccs_gsettings_backend_fwd.h>
+#include <ccs_gnome_fwd.h>
+
+CCSGSettingsWrapperFactory *
+ccsGNOMEIntegrationGSettingsWrapperFactoryDefaultImplNew (CCSObjectAllocationInterface *ai,
+							  CCSGSettingsWrapperFactory   *factory,
+							  GCallback                    callback,
+							  CCSGNOMEValueChangeData      *data);
+
+COMPIZCONFIG_END_DECLS
+
+#endif

=== modified file 'compizconfig/integration/gnome/gsettings/src/ccs_gnome_integration_gsettings_integrated_setting_factory.c'
--- compizconfig/integration/gnome/gsettings/src/ccs_gnome_integration_gsettings_integrated_setting_factory.c	2012-09-25 06:12:24 +0000
+++ compizconfig/integration/gnome/gsettings/src/ccs_gnome_integration_gsettings_integrated_setting_factory.c	2012-10-12 01:30:30 +0000
@@ -11,6 +11,7 @@
 #include <ccs_gsettings_interface_wrapper.h>
 
 #include <gsettings_util.h>
+#include <ccs_gsettings_wrapper_factory_interface.h>
 
 #include "ccs_gnome_integration.h"
 #include "ccs_gnome_integrated_setting.h"
@@ -19,8 +20,6 @@
 #include "ccs_gnome_integration_gsettings_integrated_setting.h"
 #include "ccs_gnome_integration_gsettings_integrated_setting_factory.h"
 
-INTERFACE_TYPE (CCSGNOMEIntegrationGSettingsWrapperFactoryInterface);
-
 char *
 ccsGSettingsIntegratedSettingsTranslateNewGNOMEKeyForCCS (const char *key)
 {
@@ -45,83 +44,11 @@
     return newKey;
 }
 
-CCSGSettingsWrapper *
-ccsGNOMEIntegrationGSettingsWrapperFactoryNewGSettingsWrapper (CCSGNOMEIntegrationGSettingsWrapperFactory *factory,
-							       const gchar				  *schemaName,
-							       CCSGNOMEIntegrationGSettingsChangedCallback callback,
-							       CCSGNOMEValueChangeData			  *data,
-							       CCSObjectAllocationInterface		  *ai)
-{
-    return (*(GET_INTERFACE (CCSGNOMEIntegrationGSettingsWrapperFactoryInterface, factory))->newGSettingsWrapper) (factory, schemaName, callback, data, ai);
-}
-
-/* CCSGNOMEIntegrationGSettingsWrapperFactory implementation */
-typedef struct _CCSGNOMEIntegrationGSettingsWrapperFactoryPrivate CCSGNOMEIntegrationGSettingsWrapperFactoryPrivate;
-struct _CCSGNOMEIntegrationGSettingsWrapperFactoryPrivate
-{
-};
-
-CCSGSettingsWrapper *
-ccsGNOMEIntegrationGSettingsWrapperFactoryNewGSettingsWrapperDefault (CCSGNOMEIntegrationGSettingsWrapperFactory *factory,
-								      const gchar				  *schemaName,
-								      CCSGNOMEIntegrationGSettingsChangedCallback callback,
-								      CCSGNOMEValueChangeData			  *data,
-								      CCSObjectAllocationInterface		  *ai)
-{
-    CCSGSettingsWrapper *wrapper = ccsGSettingsWrapperNewForSchema (schemaName, ai);
-    ccsGSettingsWrapperConnectToChangedSignal (wrapper, (GCallback) callback, data);
-
-    return wrapper;
-}
-
-const CCSGNOMEIntegrationGSettingsWrapperFactoryInterface ccsGNOMEIntegrationGSettingsWrapperFactoryInterface =
-{
-    ccsGNOMEIntegrationGSettingsWrapperFactoryNewGSettingsWrapperDefault
-};
-
-void
-ccsGNOMEIntegrationGSettingsWrapperDefaultImplFree (CCSGNOMEIntegrationGSettingsWrapperFactory *wrapperFactory)
-{
-    ccsObjectFinalize (wrapperFactory);
-    (*wrapperFactory->object.object_allocation->free_) (wrapperFactory->object.object_allocation->allocator,
-							wrapperFactory);
-}
-
-CCSGNOMEIntegrationGSettingsWrapperFactory *
-ccsGNOMEIntegrationGSettingsWrapperDefaultImplNew (CCSObjectAllocationInterface *ai)
-{
-    CCSGNOMEIntegrationGSettingsWrapperFactory *wrapperFactory = (*ai->calloc_) (ai->allocator, 1, sizeof (CCSGNOMEIntegrationGSettingsWrapperFactory));
-
-    if (!wrapperFactory)
-	return NULL;
-
-    CCSGNOMEIntegrationGSettingsWrapperFactoryPrivate *priv = (*ai->calloc_) (ai->allocator, 1, sizeof (CCSGNOMEIntegrationGSettingsWrapperFactoryPrivate));
-
-    if (!priv)
-    {
-	(*ai->free_) (ai->allocator, wrapperFactory);
-	return NULL;
-    }
-
-    ccsObjectInit (wrapperFactory, ai);
-    ccsObjectAddInterface (wrapperFactory, (const CCSInterface *) &ccsGNOMEIntegrationGSettingsWrapperFactoryInterface, GET_INTERFACE_TYPE (CCSGNOMEIntegrationGSettingsWrapperFactoryInterface));
-    ccsObjectSetPrivate (wrapperFactory, (CCSPrivate *) priv);
-
-    return wrapperFactory;
-}
-
-void
-ccsGNOMEIntegrationGSettingsWrapperDefaultImpl (CCSGNOMEIntegrationGSettingsWrapperFactory *factory)
-{
-    ccsObjectFinalize (factory);
-    (*factory->object.object_allocation->free_) (factory->object.object_allocation->allocator, factory);
-}
-
 typedef struct _CCSGSettingsIntegratedSettingFactoryPrivate CCSGSettingsIntegratedSettingFactoryPrivate;
 
 struct _CCSGSettingsIntegratedSettingFactoryPrivate
 {
-    CCSGNOMEIntegrationGSettingsWrapperFactory *wrapperFactory;
+    CCSGSettingsWrapperFactory *wrapperFactory;
     GHashTable  *pluginsToSettingsGSettingsWrapperQuarksHashTable;
     GHashTable  *quarksToGSettingsWrappersHashTable;
     GHashTable  *pluginsToSettingsSpecialTypesHashTable;
@@ -153,6 +80,12 @@
 
 }
 
+GCallback
+ccsGSettingsIntegratedSettingsChangeCallback ()
+{
+    return (GCallback) gnomeGSettingsValueChanged;
+}
+
 static CCSIntegratedSetting *
 createNewGSettingsIntegratedSetting (CCSGSettingsWrapper *wrapper,
 				     const char  *gnomeName,
@@ -193,52 +126,41 @@
 }
 
 static GHashTable *
-initializeGSettingsWrappers (CCSGNOMEIntegrationGSettingsWrapperFactory *factory,
-			     CCSGNOMEValueChangeData			*data)
+initializeGSettingsWrappers (CCSGSettingsWrapperFactory *factory)
 {
     const CCSGSettingsWrapperIntegratedSchemasQuarks *quarks = ccsGNOMEGSettingsWrapperQuarks ();
     GHashTable *quarksToGSettingsWrappers = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, ccsGSettingsWrapperUnrefWrapper);
 
     g_hash_table_insert (quarksToGSettingsWrappers, GINT_TO_POINTER (quarks->ORG_COMPIZ_INTEGRATED),
-			 ccsGNOMEIntegrationGSettingsWrapperFactoryNewGSettingsWrapper (factory,
-											g_quark_to_string (quarks->ORG_COMPIZ_INTEGRATED),
-											gnomeGSettingsValueChanged,
-											data,
-											factory->object.object_allocation));
+			 ccsGSettingsWrapperFactoryNewGSettingsWrapper (factory,
+									g_quark_to_string (quarks->ORG_COMPIZ_INTEGRATED),
+									factory->object.object_allocation));
     g_hash_table_insert (quarksToGSettingsWrappers, GINT_TO_POINTER (quarks->ORG_GNOME_DESKTOP_WM_KEYBINDINGS),
-			 ccsGNOMEIntegrationGSettingsWrapperFactoryNewGSettingsWrapper (factory,
-											g_quark_to_string (quarks->ORG_GNOME_DESKTOP_WM_KEYBINDINGS),
-											gnomeGSettingsValueChanged,
-											data,
-											factory->object.object_allocation));
+			 ccsGSettingsWrapperFactoryNewGSettingsWrapper (factory,
+									g_quark_to_string (quarks->ORG_GNOME_DESKTOP_WM_KEYBINDINGS),
+									factory->object.object_allocation));
     g_hash_table_insert (quarksToGSettingsWrappers, GINT_TO_POINTER (quarks->ORG_GNOME_DESKTOP_WM_PREFERENCES),
-			 ccsGNOMEIntegrationGSettingsWrapperFactoryNewGSettingsWrapper (factory,
-											g_quark_to_string (quarks->ORG_GNOME_DESKTOP_WM_PREFERENCES),
-											gnomeGSettingsValueChanged,
-											data,
-											factory->object.object_allocation));
+			 ccsGSettingsWrapperFactoryNewGSettingsWrapper (factory,
+									g_quark_to_string (quarks->ORG_GNOME_DESKTOP_WM_PREFERENCES),
+									factory->object.object_allocation));
     g_hash_table_insert (quarksToGSettingsWrappers, GINT_TO_POINTER (quarks->ORG_GNOME_DESKTOP_DEFAULT_APPLICATIONS_TERMINAL),
-			 ccsGNOMEIntegrationGSettingsWrapperFactoryNewGSettingsWrapper (factory,
-											g_quark_to_string (quarks->ORG_GNOME_DESKTOP_DEFAULT_APPLICATIONS_TERMINAL),
-											gnomeGSettingsValueChanged,
-											data,
-											factory->object.object_allocation));
+			 ccsGSettingsWrapperFactoryNewGSettingsWrapper (factory,
+									g_quark_to_string (quarks->ORG_GNOME_DESKTOP_DEFAULT_APPLICATIONS_TERMINAL),
+									factory->object.object_allocation));
     g_hash_table_insert (quarksToGSettingsWrappers, GINT_TO_POINTER (quarks->ORG_GNOME_SETTINGS_DAEMON_PLUGINS_MEDIA_KEYS),
-			 ccsGNOMEIntegrationGSettingsWrapperFactoryNewGSettingsWrapper (factory,
-											g_quark_to_string (quarks->ORG_GNOME_SETTINGS_DAEMON_PLUGINS_MEDIA_KEYS),
-											gnomeGSettingsValueChanged,
-											data,
-											factory->object.object_allocation));
+			 ccsGSettingsWrapperFactoryNewGSettingsWrapper (factory,
+									g_quark_to_string (quarks->ORG_GNOME_SETTINGS_DAEMON_PLUGINS_MEDIA_KEYS),
+									factory->object.object_allocation));
 
     return quarksToGSettingsWrappers;
 }
 
 CCSIntegratedSetting *
 ccsGSettingsIntegratedSettingFactoryCreateIntegratedSettingForCCSSettingNameAndType (CCSIntegratedSettingFactory *factory,
-										 CCSIntegration		     *integration,
-										 const char		     *pluginName,
-										 const char		     *settingName,
-										 CCSSettingType		     type)
+										     CCSIntegration              *integration,
+										     const char                  *pluginName,
+										     const char                  *settingName,
+										     CCSSettingType              type)
 {
     CCSGSettingsIntegratedSettingFactoryPrivate *priv = (CCSGSettingsIntegratedSettingFactoryPrivate *) ccsObjectGetPrivate (factory);
     GHashTable                              *settingsGSettingsWrapperQuarksHashTable = g_hash_table_lookup (priv->pluginsToSettingsGSettingsWrapperQuarksHashTable, pluginName);
@@ -246,7 +168,7 @@
     GHashTable				    *settingsSettingNameGNOMENameHashTable = g_hash_table_lookup (priv->pluginsToSettingNameGNOMENameHashTable, pluginName);
 
     if (!priv->quarksToGSettingsWrappersHashTable)
-	priv->quarksToGSettingsWrappersHashTable = initializeGSettingsWrappers (priv->wrapperFactory, priv->valueChangeData);
+	priv->quarksToGSettingsWrappersHashTable = initializeGSettingsWrappers (priv->wrapperFactory);
 
     if (settingsGSettingsWrapperQuarksHashTable &&
 	settingsSpecialTypesHashTable &&
@@ -258,12 +180,12 @@
 	const gchar *integratedName = g_hash_table_lookup (settingsSettingNameGNOMENameHashTable, settingName);
 
 	return createNewGSettingsIntegratedSetting (wrapper,
-						integratedName,
-						pluginName,
-						settingName,
-						type,
-						specialType,
-						factory->object.object_allocation);
+						    integratedName,
+						    pluginName,
+						    settingName,
+						    type,
+						    specialType,
+						    factory->object.object_allocation);
     }
 
 
@@ -287,13 +209,12 @@
     if (priv->pluginsToSettingNameGNOMENameHashTable)
 	g_hash_table_unref (priv->pluginsToSettingNameGNOMENameHashTable);
 
-    ccsGNOMEIntegrationGSettingsWrapperDefaultImplFree (priv->wrapperFactory);
+    ccsGSettingsWrapperFactoryUnref (priv->wrapperFactory);
 
     ccsObjectFinalize (factory);
     (*factory->object.object_allocation->free_) (factory->object.object_allocation->allocator, factory);
 }
 
-
 const CCSIntegratedSettingFactoryInterface ccsGSettingsIntegratedSettingFactoryInterface =
 {
     ccsGSettingsIntegratedSettingFactoryCreateIntegratedSettingForCCSSettingNameAndType,
@@ -301,9 +222,9 @@
 };
 
 CCSIntegratedSettingFactory *
-ccsGSettingsIntegratedSettingFactoryNew (CCSGNOMEIntegrationGSettingsWrapperFactory	  *wrapperFactory,
-					 CCSGNOMEValueChangeData			  *valueChangeData,
-					 CCSObjectAllocationInterface			  *ai)
+ccsGSettingsIntegratedSettingFactoryNew (CCSGSettingsWrapperFactory   *wrapperFactory,
+					 CCSGNOMEValueChangeData      *valueChangeData,
+					 CCSObjectAllocationInterface *ai)
 {
     CCSIntegratedSettingFactory *factory = (*ai->calloc_) (ai->allocator, 1, sizeof (CCSIntegratedSettingFactory));
 
@@ -318,6 +239,8 @@
 	return NULL;
     }
 
+    ccsGSettingsWrapperFactoryRef (wrapperFactory);
+
     priv->wrapperFactory = wrapperFactory;
     priv->pluginsToSettingsGSettingsWrapperQuarksHashTable = ccsGNOMEGSettingsIntegrationPopulateSettingNameToIntegratedSchemasQuarksHashTable ();
     priv->pluginsToSettingsSpecialTypesHashTable = ccsGNOMEIntegrationPopulateSpecialTypesHashTables ();

=== added file 'compizconfig/integration/gnome/gsettings/src/ccs_gnome_integration_gsettings_wrapper_factory.c'
--- compizconfig/integration/gnome/gsettings/src/ccs_gnome_integration_gsettings_wrapper_factory.c	1970-01-01 00:00:00 +0000
+++ compizconfig/integration/gnome/gsettings/src/ccs_gnome_integration_gsettings_wrapper_factory.c	2012-10-12 01:30:30 +0000
@@ -0,0 +1,135 @@
+/**
+ *
+ * GSettings libcompizconfig backend
+ *
+ * ccs_gnome_integration_gsettings_wrapper_factory.c
+ *
+ * Copyright (c) 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.
+ *
+ * Authored By:
+ *	Sam Spilsbury <[e-mail]>
+ *
+ **/
+#include <ccs-object.h>
+#include "ccs_gsettings_wrapper_factory.h"
+#include "ccs_gsettings_wrapper_factory_interface.h"
+#include "ccs_gsettings_interface.h"
+#include "ccs_gsettings_interface_wrapper.h"
+#include "ccs_gnome_integration_gsettings_wrapper_factory.h"
+
+/* CCSGSettingsWrapperFactory implementation */
+typedef struct _CCSGNOMEIntegrationGSettingsWrapperFactoryPrivate CCSGNOMEIntegrationGSettingsWrapperFactoryPrivate;
+struct _CCSGNOMEIntegrationGSettingsWrapperFactoryPrivate
+{
+    CCSGSettingsWrapperFactory *wrapperFactory;
+    GCallback                  callback;
+
+    /* This is expected to stay alive during the
+     * lifetime of this object */
+    CCSGNOMEValueChangeData    *data;
+};
+
+static void
+ccsGNOMEIntegrationGSettingsWrapperFree (CCSGSettingsWrapperFactory *wrapperFactory)
+{
+    CCSGNOMEIntegrationGSettingsWrapperFactoryPrivate *priv =
+	    GET_PRIVATE (CCSGNOMEIntegrationGSettingsWrapperFactoryPrivate, wrapperFactory);
+
+    ccsGSettingsWrapperFactoryUnref (priv->wrapperFactory);
+
+    ccsObjectFinalize (wrapperFactory);
+    (*wrapperFactory->object.object_allocation->free_) (wrapperFactory->object.object_allocation->allocator,
+							wrapperFactory);
+}
+
+static void
+connectWrapperToChangedSignal (CCSGSettingsWrapper                               *wrapper,
+			       CCSGNOMEIntegrationGSettingsWrapperFactoryPrivate *priv)
+{
+    ccsGSettingsWrapperConnectToChangedSignal (wrapper, priv->callback, priv->data);
+}
+
+static CCSGSettingsWrapper *
+ccsGNOMEIntegrationGSettingsWrapperFactoryNewGSettingsWrapper (CCSGSettingsWrapperFactory   *factory,
+							       const gchar                  *schemaName,
+							       CCSObjectAllocationInterface *ai)
+{
+    CCSGNOMEIntegrationGSettingsWrapperFactoryPrivate *priv =
+	    GET_PRIVATE (CCSGNOMEIntegrationGSettingsWrapperFactoryPrivate, factory);
+    CCSGSettingsWrapper *wrapper = ccsGSettingsWrapperFactoryNewGSettingsWrapper (priv->wrapperFactory,
+										  schemaName,
+										  factory->object.object_allocation);
+
+    connectWrapperToChangedSignal (wrapper, priv);
+
+    return wrapper;
+}
+
+static CCSGSettingsWrapper *
+ccsGNOMEIntegrationGSettingsWrapperFactoryNewGSettingsWrapperWithPath (CCSGSettingsWrapperFactory   *factory,
+								       const gchar                  *schemaName,
+								       const gchar                  *path,
+								       CCSObjectAllocationInterface *ai)
+{
+    CCSGNOMEIntegrationGSettingsWrapperFactoryPrivate *priv =
+	    GET_PRIVATE (CCSGNOMEIntegrationGSettingsWrapperFactoryPrivate, factory);
+    CCSGSettingsWrapper *wrapper = ccsGSettingsWrapperFactoryNewGSettingsWrapperWithPath (priv->wrapperFactory,
+											  schemaName,
+											  path,
+											  factory->object.object_allocation);
+
+    connectWrapperToChangedSignal (wrapper, priv);
+
+    return wrapper;
+}
+
+const CCSGSettingsWrapperFactoryInterface ccsGNOMEIntegrationGSettingsWrapperFactoryInterface =
+{
+    ccsGNOMEIntegrationGSettingsWrapperFactoryNewGSettingsWrapper,
+    ccsGNOMEIntegrationGSettingsWrapperFactoryNewGSettingsWrapperWithPath,
+    ccsGNOMEIntegrationGSettingsWrapperFree
+};
+
+CCSGSettingsWrapperFactory *
+ccsGNOMEIntegrationGSettingsWrapperFactoryDefaultImplNew (CCSObjectAllocationInterface *ai,
+							  CCSGSettingsWrapperFactory   *factory,
+							  GCallback                    callback,
+							  CCSGNOMEValueChangeData      *data)
+{
+    CCSGSettingsWrapperFactory *wrapperFactory = (*ai->calloc_) (ai->allocator, 1, sizeof (CCSGSettingsWrapperFactory));
+
+    if (!wrapperFactory)
+	return NULL;
+
+    CCSGNOMEIntegrationGSettingsWrapperFactoryPrivate *priv = (*ai->calloc_) (ai->allocator, 1, sizeof (CCSGNOMEIntegrationGSettingsWrapperFactoryPrivate));
+
+    if (!priv)
+    {
+	(*ai->free_) (ai->allocator, wrapperFactory);
+	return NULL;
+    }
+
+    ccsGSettingsWrapperFactoryRef (factory);
+
+    priv->wrapperFactory = factory;
+    priv->callback = callback;
+    priv->data = data;
+
+    ccsObjectInit (wrapperFactory, ai);
+    ccsObjectAddInterface (wrapperFactory, (const CCSInterface *) &ccsGNOMEIntegrationGSettingsWrapperFactoryInterface, GET_INTERFACE_TYPE (CCSGSettingsWrapperFactoryInterface));
+    ccsObjectSetPrivate (wrapperFactory, (CCSPrivate *) priv);
+
+    ccsGSettingsWrapperFactoryRef (wrapperFactory);
+
+    return wrapperFactory;
+}