Merge lp:~muktupavels/compiz/remove-mate-integration into lp:compiz/0.9.13

[Alberts Muktupāvels]

compizconfig: remove unused MATE integration

MATE integration is not used at all. Either this is unfinished work or someone did not understand what he was doing...

GNOME integration is built as static library that is used by gsettings backend. For example ccsGNOMEIntegrationBackendNew is called in compizconfig/gsettings/src/gsettings.c.

[Dmitry Shachnev (mitya57)]

And there are almost no code changes compared to GNOME integration, it is mostly renaming functions from GNOME* to MATE*, removing some Unity-specific code, and removing the gschema.

Also it misses some fixes like the recent s/fullscreen/fullscreen-flash/ fix.

If someone wants to reintroduce this in the future, it is better to reuse existing code rather than duplicate it.

review: Approve

[Alberts Muktupāvels (muktupavels)]

I think there could be multiple options:

- duplicate also gsettings backend as gsettings-mate, but that does not sound like good thing to just add MATE integration.

- Link MATE integration with gsettings backend and choose integration based on current desktop environment.

- Change integration setting in configuration from boolean to string or enum - None, GNOME and MATE. And if backend supports integration (ini backend does not) then it could return list with valid integrations that user can choose from in ccsm. Of course default provided by config.

Third option in my opinion could be best thing and second might work, but does not sound that good. Anyway MATE configuration currently has integration = false and I am not going to do this work... If anyone decides to do this work this can be reverted if needed.

[lp:~muktupavels/compiz/remove-mate-integration]

4201. By Alberts Muktupāvels on 2019-02-07

Merge with lp:compiz.

=== modified file 'compizconfig/integration/CMakeLists.txt'
--- compizconfig/integration/CMakeLists.txt	2015-02-04 22:20:18 +0000
+++ compizconfig/integration/CMakeLists.txt	2019-02-07 13:57:59 +0000
@@ -1,2 +1,1 @@
 add_subdirectory (gnome)
-add_subdirectory (mate)
 
=== removed directory 'compizconfig/integration/mate'
=== removed file 'compizconfig/integration/mate/CMakeLists.txt'
--- compizconfig/integration/mate/CMakeLists.txt	2019-02-05 15:45:03 +0000
+++ compizconfig/integration/mate/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-add_subdirectory (gsettings)
-
-set (_deps
-     glib-2.0>=2.20.0
-     gio-2.0>=2.25.0)
-
-compiz_pkg_check_modules (COMPIZCONFIG_MATE_INTEGRATION ${_deps})
-
-if (COMPIZCONFIG_MATE_INTEGRATION_FOUND)
-
-    include_directories (${CMAKE_SOURCE_DIR}/compizconfig/libcompizconfig/include
-			 ${CMAKE_SOURCE_DIR}/compizconfig/integration/mate/include
-			 ${COMPIZCONFIG_MATE_INTEGRATION_INCLUDE_DIRS})
-
-    link_directories (${CMAKE_BINARY_DIR}/compizconfig/libcompizconfig
-		      ${COMPIZCONFIG_MATE_INTEGRATION_LIBRARY_DIRS})
-
-    add_library (compizconfig_mate_integration_constants STATIC
-		 ${CMAKE_CURRENT_SOURCE_DIR}/src/ccs_mate_integration_constants.c)
-
-    add_library (compizconfig_mate_integration STATIC
-		 ${CMAKE_CURRENT_SOURCE_DIR}/src/ccs_mate_integration.c)
-
-    target_link_libraries (compizconfig_mate_integration
-			   compizconfig_mate_integration_constants
-			   compizconfig_mate_integrated_setting
-			   compizconfig
-			   ${COMPIZCONFIG_MATE_INTEGRATION_LIBRARIES})
-
-    add_library (compizconfig_mate_integrated_setting STATIC
-		 ${CMAKE_CURRENT_SOURCE_DIR}/src/ccs_mate_integrated_setting.c)
-
-    target_link_libraries (compizconfig_mate_integrated_setting
-			   compizconfig_mate_integration_constants
-			   compizconfig
-			${COMPIZCONFIG_MATE_INTEGRATION_LIBRARIES})
-
-    if (COMPIZ_BUILD_TESTING)
-	add_subdirectory (tests)
-    endif (COMPIZ_BUILD_TESTING)
-
-endif (COMPIZCONFIG_MATE_INTEGRATION_FOUND)
 
=== removed directory 'compizconfig/integration/mate/gsettings'
=== removed file 'compizconfig/integration/mate/gsettings/CMakeLists.txt'
--- compizconfig/integration/mate/gsettings/CMakeLists.txt	2019-02-05 15:45:03 +0000
+++ compizconfig/integration/mate/gsettings/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-    set (_deps
-	glib-2.0>=2.20.0
-	gio-2.0>=2.25.0)
-
-    compiz_pkg_check_modules (COMPIZCONFIG_MATE_GSETTINGS_INTEGRATION ${_deps})
-
-    if (COMPIZCONFIG_MATE_GSETTINGS_INTEGRATION_FOUND)
-
-	include_directories (${CMAKE_SOURCE_DIR}/compizconfig/libcompizconfig/include
-			     ${CMAKE_SOURCE_DIR}/compizconfig/gsettings/gsettings_backend_shared
-			     ${CMAKE_SOURCE_DIR}/compizconfig/integration/mate/include
-			     ${CMAKE_SOURCE_DIR}/compizconfig/integration/mate/gsettings/include
-			     ${COMPIZCONFIG_MATE_GSETTINGS_INTEGRATION_INCLUDE_DIRS})
-
-	link_directories (${CMAKE_BINARY_DIR}/compizconfig/libcompizconfig
-			  ${CMAKE_BINARY_DIR}/compizconfig/gsettings/gsettings_backend_shared
-			  ${CMAKE_BINARY_DIR}/compizconfig/integration/mate
-			  ${COMPIZCONFIG_MATE_GSETTINGS_INTEGRATION_LIBRARY_DIRS})
-
-	add_library (compizconfig_mate_integration_gsettings_integrated_setting STATIC
-		     ${CMAKE_CURRENT_SOURCE_DIR}/src/ccs_mate_integration_gsettings_integrated_setting.c)
-
-	target_link_libraries (compizconfig_mate_integration_gsettings_integrated_setting
-			       compizconfig_mate_integrated_setting
-			       compizconfig_mate_integration_constants
-			       compizconfig
-                               compizconfig_gsettings_util
-			       ${COMPIZCONFIG_MATE_GSETTINGS_INTEGRATION_LIBRARIES})
-
-	add_library (compizconfig_mate_integration_gsettings_setting_factory STATIC
-		     ${CMAKE_CURRENT_SOURCE_DIR}/src/ccs_mate_integration_gsettings_integrated_setting_factory.c)
-
-	target_link_libraries (compizconfig_mate_integration_gsettings_setting_factory
-			       compizconfig_gsettings_wrapper_factory_interface
-			       compizconfig_mate_integration_constants
-			       compizconfig_mate_integrated_setting
-			       compizconfig_mate_integration_gsettings_integrated_setting
-			       compizconfig
-                               compizconfig_gsettings_util
-			       ${COMPIZCONFIG_MATE_GSETTINGS_INTEGRATION_LIBRARIES})
-
-	add_library (compizconfig_mate_integration_gsettings_wrapper_factory STATIC
-		     ${CMAKE_CURRENT_SOURCE_DIR}/src/ccs_mate_integration_gsettings_wrapper_factory.c)
-
-	target_link_libraries (compizconfig_mate_integration_gsettings_setting_factory
-			       compizconfig_gsettings_wrapper_factory_interface
-			       compizconfig
-			       ${COMPIZCONFIG_MATE_GSETTINGS_INTEGRATION_LIBRARIES})
-
-	if (COMPIZ_BUILD_TESTING)
-	    add_subdirectory (tests)
-	endif (COMPIZ_BUILD_TESTING)
-
-    endif (COMPIZCONFIG_MATE_GSETTINGS_INTEGRATION_FOUND)
 
=== removed directory 'compizconfig/integration/mate/gsettings/include'
=== removed file 'compizconfig/integration/mate/gsettings/include/ccs_mate_integration_gsettings_integrated_setting.h'
--- compizconfig/integration/mate/gsettings/include/ccs_mate_integration_gsettings_integrated_setting.h	2015-02-04 22:20:18 +0000
+++ compizconfig/integration/mate/gsettings/include/ccs_mate_integration_gsettings_integrated_setting.h	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-#ifndef _CCS_MATE_GSETTINGS_INTEGRATED_SETTING_H
-#define _CCS_MATE_GSETTINGS_INTEGRATED_SETTING_H
-
-#include <ccs-defs.h>
-#include <ccs-fwd.h>
-#include <ccs_mate_fwd.h>
-#include <ccs_gsettings_backend_fwd.h>
-
-COMPIZCONFIG_BEGIN_DECLS
-
-/**
- * @brief ccsGSettingsIntegratedSettingNew
- * @param base
- * @param wrapper
- * @param ai
- * @return
- *
- * The GSettings implementation of CCSIntegratedSetting *, which will
- * write using a CCSGSettingsWrapper * object when the read and write
- * methods are called.
- */
-CCSIntegratedSetting *
-ccsGSettingsIntegratedSettingNew (CCSMATEIntegratedSettingInfo *base,
-				  CCSGSettingsWrapper       *wrapper,
-				  CCSObjectAllocationInterface *ai);
-
-/**
- * @brief ccsGSettingsIntegratedSettingsTranslateOldMATEKeyForGSettings
- * @param key the old style mate key to translate
- * @return new-style key. Caller should free
- *
- * This translates old style keys (eg foo_bar) to new style keys
- * foo-bar and special cases a few keys
- */
-char *
-ccsGSettingsIntegratedSettingsTranslateOldMATEKeyForGSettings (const char *key);
-
-COMPIZCONFIG_END_DECLS
-
-#endif
 
=== removed file 'compizconfig/integration/mate/gsettings/include/ccs_mate_integration_gsettings_integrated_setting_factory.h'
--- compizconfig/integration/mate/gsettings/include/ccs_mate_integration_gsettings_integrated_setting_factory.h	2015-02-04 22:20:18 +0000
+++ compizconfig/integration/mate/gsettings/include/ccs_mate_integration_gsettings_integrated_setting_factory.h	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-#ifndef _CCS_MATE_GSETTINGS_INTEGRATED_SETTING_FACTORY_H
-#define _CCS_MATE_GSETTINGS_INTEGRATED_SETTING_FACTORY_H
-
-#include <ccs-defs.h>
-#include <ccs-fwd.h>
-#include <ccs_mate_fwd.h>
-#include <ccs_gsettings_backend_fwd.h>
-#include <gio/gio.h>
-
-COMPIZCONFIG_BEGIN_DECLS
-
-/**
- * @brief ccsGSettingsIntegratedSettingsTranslateNewMATEKeyForCCS
- * @param key the old style mate key to translate
- * @return new-style key. Caller should free
- *
- * This translates new style keys (eg foo-bar) to old style keys
- * foo_bar and special cases a few keys
- */
-char *
-ccsGSettingsIntegratedSettingsTranslateNewMATEKeyForCCS (const char *key);
-
-/**
- * @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 (CCSGSettingsWrapperFactory   *wrapperFactory,
-					 CCSMATEValueChangeData      *data,
-					 CCSObjectAllocationInterface *ai);
-
-COMPIZCONFIG_END_DECLS
-
-#endif
 
=== removed file 'compizconfig/integration/mate/gsettings/include/ccs_mate_integration_gsettings_wrapper_factory.h'
--- compizconfig/integration/mate/gsettings/include/ccs_mate_integration_gsettings_wrapper_factory.h	2015-02-04 22:20:18 +0000
+++ compizconfig/integration/mate/gsettings/include/ccs_mate_integration_gsettings_wrapper_factory.h	1970-01-01 00:00:00 +0000
@@ -1,44 +0,0 @@
-/**
- *
- * 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_MATE_INTEGRATION_GSETTINGS_WRAPPER_FACTORY_H
-#define _CCS_MATE_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_mate_fwd.h>
-
-CCSGSettingsWrapperFactory *
-ccsMATEIntegrationGSettingsWrapperFactoryDefaultImplNew (CCSObjectAllocationInterface *ai,
-							  CCSGSettingsWrapperFactory   *factory,
-							  GCallback                    callback,
-							  CCSMATEValueChangeData      *data);
-
-COMPIZCONFIG_END_DECLS
-
-#endif
 
=== removed directory 'compizconfig/integration/mate/gsettings/src'
=== removed file 'compizconfig/integration/mate/gsettings/src/ccs_mate_integration_gsettings_integrated_setting.c'
--- compizconfig/integration/mate/gsettings/src/ccs_mate_integration_gsettings_integrated_setting.c	2015-02-04 22:20:18 +0000
+++ compizconfig/integration/mate/gsettings/src/ccs_mate_integration_gsettings_integrated_setting.c	1970-01-01 00:00:00 +0000
@@ -1,355 +0,0 @@
-#include <stdlib.h>
-#include <string.h>
-
-#include <gio/gio.h>
-
-#include <ccs.h>
-#include <ccs-backend.h>
-#include <ccs-object.h>
-
-#include <ccs_gsettings_interface.h>
-#include <gsettings_shared.h>
-
-#include "ccs_mate_integration_gsettings_integrated_setting.h"
-#include "ccs_mate_integrated_setting.h"
-#include "ccs_mate_integration_constants.h"
-
-
-/* CCSGSettingsIntegratedSetting implementation */
-typedef struct _CCSGSettingsIntegratedSettingPrivate CCSGSettingsIntegratedSettingPrivate;
-
-struct _CCSGSettingsIntegratedSettingPrivate
-{
-    CCSMATEIntegratedSettingInfo *mateIntegratedSetting;
-    CCSGSettingsWrapper	      *wrapper;
-};
-
-char *
-ccsGSettingsIntegratedSettingsTranslateOldMATEKeyForGSettings (const char *key)
-{
-    char *newKey = translateKeyForGSettings (key);
-
-    if (g_strcmp0 (newKey, "run-command-screenshot") == 0)
-    {
-	free (newKey);
-	newKey = strdup ("screenshot");
-    }
-    else if (g_strcmp0 (newKey, "run-command-window-screenshot") == 0)
-    {
-	free (newKey);
-	newKey = strdup ("window-screenshot");
-    }
-    else if (g_strcmp0 (newKey, "run-command-terminal") == 0)
-    {
-	free (newKey);
-	newKey = strdup ("terminal");
-    }
-
-    return newKey;
-}
-
-SpecialOptionType
-ccsGSettingsIntegratedSettingGetSpecialOptionType (CCSMATEIntegratedSettingInfo *setting)
-{
-    CCSGSettingsIntegratedSettingPrivate *priv = (CCSGSettingsIntegratedSettingPrivate *) ccsObjectGetPrivate (setting);
-
-    return ccsMATEIntegratedSettingInfoGetSpecialOptionType (priv->mateIntegratedSetting);
-}
-
-const char *
-ccsGSettingsIntegratedSettingGetMATEName (CCSMATEIntegratedSettingInfo *setting)
-{
-    CCSGSettingsIntegratedSettingPrivate *priv = (CCSGSettingsIntegratedSettingPrivate *) ccsObjectGetPrivate (setting);
-
-    return ccsMATEIntegratedSettingInfoGetMATEName (priv->mateIntegratedSetting);
-}
-
-CCSSettingValue *
-ccsGSettingsIntegratedSettingReadValue (CCSIntegratedSetting *setting, CCSSettingType type)
-{
-    CCSGSettingsIntegratedSettingPrivate *priv = (CCSGSettingsIntegratedSettingPrivate *) ccsObjectGetPrivate (setting);
-    CCSSettingValue		     *v = calloc (1, sizeof (CCSSettingValue));
-    const char			     *mateKeyName = ccsMATEIntegratedSettingInfoGetMATEName ((CCSMATEIntegratedSettingInfo *) setting);
-    char			     *gsettingsTranslatedName = ccsGSettingsIntegratedSettingsTranslateOldMATEKeyForGSettings (mateKeyName);
-
-    v->isListChild = FALSE;
-    v->parent = NULL;
-    v->refCount = 1;
-
-    GVariant *variant = ccsGSettingsWrapperGetValue (priv->wrapper, gsettingsTranslatedName);
-
-    if (!variant)
-    {
-	free (gsettingsTranslatedName);
-	free (v);
-	return NULL;
-    }
-
-    const GVariantType *variantType = G_VARIANT_TYPE (g_variant_get_type_string (variant));
-
-    switch (type)
-    {
-	case TypeInt:
-	    if (!g_variant_type_equal (variantType, G_VARIANT_TYPE_INT32))
-	    {
-		ccsError ("Expected integer value");
-		free (v);
-		v = NULL;
-		break;
-	    }
-
-	    v->value.asInt = readIntFromVariant (variant);
-	    break;
-	case TypeBool:
-	    if (!g_variant_type_equal (variantType, G_VARIANT_TYPE_BOOLEAN))
-	    {
-		ccsError ("Expected boolean value");
-		free (v);
-		v = NULL;
-		break;
-	    }
-
-	    v->value.asBool = readBoolFromVariant (variant);
-	    break;
-	case TypeString:
-	{
-	    if (!g_variant_type_equal (variantType, G_VARIANT_TYPE_STRING))
-	    {
-		ccsError ("Expected string value");
-		free (v);
-		v = NULL;
-		break;
-	    }
-
-	    const char *str = readStringFromVariant (variant);
-	    v->value.asString = strdup (str ? str : "");
-	    break;
-	}
-	case TypeKey:
-	{
-	    if (!g_variant_type_equal (variantType, G_VARIANT_TYPE ("as")))
-	    {
-		ccsError ("Expected array-of-string value");
-		free (v);
-		v = NULL;
-		break;
-	    }
-
-	    gsize len;
-	    const gchar **strv = g_variant_get_strv (variant, &len);
-
-	    if (strv)
-		v->value.asString = strdup (strv[0] ? strv[0] : "");
-	    else
-		v->value.asString = strdup ("");
-
-	    g_free (strv);
-	    break;
-	}
-	default:
-	    g_assert_not_reached ();
-    }
-
-    g_variant_unref (variant);
-    free (gsettingsTranslatedName);
-
-    return v;
-}
-
-void
-ccsGSettingsIntegratedSettingWriteValue (CCSIntegratedSetting *setting, CCSSettingValue *v, CCSSettingType type)
-{
-    CCSGSettingsIntegratedSettingPrivate *priv = (CCSGSettingsIntegratedSettingPrivate *) ccsObjectGetPrivate (setting);
-    const char			     *mateKeyName = ccsMATEIntegratedSettingInfoGetMATEName ((CCSMATEIntegratedSettingInfo *) setting);
-    char			     *gsettingsTranslatedName = ccsGSettingsIntegratedSettingsTranslateOldMATEKeyForGSettings (mateKeyName);
-
-    GVariant           *variant = ccsGSettingsWrapperGetValue (priv->wrapper, gsettingsTranslatedName);
-    const GVariantType *variantType = g_variant_get_type (variant);
-    GVariant           *newVariant = NULL;
-
-    if (!variant)
-    {
-	ccsError ("NULL encountered while reading GSettings value");
-	free (gsettingsTranslatedName);
-	return;
-    }
-
-    switch (type)
-    {
-	case TypeInt:
-	    {
-		if (!g_variant_type_equal (variantType, G_VARIANT_TYPE_INT32))
-		    ccsError ("Expected integer value");
-		else
-		{
-		    int currentValue = readIntFromVariant (variant);
-
-		    if ((currentValue != v->value.asInt))
-			writeIntToVariant (v->value.asInt, &newVariant);
-		}
-	    }
-	    break;
-	case TypeBool:
-	    {
-		if (!g_variant_type_equal (variantType, G_VARIANT_TYPE_BOOLEAN))
-		    ccsError ("Expected boolean value");
-		else
-		{
-		    gboolean currentValue = readBoolFromVariant (variant);
-
-		    if ((currentValue != v->value.asBool))
-			writeBoolToVariant (v->value.asBool, &newVariant);
-		}
-	    }
-	    break;
-	case TypeString:
-	    {
-		if (!g_variant_type_equal (variantType, G_VARIANT_TYPE_STRING))
-		    ccsError ("Expected string value");
-		else
-		{
-		    const char  *defaultValue = "";
-		    const char  *newValue = v->value.asString ? v->value.asString : defaultValue;
-		    gsize len = 0;
-		    const gchar *currentValue = g_variant_get_string (variant, &len);
-
-		    if (currentValue)
-		    {
-			if (strcmp (currentValue, newValue) != 0)
-			    writeStringToVariant (newValue, &newVariant);
-		    }
-		}
-	    }
-	    break;
-	case TypeKey:
-	    {
-		if (!g_variant_type_equal (variantType, G_VARIANT_TYPE ("as")))
-		    ccsError ("Expected array-of-string value");
-		else
-		{
-		    const char  *defaultValue = "";
-		    GVariantBuilder strvBuilder;
-
-		    g_variant_builder_init (&strvBuilder, G_VARIANT_TYPE ("as"));
-		    g_variant_builder_add (&strvBuilder, "s", v->value.asString ? v->value.asString :  defaultValue);
-		    newVariant = g_variant_builder_end (&strvBuilder);
-		}
-	    }
-	    break;
-	default:
-	    g_assert_not_reached ();
-	    break;
-    }
-
-    /* g_settings_set_value consumes the reference */
-    if (newVariant)
-	ccsGSettingsWrapperSetValue (priv->wrapper, gsettingsTranslatedName, newVariant);
-
-    g_variant_unref (variant);
-    free (gsettingsTranslatedName);
-}
-
-const char *
-ccsGSettingsIntegratedSettingInfoPluginName (CCSIntegratedSettingInfo *setting)
-{
-    CCSGSettingsIntegratedSettingPrivate *priv = (CCSGSettingsIntegratedSettingPrivate *) ccsObjectGetPrivate (setting);
-
-    return ccsIntegratedSettingInfoPluginName ((CCSIntegratedSettingInfo *) priv->mateIntegratedSetting);
-}
-
-const char *
-ccsGSettingsIntegratedSettingInfoSettingName (CCSIntegratedSettingInfo *setting)
-{
-    CCSGSettingsIntegratedSettingPrivate *priv = (CCSGSettingsIntegratedSettingPrivate *) ccsObjectGetPrivate (setting);
-
-    return ccsIntegratedSettingInfoSettingName ((CCSIntegratedSettingInfo *) priv->mateIntegratedSetting);
-}
-
-CCSSettingType
-ccsGSettingsIntegratedSettingInfoGetType (CCSIntegratedSettingInfo *setting)
-{
-    CCSGSettingsIntegratedSettingPrivate *priv = (CCSGSettingsIntegratedSettingPrivate *) ccsObjectGetPrivate (setting);
-
-    return ccsIntegratedSettingInfoGetType ((CCSIntegratedSettingInfo *) priv->mateIntegratedSetting);
-}
-
-void
-ccsGSettingsIntegratedSettingFree (CCSIntegratedSetting *setting)
-{
-    CCSGSettingsIntegratedSettingPrivate *priv = (CCSGSettingsIntegratedSettingPrivate *) ccsObjectGetPrivate (setting);
-
-    if (priv->wrapper)
-	ccsGSettingsWrapperUnref (priv->wrapper);
-
-    ccsIntegratedSettingInfoUnref ((CCSIntegratedSettingInfo *) priv->mateIntegratedSetting);
-    ccsObjectFinalize (setting);
-
-    (*setting->object.object_allocation->free_) (setting->object.object_allocation->allocator, setting);
-}
-
-void
-ccsGSettingsIntegratedSettingInfoFree (CCSIntegratedSettingInfo *info)
-{
-    return ccsGSettingsIntegratedSettingFree ((CCSIntegratedSetting *) info);
-}
-
-void
-ccsGSettingsMATEIntegratedSettingInfoFree (CCSMATEIntegratedSettingInfo *info)
-{
-    return ccsGSettingsIntegratedSettingFree ((CCSIntegratedSetting *) info);
-}
-
-const CCSMATEIntegratedSettingInfoInterface ccsGSettingsMATEIntegratedSettingInterface =
-{
-    ccsGSettingsIntegratedSettingGetSpecialOptionType,
-    ccsGSettingsIntegratedSettingGetMATEName,
-    ccsGSettingsMATEIntegratedSettingInfoFree
-};
-
-const CCSIntegratedSettingInterface ccsGSettingsIntegratedSettingInterface =
-{
-    ccsGSettingsIntegratedSettingReadValue,
-    ccsGSettingsIntegratedSettingWriteValue,
-    ccsGSettingsIntegratedSettingFree
-};
-
-const CCSIntegratedSettingInfoInterface ccsGSettingsIntegratedSettingInfoInterface =
-{
-    ccsGSettingsIntegratedSettingInfoPluginName,
-    ccsGSettingsIntegratedSettingInfoSettingName,
-    ccsGSettingsIntegratedSettingInfoGetType,
-    ccsGSettingsIntegratedSettingInfoFree
-};
-
-CCSIntegratedSetting *
-ccsGSettingsIntegratedSettingNew (CCSMATEIntegratedSettingInfo *base,
-				  CCSGSettingsWrapper	*wrapper,
-				  CCSObjectAllocationInterface *ai)
-{
-    CCSIntegratedSetting *setting = (*ai->calloc_) (ai->allocator, 1, sizeof (CCSIntegratedSetting));
-
-    if (!setting)
-	return NULL;
-
-    CCSGSettingsIntegratedSettingPrivate *priv = (*ai->calloc_) (ai->allocator, 1, sizeof (CCSGSettingsIntegratedSettingPrivate));
-
-    if (!priv)
-    {
-	(*ai->free_) (ai->allocator, priv);
-	return NULL;
-    }
-
-    priv->mateIntegratedSetting = base;
-    priv->wrapper = wrapper;
-
-    ccsGSettingsWrapperRef (priv->wrapper);
-
-    ccsObjectInit (setting, ai);
-    ccsObjectSetPrivate (setting, (CCSPrivate *) priv);
-    ccsObjectAddInterface (setting, (const CCSInterface *) &ccsGSettingsIntegratedSettingInterface, GET_INTERFACE_TYPE (CCSIntegratedSettingInterface));
-    ccsObjectAddInterface (setting, (const CCSInterface *) &ccsGSettingsIntegratedSettingInfoInterface, GET_INTERFACE_TYPE (CCSIntegratedSettingInfoInterface));
-    ccsObjectAddInterface (setting, (const CCSInterface *) &ccsGSettingsMATEIntegratedSettingInterface, GET_INTERFACE_TYPE (CCSMATEIntegratedSettingInfoInterface));
-    ccsIntegratedSettingRef (setting);
-
-    return setting;
-}
 
=== removed file 'compizconfig/integration/mate/gsettings/src/ccs_mate_integration_gsettings_integrated_setting_factory.c'
--- compizconfig/integration/mate/gsettings/src/ccs_mate_integration_gsettings_integrated_setting_factory.c	2015-02-04 22:20:18 +0000
+++ compizconfig/integration/mate/gsettings/src/ccs_mate_integration_gsettings_integrated_setting_factory.c	1970-01-01 00:00:00 +0000
@@ -1,261 +0,0 @@
-#include <stdlib.h>
-#include <string.h>
-
-#include <gio/gio.h>
-
-#include <ccs.h>
-#include <ccs-backend.h>
-#include <ccs-object.h>
-
-#include <ccs_gsettings_interface.h>
-#include <ccs_gsettings_interface_wrapper.h>
-
-#include <gsettings_util.h>
-#include <ccs_gsettings_wrapper_factory_interface.h>
-
-#include "ccs_mate_integration.h"
-#include "ccs_mate_integrated_setting.h"
-#include "ccs_mate_integration_constants.h"
-#include "ccs_mate_integration_types.h"
-#include "ccs_mate_integration_gsettings_integrated_setting.h"
-#include "ccs_mate_integration_gsettings_integrated_setting_factory.h"
-
-char *
-ccsGSettingsIntegratedSettingsTranslateNewMATEKeyForCCS (const char *key)
-{
-    char *newKey = translateKeyForCCS (key);
-
-    if (g_strcmp0 (newKey, "screenshot") == 0)
-    {
-	free (newKey);
-	newKey = strdup ("run_command_screenshot");
-    }
-    else if (g_strcmp0 (newKey, "window_screenshot") == 0)
-    {
-	free (newKey);
-	newKey = strdup ("run_command_window_screenshot");
-    }
-    else if (g_strcmp0 (newKey, "terminal") == 0)
-    {
-	free (newKey);
-	newKey = strdup ("run_command_terminal");
-    }
-
-    return newKey;
-}
-
-typedef struct _CCSGSettingsIntegratedSettingFactoryPrivate CCSGSettingsIntegratedSettingFactoryPrivate;
-
-struct _CCSGSettingsIntegratedSettingFactoryPrivate
-{
-    CCSGSettingsWrapperFactory *wrapperFactory;
-    GHashTable  *pluginsToSettingsGSettingsWrapperQuarksHashTable;
-    GHashTable  *quarksToGSettingsWrappersHashTable;
-    GHashTable  *pluginsToSettingsSpecialTypesHashTable;
-    GHashTable  *pluginsToSettingNameMATENameHashTable;
-    CCSMATEValueChangeData *valueChangeData;
-};
-
-static void
-mateGSettingsValueChanged (GSettings *settings,
-			    gchar     *key,
-			    gpointer  user_data)
-{
-    CCSMATEValueChangeData *data = (CCSMATEValueChangeData *) user_data;
-    char *baseName = ccsGSettingsIntegratedSettingsTranslateNewMATEKeyForCCS (key);
-
-    /* We don't care if integration is not enabled */
-    if (!ccsGetIntegrationEnabled (data->context))
-	return;
-
-    CCSIntegratedSettingList settingList = ccsIntegratedSettingsStorageFindMatchingSettingsByPredicate (data->storage,
-													ccsMATEIntegrationFindSettingsMatchingPredicate,
-													baseName);
-
-    ccsIntegrationUpdateIntegratedSettings (data->integration,
-					    data->context,
-					    settingList);
-
-    g_free (baseName);
-
-}
-
-GCallback
-ccsGSettingsIntegratedSettingsChangeCallback ()
-{
-    return (GCallback) mateGSettingsValueChanged;
-}
-
-static CCSIntegratedSetting *
-createNewGSettingsIntegratedSetting (CCSGSettingsWrapper *wrapper,
-				     const char  *mateName,
-				     const char  *pluginName,
-				     const char  *settingName,
-				     CCSSettingType type,
-				     SpecialOptionType specialOptionType,
-				     CCSObjectAllocationInterface *ai)
-{
-    CCSIntegratedSettingInfo *sharedIntegratedSettingInfo = ccsSharedIntegratedSettingInfoNew (pluginName, settingName, type, ai);
-
-    if (!sharedIntegratedSettingInfo)
-	return NULL;
-
-    CCSMATEIntegratedSettingInfo *mateIntegratedSettingInfo = ccsMATEIntegratedSettingInfoNew (sharedIntegratedSettingInfo, specialOptionType, mateName, ai);
-
-    if (!mateIntegratedSettingInfo)
-    {
-	ccsIntegratedSettingInfoUnref (sharedIntegratedSettingInfo);
-	return NULL;
-    }
-
-    CCSIntegratedSetting *gsettingsIntegratedSetting = ccsGSettingsIntegratedSettingNew (mateIntegratedSettingInfo, wrapper, ai);
-
-    if (!gsettingsIntegratedSetting)
-    {
-	ccsIntegratedSettingInfoUnref ((CCSIntegratedSettingInfo *) mateIntegratedSettingInfo);
-	return NULL;
-    }
-
-    return gsettingsIntegratedSetting;
-}
-
-static void
-ccsGSettingsWrapperUnrefWrapper (gpointer wrapper)
-{
-    ccsGSettingsWrapperUnref ((CCSGSettingsWrapper *) wrapper);
-}
-
-static GHashTable *
-initializeGSettingsWrappers (CCSGSettingsWrapperFactory *factory)
-{
-    const CCSGSettingsWrapperIntegratedSchemasQuarks *quarks = ccsMATEGSettingsWrapperQuarks ();
-    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),
-			 ccsGSettingsWrapperFactoryNewGSettingsWrapper (factory,
-									g_quark_to_string (quarks->ORG_COMPIZ_INTEGRATED),
-									factory->object.object_allocation));
-    g_hash_table_insert (quarksToGSettingsWrappers, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS),
-			 ccsGSettingsWrapperFactoryNewGSettingsWrapper (factory,
-									g_quark_to_string (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS),
-									factory->object.object_allocation));
-    g_hash_table_insert (quarksToGSettingsWrappers, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_PREFERENCES),
-			 ccsGSettingsWrapperFactoryNewGSettingsWrapper (factory,
-									g_quark_to_string (quarks->ORG_MATE_DESKTOP_WM_PREFERENCES),
-									factory->object.object_allocation));
-    g_hash_table_insert (quarksToGSettingsWrappers, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_DEFAULT_APPLICATIONS_TERMINAL),
-			 ccsGSettingsWrapperFactoryNewGSettingsWrapper (factory,
-									g_quark_to_string (quarks->ORG_MATE_DESKTOP_DEFAULT_APPLICATIONS_TERMINAL),
-									factory->object.object_allocation));
-    g_hash_table_insert (quarksToGSettingsWrappers, GINT_TO_POINTER (quarks->ORG_MATE_SETTINGS_DAEMON_PLUGINS_MEDIA_KEYS),
-			 ccsGSettingsWrapperFactoryNewGSettingsWrapper (factory,
-									g_quark_to_string (quarks->ORG_MATE_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)
-{
-    CCSGSettingsIntegratedSettingFactoryPrivate *priv = (CCSGSettingsIntegratedSettingFactoryPrivate *) ccsObjectGetPrivate (factory);
-    GHashTable                              *settingsGSettingsWrapperQuarksHashTable = g_hash_table_lookup (priv->pluginsToSettingsGSettingsWrapperQuarksHashTable, pluginName);
-    GHashTable                              *settingsSpecialTypesHashTable = g_hash_table_lookup (priv->pluginsToSettingsSpecialTypesHashTable, pluginName);
-    GHashTable				    *settingsSettingNameMATENameHashTable = g_hash_table_lookup (priv->pluginsToSettingNameMATENameHashTable, pluginName);
-
-    if (!priv->quarksToGSettingsWrappersHashTable)
-	priv->quarksToGSettingsWrappersHashTable = initializeGSettingsWrappers (priv->wrapperFactory);
-
-    if (settingsGSettingsWrapperQuarksHashTable &&
-	settingsSpecialTypesHashTable &&
-	settingsSettingNameMATENameHashTable)
-    {
-	GQuark  wrapperQuark = GPOINTER_TO_INT (g_hash_table_lookup (settingsGSettingsWrapperQuarksHashTable, settingName));
-	CCSGSettingsWrapper *wrapper = g_hash_table_lookup (priv->quarksToGSettingsWrappersHashTable, GINT_TO_POINTER (wrapperQuark));
-	SpecialOptionType specialType = (SpecialOptionType) GPOINTER_TO_INT (g_hash_table_lookup (settingsSpecialTypesHashTable, settingName));
-	const gchar *integratedName = g_hash_table_lookup (settingsSettingNameMATENameHashTable, settingName);
-
-	if (wrapper == NULL)
-	    return NULL;
-
-	return createNewGSettingsIntegratedSetting (wrapper,
-						    integratedName,
-						    pluginName,
-						    settingName,
-						    type,
-						    specialType,
-						    factory->object.object_allocation);
-    }
-
-
-    return NULL;
-}
-
-void
-ccsGSettingsIntegratedSettingFactoryFree (CCSIntegratedSettingFactory *factory)
-{
-    CCSGSettingsIntegratedSettingFactoryPrivate *priv = (CCSGSettingsIntegratedSettingFactoryPrivate *) ccsObjectGetPrivate (factory);
-
-    if (priv->pluginsToSettingsGSettingsWrapperQuarksHashTable)
-	g_hash_table_unref (priv->pluginsToSettingsGSettingsWrapperQuarksHashTable);
-
-    if (priv->quarksToGSettingsWrappersHashTable)
-	g_hash_table_unref (priv->quarksToGSettingsWrappersHashTable);
-
-    if (priv->pluginsToSettingsSpecialTypesHashTable)
-	g_hash_table_unref (priv->pluginsToSettingsSpecialTypesHashTable);
-
-    if (priv->pluginsToSettingNameMATENameHashTable)
-	g_hash_table_unref (priv->pluginsToSettingNameMATENameHashTable);
-
-    ccsGSettingsWrapperFactoryUnref (priv->wrapperFactory);
-
-    ccsObjectFinalize (factory);
-    (*factory->object.object_allocation->free_) (factory->object.object_allocation->allocator, factory);
-}
-
-const CCSIntegratedSettingFactoryInterface ccsGSettingsIntegratedSettingFactoryInterface =
-{
-    ccsGSettingsIntegratedSettingFactoryCreateIntegratedSettingForCCSSettingNameAndType,
-    ccsGSettingsIntegratedSettingFactoryFree
-};
-
-CCSIntegratedSettingFactory *
-ccsGSettingsIntegratedSettingFactoryNew (CCSGSettingsWrapperFactory   *wrapperFactory,
-					 CCSMATEValueChangeData      *valueChangeData,
-					 CCSObjectAllocationInterface *ai)
-{
-    CCSIntegratedSettingFactory *factory = (*ai->calloc_) (ai->allocator, 1, sizeof (CCSIntegratedSettingFactory));
-
-    if (!factory)
-	return NULL;
-
-    CCSGSettingsIntegratedSettingFactoryPrivate *priv = (*ai->calloc_) (ai->allocator, 1, sizeof (CCSGSettingsIntegratedSettingFactoryPrivate));
-
-    if (!priv)
-    {
-	(*ai->free_) (ai->allocator, factory);
-	return NULL;
-    }
-
-    ccsGSettingsWrapperFactoryRef (wrapperFactory);
-
-    priv->wrapperFactory = wrapperFactory;
-    priv->pluginsToSettingsGSettingsWrapperQuarksHashTable = ccsMATEGSettingsIntegrationPopulateSettingNameToIntegratedSchemasQuarksHashTable ();
-    priv->pluginsToSettingsSpecialTypesHashTable = ccsMATEIntegrationPopulateSpecialTypesHashTables ();
-    priv->pluginsToSettingNameMATENameHashTable = ccsMATEIntegrationPopulateSettingNameToMATENameHashTables ();
-    priv->valueChangeData = valueChangeData;
-
-    ccsObjectInit (factory, ai);
-    ccsObjectSetPrivate (factory, (CCSPrivate *) priv);
-    ccsObjectAddInterface (factory, (const CCSInterface *) &ccsGSettingsIntegratedSettingFactoryInterface, GET_INTERFACE_TYPE (CCSIntegratedSettingFactoryInterface));
-
-    ccsObjectRef (factory);
-
-    return factory;
-}
-
 
=== removed file 'compizconfig/integration/mate/gsettings/src/ccs_mate_integration_gsettings_wrapper_factory.c'
--- compizconfig/integration/mate/gsettings/src/ccs_mate_integration_gsettings_wrapper_factory.c	2015-02-04 22:20:18 +0000
+++ compizconfig/integration/mate/gsettings/src/ccs_mate_integration_gsettings_wrapper_factory.c	1970-01-01 00:00:00 +0000
@@ -1,136 +0,0 @@
-/**
- *
- * GSettings libcompizconfig backend
- *
- * ccs_mate_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_mate_integration_gsettings_wrapper_factory.h"
-
-/* CCSGSettingsWrapperFactory implementation */
-typedef struct _CCSMATEIntegrationGSettingsWrapperFactoryPrivate CCSMATEIntegrationGSettingsWrapperFactoryPrivate;
-struct _CCSMATEIntegrationGSettingsWrapperFactoryPrivate
-{
-    CCSGSettingsWrapperFactory *wrapperFactory;
-    GCallback                  callback;
-
-    /* This is expected to stay alive during the
-     * lifetime of this object */
-    CCSMATEValueChangeData    *data;
-};
-
-static void
-ccsMATEIntegrationGSettingsWrapperFree (CCSGSettingsWrapperFactory *wrapperFactory)
-{
-    CCSMATEIntegrationGSettingsWrapperFactoryPrivate *priv =
-	    GET_PRIVATE (CCSMATEIntegrationGSettingsWrapperFactoryPrivate, wrapperFactory);
-
-    ccsGSettingsWrapperFactoryUnref (priv->wrapperFactory);
-
-    ccsObjectFinalize (wrapperFactory);
-    (*wrapperFactory->object.object_allocation->free_) (wrapperFactory->object.object_allocation->allocator,
-							wrapperFactory);
-}
-
-static void
-connectWrapperToChangedSignal (CCSGSettingsWrapper                               *wrapper,
-			       CCSMATEIntegrationGSettingsWrapperFactoryPrivate *priv)
-{
-    ccsGSettingsWrapperConnectToChangedSignal (wrapper, priv->callback, priv->data);
-}
-
-static CCSGSettingsWrapper *
-ccsMATEIntegrationGSettingsWrapperFactoryNewGSettingsWrapper (CCSGSettingsWrapperFactory   *factory,
-							       const gchar                  *schemaName,
-							       CCSObjectAllocationInterface *ai)
-{
-    CCSMATEIntegrationGSettingsWrapperFactoryPrivate *priv =
-	    GET_PRIVATE (CCSMATEIntegrationGSettingsWrapperFactoryPrivate, factory);
-    CCSGSettingsWrapper *wrapper = ccsGSettingsWrapperFactoryNewGSettingsWrapper (priv->wrapperFactory,
-										  schemaName,
-										  factory->object.object_allocation);
-
-    if (wrapper != NULL)
-	connectWrapperToChangedSignal (wrapper, priv);
-
-    return wrapper;
-}
-
-static CCSGSettingsWrapper *
-ccsMATEIntegrationGSettingsWrapperFactoryNewGSettingsWrapperWithPath (CCSGSettingsWrapperFactory   *factory,
-								       const gchar                  *schemaName,
-								       const gchar                  *path,
-								       CCSObjectAllocationInterface *ai)
-{
-    CCSMATEIntegrationGSettingsWrapperFactoryPrivate *priv =
-	    GET_PRIVATE (CCSMATEIntegrationGSettingsWrapperFactoryPrivate, factory);
-    CCSGSettingsWrapper *wrapper = ccsGSettingsWrapperFactoryNewGSettingsWrapperWithPath (priv->wrapperFactory,
-											  schemaName,
-											  path,
-											  factory->object.object_allocation);
-
-    connectWrapperToChangedSignal (wrapper, priv);
-
-    return wrapper;
-}
-
-const CCSGSettingsWrapperFactoryInterface ccsMATEIntegrationGSettingsWrapperFactoryInterface =
-{
-    ccsMATEIntegrationGSettingsWrapperFactoryNewGSettingsWrapper,
-    ccsMATEIntegrationGSettingsWrapperFactoryNewGSettingsWrapperWithPath,
-    ccsMATEIntegrationGSettingsWrapperFree
-};
-
-CCSGSettingsWrapperFactory *
-ccsMATEIntegrationGSettingsWrapperFactoryDefaultImplNew (CCSObjectAllocationInterface *ai,
-							  CCSGSettingsWrapperFactory   *factory,
-							  GCallback                    callback,
-							  CCSMATEValueChangeData      *data)
-{
-    CCSGSettingsWrapperFactory *wrapperFactory = (*ai->calloc_) (ai->allocator, 1, sizeof (CCSGSettingsWrapperFactory));
-
-    if (!wrapperFactory)
-	return NULL;
-
-    CCSMATEIntegrationGSettingsWrapperFactoryPrivate *priv = (*ai->calloc_) (ai->allocator, 1, sizeof (CCSMATEIntegrationGSettingsWrapperFactoryPrivate));
-
-    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 *) &ccsMATEIntegrationGSettingsWrapperFactoryInterface, GET_INTERFACE_TYPE (CCSGSettingsWrapperFactoryInterface));
-    ccsObjectSetPrivate (wrapperFactory, (CCSPrivate *) priv);
-
-    ccsGSettingsWrapperFactoryRef (wrapperFactory);
-
-    return wrapperFactory;
-}
 
=== removed directory 'compizconfig/integration/mate/gsettings/tests'
=== removed file 'compizconfig/integration/mate/gsettings/tests/CMakeLists.txt'
--- compizconfig/integration/mate/gsettings/tests/CMakeLists.txt	2015-07-30 19:56:19 +0000
+++ compizconfig/integration/mate/gsettings/tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-include_directories (${GTEST_INCLUDE_DIRS})
-include_directories (${CMAKE_SOURCE_DIR}/include)
-include_directories (${CMAKE_SOURCE_DIR}/tests/shared)
-include_directories (${CMAKE_SOURCE_DIR}/tests/shared/glib)
-include_directories (${CMAKE_CURRENT_SOURCE_DIR}/../../../../mocks/libcompizconfig)
-include_directories (${CMAKE_CURRENT_SOURCE_DIR}/../../../../gsettings/tests)
-include_directories (${CMAKE_CURRENT_SOURCE_DIR}/../../../../gsettings/mocks)
-include_directories (${CMAKE_SOURCE_DIR}/compizconfig/tests)
-link_directories (${CMAKE_INSTALL_PREFIX}/lib)
-link_directories (${CMAKE_CURRENT_BINARY_DIR}/../../mocks/libcompizconfig)
-link_directories (${CMAKE_CURRENT_BINARY_DIR}/../../tests/)
-link_directories (${CMAKE_CURRENT_BINARY_DIR}/../src/)
-
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
-add_executable (compizconfig_test_ccs_mate_gsettings_integrated_setting
-		${CMAKE_CURRENT_SOURCE_DIR}/compizconfig_test_ccs_mate_gsettings_integrated_setting.cpp)
-
-target_link_libraries (compizconfig_test_ccs_mate_gsettings_integrated_setting
-		       ${GTEST_BOTH_LIBRARIES}
-		       ${GMOCK_LIBRARY}
-		       ${GMOCK_MAIN_LIBRARY}
-		       ${LIBCOMPIZCONFIG_LIBRARIES}
-		       compizconfig
-		       compizconfig_gsettings_settings_test_env
-		       compizconfig_ccs_gsettings_wrapper_mock
-                       compizconfig_mate_integration_gsettings_integrated_setting
-                       compizconfig_gsettings_backend_interface)
-
-compiz_discover_tests (compizconfig_test_ccs_mate_gsettings_integrated_setting COVERAGE compizconfig_mate_integration_gsettings_integrated_setting)
 
=== removed file 'compizconfig/integration/mate/gsettings/tests/compizconfig_test_ccs_mate_gsettings_integrated_setting.cpp'
--- compizconfig/integration/mate/gsettings/tests/compizconfig_test_ccs_mate_gsettings_integrated_setting.cpp	2018-07-19 00:55:26 +0000
+++ compizconfig/integration/mate/gsettings/tests/compizconfig_test_ccs_mate_gsettings_integrated_setting.cpp	1970-01-01 00:00:00 +0000
@@ -1,443 +0,0 @@
-/*
- * Compiz configuration system library
- *
- * Copyright (C) 2012 Canonical Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
-
- * This library 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
- * Lesser General Public License for more details.
-
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Authored By:
- * Sam Spilsbury <[e-mail]>
- */
-#include <gtest/gtest.h>
-#include <gmock/gmock.h>
-
-#include <map>
-#include <memory>
-#include <boost/shared_ptr.hpp>
-
-#include <glib_gslice_off_env.h>
-#include <gtest_shared_autodestroy.h>
-
-#include <ccs.h>
-#include <ccs-backend.h>
-#include <ccs_mate_integrated_setting.h>
-#include <ccs_mate_integration_gsettings_integrated_setting.h>
-#include <ccs_gsettings_wrapper_mock.h>
-
-using ::testing::Combine;
-using ::testing::Return;
-using ::testing::IsNull;
-using ::testing::ValuesIn;
-using ::testing::Values;
-using ::testing::Eq;
-using ::testing::WithArgs;
-using ::testing::_;
-
-namespace compiz
-{
-    namespace config
-    {
-	namespace integration
-	{
-	    namespace test
-	    {
-		const std::string KEYBINDING_ONE = "keybinding_one";
-		const std::string KEYBINDING_TWO = "keybinding_two";
-		const std::string STRING = "string";
-		const Bool        BOOLEAN = TRUE;
-		const int         INTEGER = 2;
-
-		const std::string STRING_ALT = "string_alt";
-		const Bool        BOOLEAN_ALT = FALSE;
-		const int         INTEGER_ALT = 1;
-
-		namespace variant_generators
-		{
-		    GVariant * i ();
-		    GVariant * s ();
-		    GVariant * b ();
-		    GVariant * as ();
-		    GVariant * fromValue (CCSSettingValue *v, CCSSettingType type);
-		}
-
-		namespace value_generators
-		{
-		    CCSSettingValue * integer ();
-		    CCSSettingValue * string ();
-		    CCSSettingValue * key ();
-		    CCSSettingValue * boolean ();
-		}
-
-		namespace expectations
-		{
-		    void integer (CCSSettingValue *);
-		    void string  (CCSSettingValue *);
-		    void boolean (CCSSettingValue *);
-		    void key     (CCSSettingValue *);
-
-		    void integerVariant (GVariant *, int);
-		    void stringVariant (GVariant *, const std::string &);
-		    void booleanVariant (GVariant *, bool);
-		    void keyVariant (GVariant *, const std::string &);
-		}
-
-		typedef GVariant * (*VariantGenerator) ();
-		typedef CCSSettingValue * (*ValueGenerator) ();
-		typedef void (*Expectation) (CCSSettingValue *);
-
-		struct GSettingsIntegratedSettingInfo
-		{
-		    VariantGenerator variantGenerator;
-		    ValueGenerator   valueGenerator;
-		    Expectation      expectation;
-		    CCSSettingType   settingType;
-		    CCSSettingType   returnType;
-		};
-
-		namespace impl
-		{
-		    namespace ccit = compiz::config::integration::test;
-		    namespace vg = compiz::config::integration::test::variant_generators;
-		    namespace cvg = compiz::config::integration::test::value_generators;
-		    namespace ex = compiz::config::integration::test::expectations;
-
-		    ccit::GSettingsIntegratedSettingInfo settingsInfo[] =
-		    {
-			{ vg::i, cvg::integer, ex::integer, TypeInt, TypeInt },
-			{ vg::b, cvg::boolean, ex::boolean, TypeBool, TypeBool },
-			{ vg::s, cvg::string, ex::string, TypeString, TypeString },
-			{ vg::as, cvg::key, ex::key, TypeKey, TypeString }
-		    };
-		}
-	    }
-	}
-    }
-}
-
-MATCHER_P (VariantEqual, lhs, "Variants Equal")
-{
-    return g_variant_equal (lhs, arg);
-}
-
-namespace
-{
-    std::map <CCSSettingType, SpecialOptionType> &
-    ccsTypeToSpecialType ()
-    {
-	static std::map <CCSSettingType, SpecialOptionType> types;
-	static bool initialized = false;
-
-	if (!initialized)
-	{
-	    types[TypeInt] = OptionInt;
-	    types[TypeBool] = OptionBool;
-	    types[TypeString] = OptionString;
-	    types[TypeKey] = OptionKey;
-	}
-
-	return types;
-    }
-}
-
-namespace ccit = compiz::config::integration::test;
-namespace cciti = compiz::config::integration::test::impl;
-namespace ccvg = compiz::config::integration::test::variant_generators;
-namespace ccvalg = compiz::config::integration::test::value_generators;
-namespace ccex = compiz::config::integration::test::expectations;
-
-typedef testing::tuple <CCSSettingType,
-			 ccit::GSettingsIntegratedSettingInfo> CCSGSettingsIntegratedSettingTestInfo;
-
-class CCSGSettingsIntegratedSettingTest :
-    public ::testing::TestWithParam <CCSGSettingsIntegratedSettingTestInfo>
-{
-    public:
-
-	virtual void SetUp ();
-	virtual void TearDown ();
-
-    protected:
-
-	CompizGLibGSliceOffEnv                  env;
-	boost::shared_ptr <CCSGSettingsWrapper> mWrapper;
-	CCSGSettingsWrapperGMock                *mWrapperMock;
-};
-
-GVariant *
-ccvg::fromValue (CCSSettingValue *v,
-		 CCSSettingType  type)
-{
-    switch (type)
-    {
-	case TypeInt:
-	    return g_variant_new ("i", v->value.asInt);
-	    break;
-	case TypeBool:
-	    return g_variant_new ("b", v->value.asBool);
-	    break;
-	case TypeString:
-	    return g_variant_new ("s", v->value.asString);
-	    break;
-	case TypeKey:
-	{
-	    GVariantBuilder builder;
-	    g_variant_builder_init (&builder, G_VARIANT_TYPE ("as"));
-
-	    /* Represented internally as strings */
-	    std::string kb (v->value.asString);
-	    if (kb == "Disabled")
-		kb[0] = 'd';
-
-	    g_variant_builder_add (&builder, "s", kb.c_str ());
-	    return g_variant_builder_end (&builder);
-	}
-	default:
-	    break;
-    }
-
-    return NULL;
-}
-
-GVariant *
-ccvg::as ()
-{
-    GVariantBuilder builder;
-    g_variant_builder_init (&builder, G_VARIANT_TYPE ("as"));
-    g_variant_builder_add (&builder, "s", ccit::KEYBINDING_ONE.c_str ());
-    g_variant_builder_add (&builder, "s", ccit::KEYBINDING_TWO.c_str ());
-
-    return g_variant_builder_end (&builder);
-}
-
-GVariant *
-ccvg::i ()
-{
-    return g_variant_new ("i", ccit::INTEGER);
-}
-
-GVariant *
-ccvg::b ()
-{
-    return g_variant_new ("b", ccit::BOOLEAN);
-}
-
-GVariant *
-ccvg::s ()
-{
-    return g_variant_new ("s", ccit::STRING.c_str ());
-}
-
-namespace
-{
-    CCSSettingValue * createSettingValue ()
-    {
-	CCSSettingValue *v = reinterpret_cast <CCSSettingValue *> (calloc (1, sizeof (CCSSettingValue)));
-
-	v->isListChild = FALSE;
-	v->parent = NULL;
-	v->refCount = 1;
-
-	return v;
-    }
-}
-
-CCSSettingValue *
-ccvalg::integer ()
-{
-    CCSSettingValue *v = createSettingValue ();
-    v->value.asInt = ccit::INTEGER_ALT;
-    return v;
-}
-
-CCSSettingValue *
-ccvalg::string ()
-{
-    CCSSettingValue *v = createSettingValue ();
-    v->value.asString = strdup (ccit::STRING_ALT.c_str ());
-    return v;
-}
-
-CCSSettingValue *
-ccvalg::key ()
-{
-    CCSSettingValue *v = createSettingValue ();
-    v->value.asString = strdup (ccit::KEYBINDING_TWO.c_str ());
-    return v;
-}
-
-CCSSettingValue *
-ccvalg::boolean ()
-{
-    CCSSettingValue *v = createSettingValue ();
-    v->value.asBool = ccit::BOOLEAN_ALT;
-    return v;
-}
-
-void
-ccex::boolean (CCSSettingValue *v)
-{
-    EXPECT_EQ (v->value.asBool, ccit::BOOLEAN);
-}
-
-void
-ccex::integer (CCSSettingValue *v)
-{
-    EXPECT_EQ (v->value.asInt, ccit::INTEGER);
-}
-
-void
-ccex::string (CCSSettingValue *v)
-{
-    EXPECT_EQ (v->value.asString, ccit::STRING);
-}
-
-void
-ccex::key (CCSSettingValue *v)
-{
-    EXPECT_EQ (v->value.asString, ccit::KEYBINDING_ONE);
-}
-
-void
-ccex::integerVariant (GVariant *v , int i)
-{
-    EXPECT_EQ (g_variant_get_int32 (v), i);
-}
-
-void
-ccex::stringVariant (GVariant *v, const std::string &s)
-{
-    gsize len;
-    EXPECT_EQ (g_variant_get_string (v, &len), s);
-}
-
-void
-ccex::booleanVariant (GVariant *v, bool b)
-{
-    EXPECT_EQ (g_variant_get_boolean (v), b);
-}
-
-void
-ccex::keyVariant (GVariant *v, const std::string &s)
-{
-    gsize len;
-    const gchar * const *strv = g_variant_get_strv (v, &len);
-    EXPECT_EQ (strv[0], s);
-}
-
-void
-CCSGSettingsIntegratedSettingTest::SetUp ()
-{
-    env.SetUpEnv ();
-    mWrapper.reset (ccsMockGSettingsWrapperNew (),
-		    boost::bind (ccsMockGSettingsWrapperFree, _1));
-    mWrapperMock = reinterpret_cast <CCSGSettingsWrapperGMock *> (
-		       ccsObjectGetPrivate (mWrapper.get ()));
-}
-
-void
-CCSGSettingsIntegratedSettingTest::TearDown ()
-{
-    mWrapper.reset ();
-    mWrapperMock = NULL;
-    env.TearDownEnv ();
-}
-
-TEST_P (CCSGSettingsIntegratedSettingTest, MatchedTypesReturnValueMismatchedTypesReturnNull)
-{
-    const std::string keyName ("mock");
-    const ccit::GSettingsIntegratedSettingInfo &integratedSettingInfo =
-	    testing::get <1> (GetParam ());
-    const CCSSettingType                       createSettingType =
-	    testing::get <0> (GetParam ());
-
-    /* The GSettings Integrated setting takes ownership of these */
-    CCSIntegratedSettingInfo *integratedSetting = ccsSharedIntegratedSettingInfoNew (keyName.c_str (),
-										     keyName.c_str (),
-										     integratedSettingInfo.settingType,
-										     &ccsDefaultObjectAllocator);
-    SpecialOptionType             specialType = ccsTypeToSpecialType ()[integratedSettingInfo.settingType];
-    CCSMATEIntegratedSettingInfo *mateIntegratedSetting = ccsMATEIntegratedSettingInfoNew (integratedSetting,
-											      specialType,
-											      keyName.c_str (),
-											      &ccsDefaultObjectAllocator);
-    boost::shared_ptr <CCSIntegratedSetting> gsettingsIntegrated (AutoDestroy (ccsGSettingsIntegratedSettingNew (mateIntegratedSetting,
-														 mWrapper.get (),
-														 &ccsDefaultObjectAllocator),
-									       ccsIntegratedSettingUnref));
-
-    GVariant *variant = (*integratedSettingInfo.variantGenerator) ();
-    EXPECT_CALL (*mWrapperMock, getValue (Eq (keyName))).WillOnce (Return (variant));
-
-    CCSSettingValue *value = ccsIntegratedSettingReadValue (gsettingsIntegrated.get (), createSettingType);
-
-    if (createSettingType == integratedSettingInfo.settingType)
-	(*integratedSettingInfo.expectation) (value);
-    else
-	EXPECT_THAT (value, IsNull ());
-
-    if (value)
-	ccsFreeSettingValueWithType (value, integratedSettingInfo.returnType);
-}
-
-ACTION (FreeVariant)
-{
-    g_variant_unref (arg0);
-}
-
-TEST_P (CCSGSettingsIntegratedSettingTest, MatchedTypesReturnValueMismatchedTypesResetOrWrite)
-{
-    const std::string keyName ("mock");
-    const ccit::GSettingsIntegratedSettingInfo &integratedSettingInfo =
-	    testing::get <1> (GetParam ());
-    const CCSSettingType                       createSettingType =
-	    testing::get <0> (GetParam ());
-
-    CCSIntegratedSettingInfo *integratedSetting = ccsSharedIntegratedSettingInfoNew (keyName.c_str (),
-										     keyName.c_str (),
-										     integratedSettingInfo.settingType,
-										     &ccsDefaultObjectAllocator);
-    SpecialOptionType             specialType = ccsTypeToSpecialType ()[integratedSettingInfo.settingType];
-    CCSMATEIntegratedSettingInfo *mateIntegratedSetting = ccsMATEIntegratedSettingInfoNew (integratedSetting,
-											      specialType,
-											      keyName.c_str (),
-											      &ccsDefaultObjectAllocator);
-    boost::shared_ptr <CCSIntegratedSetting> gsettingsIntegrated (AutoDestroy (ccsGSettingsIntegratedSettingNew (mateIntegratedSetting,
-														 mWrapper.get (),
-														 &ccsDefaultObjectAllocator),
-									       ccsIntegratedSettingUnref));
-
-    boost::shared_ptr <CCSSettingValue> value ((*integratedSettingInfo.valueGenerator) (),
-					       boost::bind (ccsFreeSettingValueWithType,
-							    _1,
-							    integratedSettingInfo.returnType));
-    boost::shared_ptr <GVariant>        variant = AutoDestroy (g_variant_ref ((*integratedSettingInfo.variantGenerator) ()),
-							       g_variant_unref);
-    boost::shared_ptr <GVariant>        newVariant = AutoDestroy (ccvg::fromValue (value.get (),
-										   integratedSettingInfo.settingType),
-								  g_variant_unref);
-    EXPECT_CALL (*mWrapperMock, getValue (Eq (keyName))).WillOnce (Return (variant.get ()));
-
-    if (createSettingType == integratedSettingInfo.settingType)
-	EXPECT_CALL (*mWrapperMock, setValue (Eq (keyName), VariantEqual (newVariant.get ())))
-		.WillOnce (WithArgs <1> (FreeVariant ()));
-    else
-	EXPECT_CALL (*mWrapperMock, resetKey (Eq (keyName)));
-
-    ccsIntegratedSettingWriteValue (gsettingsIntegrated.get (), value.get (), createSettingType);
-}
-
-INSTANTIATE_TEST_CASE_P (CCSGSettingsIntegratedSettingTestMismatchedValues, CCSGSettingsIntegratedSettingTest,
-			 Combine (Values (TypeInt, TypeString, TypeBool, TypeKey),
-				  ValuesIn (cciti::settingsInfo)));
 
=== removed directory 'compizconfig/integration/mate/include'
=== removed file 'compizconfig/integration/mate/include/ccs_mate_fwd.h'
--- compizconfig/integration/mate/include/ccs_mate_fwd.h	2015-02-04 22:20:18 +0000
+++ compizconfig/integration/mate/include/ccs_mate_fwd.h	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-#ifndef _CCS_MATE_INTEGRATION_FWD_H
-#define _CCS_MATE_INTEGRATION_FWD_H
-
-#include <ccs-defs.h>
-
-COMPIZCONFIG_BEGIN_DECLS
-
-typedef struct _CCSMATEIntegratedSettingInfo CCSMATEIntegratedSettingInfo;
-typedef struct _CCSMATEValueChangeData CCSMATEValueChangeData;
-
-COMPIZCONFIG_END_DECLS
-
-#endif
 
=== removed file 'compizconfig/integration/mate/include/ccs_mate_integrated_setting.h'
--- compizconfig/integration/mate/include/ccs_mate_integrated_setting.h	2015-02-04 22:20:18 +0000
+++ compizconfig/integration/mate/include/ccs_mate_integrated_setting.h	1970-01-01 00:00:00 +0000
@@ -1,64 +0,0 @@
-#ifndef _CCS_MATE_INTEGRATED_SETTING_H
-#define _CCS_MATE_INTEGRATED_SETTING_H
-
-#include <ccs-defs.h>
-#include <ccs-fwd.h>
-#include <ccs_mate_fwd.h>
-
-#include "ccs_mate_integration_types.h"
-
-COMPIZCONFIG_BEGIN_DECLS
-
-typedef struct _CCSMATEIntegratedSettingInfoInterface CCSMATEIntegratedSettingInfoInterface;
-
-typedef SpecialOptionType (*CCSMATEIntegratedSettingInfoGetSpecialOptionType) (CCSMATEIntegratedSettingInfo *);
-typedef const char * (*CCSMATEIntegratedSettingInfoGetMATEName) (CCSMATEIntegratedSettingInfo *);
-typedef void (*CCSMATEIntegratedSettingInfoFree) (CCSMATEIntegratedSettingInfo *);
-
-struct _CCSMATEIntegratedSettingInfoInterface
-{
-    CCSMATEIntegratedSettingInfoGetSpecialOptionType getSpecialOptionType;
-    CCSMATEIntegratedSettingInfoGetMATEName         getMATEName;
-    CCSMATEIntegratedSettingInfoFree                 free;
-};
-
-/**
- * @brief The _CCSMATEIntegratedSetting struct
- *
- * CCSMATEIntegratedSetting represents an integrated setting in
- * MATE - it builds upon CCSSharedIntegratedSetting (which it composes
- * and implements) and also adds the concept of an MATE side keyname
- * and option type for that keyname (as the types do not match 1-1)
- */
-struct _CCSMATEIntegratedSettingInfo
-{
-    CCSObject object;
-};
-
-unsigned int ccsCCSMATEIntegratedSettingInfoInterfaceGetType ();
-
-Bool
-ccsMATEIntegrationFindSettingsMatchingPredicate (CCSIntegratedSetting *setting,
-						  void		       *userData);
-
-SpecialOptionType
-ccsMATEIntegratedSettingInfoGetSpecialOptionType (CCSMATEIntegratedSettingInfo *);
-
-const char *
-ccsMATEIntegratedSettingInfoGetMATEName (CCSMATEIntegratedSettingInfo *);
-
-CCSMATEIntegratedSettingInfo *
-ccsMATEIntegratedSettingInfoNew (CCSIntegratedSettingInfo *base,
-				  SpecialOptionType    type,
-				  const char	   *mateName,
-				  CCSObjectAllocationInterface *ai);
-
-void
-ccsFreeMATEIntegratedSettingInfo (CCSMATEIntegratedSettingInfo *);
-
-CCSREF_HDR (MATEIntegratedSettingInfo, CCSMATEIntegratedSettingInfo);
-CCSLIST_HDR (MATEIntegratedSettingInfo, CCSMATEIntegratedSettingInfo);
-
-COMPIZCONFIG_END_DECLS
-
-#endif
 
=== removed file 'compizconfig/integration/mate/include/ccs_mate_integration.h'
--- compizconfig/integration/mate/include/ccs_mate_integration.h	2015-12-10 16:34:35 +0000
+++ compizconfig/integration/mate/include/ccs_mate_integration.h	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-#ifndef _CCS_COMPIZCONFIG_MATE_INTEGRATION
-#define _CCS_COMPIZCONFIG_MATE_INTEGRATION
-
-#include <ccs-defs.h>
-#include <ccs-fwd.h>
-#include <ccs_mate_fwd.h>
-#include "ccs_mate_integration_types.h"
-
-COMPIZCONFIG_BEGIN_DECLS
-
-struct _CCSMATEValueChangeData
-{
-    CCSIntegration *integration;
-    CCSIntegratedSettingsStorage *storage;
-    CCSIntegratedSettingFactory *factory;
-    CCSContext     *context;
-};
-
-/**
- * @brief ccsMATEIntegrationBackendNew
- * @param backend
- * @param context
- * @param factory
- * @param storage
- * @param ai
- * @return A new CCSIntegration
- *
- * The MATE implementation of desktop environment integration - requires
- * a method to create new integrated settings, and a method to store them
- * as well.
- *
- * CCSMATEIntegration is a pure composition in most respects - it just
- * represents the process as to which settings should be written to
- * what keys and vice versa, it doesn't represent how those keys should
- * be written.
- */
-CCSIntegration *
-ccsMATEIntegrationBackendNew (CCSBackend *backend,
-			       CCSContext *context,
-			       CCSIntegratedSettingFactory *factory,
-			       CCSIntegratedSettingsStorage *storage,
-			       CCSObjectAllocationInterface *ai);
-
-COMPIZCONFIG_END_DECLS
-
-#endif
 
=== removed file 'compizconfig/integration/mate/include/ccs_mate_integration_constants.h'
--- compizconfig/integration/mate/include/ccs_mate_integration_constants.h	2015-02-04 22:20:18 +0000
+++ compizconfig/integration/mate/include/ccs_mate_integration_constants.h	1970-01-01 00:00:00 +0000
@@ -1,217 +0,0 @@
-#ifndef _CCS_MATE_INTEGRATION_CONSTANTS_H
-#define _CCS_MATE_INTEGRATION_CONSTANTS_H
-
-#include <ccs-defs.h>
-#include <glib.h>
-
-COMPIZCONFIG_BEGIN_DECLS
-
-#include <ccs_mate_integration_types.h>
-
-#define METACITY "/apps/metacity"
-#define NUM_WATCHED_DIRS 3
-
-typedef struct _CCSSettingIntegratedSettingPair CCSSettingIntegratedSettingPair;
-struct _CCSSettingIntegratedSettingPair
-{
-    const char *compizName;
-    const char *mateName;
-};
-
-typedef struct _CCSMATEIntegratedSettingNames CCSMATEIntegratedSettingNames;
-struct _CCSMATEIntegratedSettingNames
-{
-    CCSSettingIntegratedSettingPair CORE_AUDIBLE_BELL;
-    CCSSettingIntegratedSettingPair CORE_CLICK_TO_FOCUS;
-    CCSSettingIntegratedSettingPair CORE_RAISE_ON_CLICK;
-    CCSSettingIntegratedSettingPair CORE_AUTORAISE_DELAY;
-    CCSSettingIntegratedSettingPair CORE_AUTORAISE;
-    CCSSettingIntegratedSettingPair THUMBNAIL_CURRENT_VIEWPORT;
-    CCSSettingIntegratedSettingPair MATECOMPAT_COMMAND_TERMINAL;
-    CCSSettingIntegratedSettingPair MATECOMPAT_COMMAND_WINDOW_SCREENSHOT;
-    CCSSettingIntegratedSettingPair MATECOMPAT_COMMAND_SCREENSHOT;
-    CCSSettingIntegratedSettingPair ROTATE_ROTATE_RIGHT_WINDOW_KEY;
-    CCSSettingIntegratedSettingPair ROTATE_ROTATE_LEFT_WINDOW_KEY;
-    CCSSettingIntegratedSettingPair ROTATE_ROTATE_TO_12_WINDOW_KEY;
-    CCSSettingIntegratedSettingPair ROTATE_ROTATE_TO_11_WINDOW_KEY;
-    CCSSettingIntegratedSettingPair ROTATE_ROTATE_TO_10_WINDOW_KEY;
-    CCSSettingIntegratedSettingPair ROTATE_ROTATE_TO_9_WINDOW_KEY;
-    CCSSettingIntegratedSettingPair ROTATE_ROTATE_TO_8_WINDOW_KEY;
-    CCSSettingIntegratedSettingPair ROTATE_ROTATE_TO_7_WINDOW_KEY;
-    CCSSettingIntegratedSettingPair ROTATE_ROTATE_TO_6_WINDOW_KEY;
-    CCSSettingIntegratedSettingPair ROTATE_ROTATE_TO_5_WINDOW_KEY;
-    CCSSettingIntegratedSettingPair ROTATE_ROTATE_TO_4_WINDOW_KEY;
-    CCSSettingIntegratedSettingPair ROTATE_ROTATE_TO_3_WINDOW_KEY;
-    CCSSettingIntegratedSettingPair ROTATE_ROTATE_TO_2_WINDOW_KEY;
-    CCSSettingIntegratedSettingPair ROTATE_ROTATE_TO_1_WINDOW_KEY;
-    CCSSettingIntegratedSettingPair PUT_PUT_BOTTOM_KEY;
-    CCSSettingIntegratedSettingPair PUT_PUT_TOP_KEY;
-    CCSSettingIntegratedSettingPair PUT_PUT_RIGHT_KEY;
-    CCSSettingIntegratedSettingPair PUT_PUT_LEFT_KEY;
-    CCSSettingIntegratedSettingPair PUT_PUT_BOTTOMRIGHT_KEY;
-    CCSSettingIntegratedSettingPair PUT_PUT_BOTTOMLEFT_KEY;
-    CCSSettingIntegratedSettingPair PUT_PUT_TOPRIGHT_KEY;
-    CCSSettingIntegratedSettingPair PUT_PUT_TOPLEFT_KEY;
-    CCSSettingIntegratedSettingPair WALL_DOWN_WINDOW_KEY;
-    CCSSettingIntegratedSettingPair WALL_UP_WINDOW_KEY;
-    CCSSettingIntegratedSettingPair WALL_RIGHT_WINDOW_KEY;
-    CCSSettingIntegratedSettingPair WALL_LEFT_WINDOW_KEY;
-    CCSSettingIntegratedSettingPair WALL_RIGHT_KEY;
-    CCSSettingIntegratedSettingPair WALL_LEFT_KEY;
-    CCSSettingIntegratedSettingPair WALL_DOWN_KEY;
-    CCSSettingIntegratedSettingPair WALL_UP_KEY;
-    CCSSettingIntegratedSettingPair VPSWITCH_SWITCH_TO_12_KEY;
-    CCSSettingIntegratedSettingPair VPSWITCH_SWITCH_TO_11_KEY;
-    CCSSettingIntegratedSettingPair VPSWITCH_SWITCH_TO_10_KEY;
-    CCSSettingIntegratedSettingPair VPSWITCH_SWITCH_TO_9_KEY;
-    CCSSettingIntegratedSettingPair VPSWITCH_SWITCH_TO_8_KEY;
-    CCSSettingIntegratedSettingPair VPSWITCH_SWITCH_TO_7_KEY;
-    CCSSettingIntegratedSettingPair VPSWITCH_SWITCH_TO_6_KEY;
-    CCSSettingIntegratedSettingPair VPSWITCH_SWITCH_TO_5_KEY;
-    CCSSettingIntegratedSettingPair VPSWITCH_SWITCH_TO_4_KEY;
-    CCSSettingIntegratedSettingPair VPSWITCH_SWITCH_TO_3_KEY;
-    CCSSettingIntegratedSettingPair VPSWITCH_SWITCH_TO_2_KEY;
-    CCSSettingIntegratedSettingPair VPSWITCH_SWITCH_TO_1_KEY;
-    CCSSettingIntegratedSettingPair ROTATE_ROTATE_RIGHT_KEY;
-    CCSSettingIntegratedSettingPair ROTATE_ROTATE_LEFT_KEY;
-    CCSSettingIntegratedSettingPair ROTATE_ROTATE_TO_12_KEY;
-    CCSSettingIntegratedSettingPair ROTATE_ROTATE_TO_11_KEY;
-    CCSSettingIntegratedSettingPair ROTATE_ROTATE_TO_10_KEY;
-    CCSSettingIntegratedSettingPair ROTATE_ROTATE_TO_9_KEY;
-    CCSSettingIntegratedSettingPair ROTATE_ROTATE_TO_8_KEY;
-    CCSSettingIntegratedSettingPair ROTATE_ROTATE_TO_7_KEY;
-    CCSSettingIntegratedSettingPair ROTATE_ROTATE_TO_6_KEY;
-    CCSSettingIntegratedSettingPair ROTATE_ROTATE_TO_5_KEY;
-    CCSSettingIntegratedSettingPair ROTATE_ROTATE_TO_4_KEY;
-    CCSSettingIntegratedSettingPair ROTATE_ROTATE_TO_3_KEY;
-    CCSSettingIntegratedSettingPair ROTATE_ROTATE_TO_2_KEY;
-    CCSSettingIntegratedSettingPair ROTATE_ROTATE_TO_1_KEY;
-    CCSSettingIntegratedSettingPair COMMANDS_RUN_COMMAND11_KEY;
-    CCSSettingIntegratedSettingPair COMMANDS_RUN_COMMAND10_KEY;
-    CCSSettingIntegratedSettingPair COMMANDS_RUN_COMMAND9_KEY;
-    CCSSettingIntegratedSettingPair COMMANDS_RUN_COMMAND8_KEY;
-    CCSSettingIntegratedSettingPair COMMANDS_RUN_COMMAND7_KEY;
-    CCSSettingIntegratedSettingPair COMMANDS_RUN_COMMAND6_KEY;
-    CCSSettingIntegratedSettingPair COMMANDS_RUN_COMMAND5_KEY;
-    CCSSettingIntegratedSettingPair COMMANDS_RUN_COMMAND4_KEY;
-    CCSSettingIntegratedSettingPair COMMANDS_RUN_COMMAND3_KEY;
-    CCSSettingIntegratedSettingPair COMMANDS_RUN_COMMAND2_KEY;
-    CCSSettingIntegratedSettingPair COMMANDS_RUN_COMMAND1_KEY;
-    CCSSettingIntegratedSettingPair COMMANDS_RUN_COMMAND0_KEY;
-    CCSSettingIntegratedSettingPair COMMANDS_COMMAND11;
-    CCSSettingIntegratedSettingPair COMMANDS_COMMAND10;
-    CCSSettingIntegratedSettingPair COMMANDS_COMMAND9;
-    CCSSettingIntegratedSettingPair COMMANDS_COMMAND8;
-    CCSSettingIntegratedSettingPair COMMANDS_COMMAND7;
-    CCSSettingIntegratedSettingPair COMMANDS_COMMAND6;
-    CCSSettingIntegratedSettingPair COMMANDS_COMMAND5;
-    CCSSettingIntegratedSettingPair COMMANDS_COMMAND4;
-    CCSSettingIntegratedSettingPair COMMANDS_COMMAND3;
-    CCSSettingIntegratedSettingPair COMMANDS_COMMAND2;
-    CCSSettingIntegratedSettingPair COMMANDS_COMMAND1;
-    CCSSettingIntegratedSettingPair COMMANDS_COMMAND0;
-    CCSSettingIntegratedSettingPair EXTRAWM_TOGGLE_FULLSCREEN_KEY;
-    CCSSettingIntegratedSettingPair EXTRAWM_TOGGLE_STICKY_KEY;
-    CCSSettingIntegratedSettingPair STATICSWITCHER_PREV_KEY;
-    CCSSettingIntegratedSettingPair STATICSWITCHER_NEXT_KEY;
-    CCSSettingIntegratedSettingPair FADE_FULLSCREEN_VISUAL_BELL;
-    CCSSettingIntegratedSettingPair FADE_VISUAL_BELL;
-    CCSSettingIntegratedSettingPair NULL_RESIZE_WITH_RIGHT_BUTTON;
-    CCSSettingIntegratedSettingPair NULL_MOUSE_BUTTON_MODIFIER;
-    CCSSettingIntegratedSettingPair CORE_WINDOW_MENU_BUTTON;
-    CCSSettingIntegratedSettingPair RESIZE_INITIATE_BUTTON;
-    CCSSettingIntegratedSettingPair MOVE_INITIATE_BUTTON;
-    CCSSettingIntegratedSettingPair CORE_WINDOW_MENU_KEY;
-    CCSSettingIntegratedSettingPair RESIZE_INITIATE_KEY;
-    CCSSettingIntegratedSettingPair MOVE_INITIATE_KEY;
-    CCSSettingIntegratedSettingPair CORE_SHOW_DESKTOP_KEY;
-    CCSSettingIntegratedSettingPair CORE_TOGGLE_WINDOW_SHADED_KEY;
-    CCSSettingIntegratedSettingPair CORE_CLOSE_WINDOW_KEY;
-    CCSSettingIntegratedSettingPair CORE_LOWER_WINDOW_KEY;
-    CCSSettingIntegratedSettingPair CORE_RAISE_WINDOW_KEY;
-    CCSSettingIntegratedSettingPair CORE_MAXIMIZE_WINDOW_VERTICALLY_KEY;
-    CCSSettingIntegratedSettingPair CORE_MAXIMIZE_WINDOW_HORIZONTALLY_KEY;
-    CCSSettingIntegratedSettingPair CORE_UNMAXIMIZE_OR_MINIMIZE_WINDOW_KEY;
-    CCSSettingIntegratedSettingPair CORE_MAXIMIZE_WINDOW_KEY;
-    CCSSettingIntegratedSettingPair CORE_MINIMIZE_WINDOW_KEY;
-    CCSSettingIntegratedSettingPair CORE_TOGGLE_WINDOW_MAXIMIZED_KEY;
-    CCSSettingIntegratedSettingPair MATECOMPAT_RUN_COMMAND_TERMINAL_KEY;
-    CCSSettingIntegratedSettingPair MATECOMPAT_RUN_COMMAND_WINDOW_SCREENSHOT_KEY;
-    CCSSettingIntegratedSettingPair MATECOMPAT_RUN_COMMAND_SCREENSHOT_KEY;
-    CCSSettingIntegratedSettingPair MATECOMPAT_MAIN_MENU_KEY;
-    CCSSettingIntegratedSettingPair MATECOMPAT_RUN_KEY;
-};
-
-extern const CCSMATEIntegratedSettingNames ccsMATEIntegratedSettingNames;
-
-typedef struct _CCSGConfIntegrationCategoires CCSGConfIntegrationCategories;
-
-struct _CCSGConfIntegrationCategoires
-{
-    const char *GENERAL;
-    const char *APPS;
-    const char *DESKTOP;
-    const char *KEYBINDING_COMMANDS;
-    const char *WINDOW_KEYBINDINGS;
-    const char *GLOBAL_KEYBINDINGS;
-};
-
-extern const CCSGConfIntegrationCategories ccsGConfIntegrationCategories;
-
-typedef struct _CCSMATEIntegratedPluginNames CCSMATEIntegratedPluginNames;
-
-struct _CCSMATEIntegratedPluginNames
-{
-    const char *CORE;
-    const char *THUMBNAIL;
-    const char *MATECOMPAT;
-    const char *ROTATE;
-    const char *PUT;
-    const char *WALL;
-    const char *VPSWITCH;
-    const char *COMMANDS;
-    const char *EXTRAWM;
-    const char *RESIZE;
-    const char *MOVE;
-    const char *STATICSWITCHER;
-    const char *FADE;
-    const char *SPECIAL;
-};
-
-extern const CCSMATEIntegratedPluginNames ccsMATEIntegratedPluginNames;
-
-extern const char* watchedGConfMateDirectories[];
-
-typedef struct _CCSGSettingsWrapperIntegratedSchemasQuarks
-{
-    GQuark ORG_MATE_DESKTOP_WM_PREFERENCES;
-    GQuark ORG_MATE_DESKTOP_WM_KEYBINDINGS;
-    GQuark ORG_MATE_SETTINGS_DAEMON_PLUGINS_MEDIA_KEYS;
-    GQuark ORG_MATE_DESKTOP_DEFAULT_APPLICATIONS_TERMINAL;
-    GQuark ORG_COMPIZ_INTEGRATED;
-} CCSGSettingsWrapperIntegratedSchemasQuarks;
-
-const CCSGSettingsWrapperIntegratedSchemasQuarks *ccsMATEGSettingsWrapperQuarks ();
-
-GHashTable * ccsMATEIntegrationPopulateCategoriesHashTables ();
-GHashTable * ccsMATEIntegrationPopulateSpecialTypesHashTables ();
-GHashTable * ccsMATEIntegrationPopulateSettingNameToMATENameHashTables ();
-GHashTable * ccsMATEGSettingsIntegrationPopulateSettingNameToIntegratedSchemasQuarksHashTable ();
-
-/* We only have to use the #define here because
- * C doesn't have a concept of "constants" setting
- * the array size ...
- */
-#define CCS_MATE_INTEGRATED_SETTINGS_LIST_SIZE 120
-
-typedef struct _CCSMATEIntegratedSettingsList
-{
-    const char *pluginName;
-    const char *settingName;
-} CCSMATEIntegratedSettingsList;
-
-const CCSMATEIntegratedSettingsList * ccsMATEIntegratedSettingsList ();
-
-COMPIZCONFIG_END_DECLS
-
-#endif
 
=== removed file 'compizconfig/integration/mate/include/ccs_mate_integration_types.h'
--- compizconfig/integration/mate/include/ccs_mate_integration_types.h	2015-02-04 22:20:18 +0000
+++ compizconfig/integration/mate/include/ccs_mate_integration_types.h	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-#ifndef _CCS_MATE_INTEGRATION_TYPES_H
-#define _CCS_MATE_INTEGRATION_TYPES_H
-
-#include <ccs-defs.h>
-
-COMPIZCONFIG_BEGIN_DECLS
-
-typedef enum {
-    OptionInt,
-    OptionBool,
-    OptionKey,
-    OptionString,
-    OptionSpecial,
-} SpecialOptionType;
-
-COMPIZCONFIG_END_DECLS
-
-#endif
-
 
=== removed directory 'compizconfig/integration/mate/src'
=== removed file 'compizconfig/integration/mate/src/ccs_mate_integrated_setting.c'
--- compizconfig/integration/mate/src/ccs_mate_integrated_setting.c	2015-02-04 22:20:18 +0000
+++ compizconfig/integration/mate/src/ccs_mate_integrated_setting.c	1970-01-01 00:00:00 +0000
@@ -1,161 +0,0 @@
-#include <stdlib.h>
-#include <string.h>
-
-#include <glib.h>
-
-#include <ccs.h>
-#include <ccs-backend.h>
-#include <ccs-object.h>
-
-#include "ccs_mate_integrated_setting.h"
-#include "ccs_mate_integration_constants.h"
-
-INTERFACE_TYPE (CCSMATEIntegratedSettingInfoInterface);
-
-CCSREF_OBJ (MATEIntegratedSettingInfo, CCSMATEIntegratedSettingInfo);
-
-SpecialOptionType
-ccsMATEIntegratedSettingInfoGetSpecialOptionType (CCSMATEIntegratedSettingInfo *info)
-{
-    return (*(GET_INTERFACE (CCSMATEIntegratedSettingInfoInterface, info))->getSpecialOptionType) (info);
-}
-
-const char *
-ccsMATEIntegratedSettingInfoGetMATEName (CCSMATEIntegratedSettingInfo *info)
-{
-    return (*(GET_INTERFACE (CCSMATEIntegratedSettingInfoInterface, info))->getMATEName) (info);
-}
-
-/* CCSMATEIntegratedSettingDefaultImpl implementation */
-
-typedef struct _CCSMATEIntegratedSettingInfoDefaultImplPrivate CCSMATEIntegratedSettingInfoDefaultImplPrivate;
-
-struct _CCSMATEIntegratedSettingInfoDefaultImplPrivate
-{
-    SpecialOptionType type;
-    const char	      *mateName;
-    CCSIntegratedSettingInfo *sharedIntegratedSettingInfo;
-};
-
-Bool
-ccsMATEIntegrationFindSettingsMatchingPredicate (CCSIntegratedSetting *setting,
-						  void		       *userData)
-{
-    const char *findMateName = (const char *) userData;
-    const char *mateNameOfSetting = ccsMATEIntegratedSettingInfoGetMATEName ((CCSMATEIntegratedSettingInfo *) setting);
-
-    if (strcmp (findMateName, mateNameOfSetting) == 0)
-	return TRUE;
-
-    return FALSE;
-}
-
-SpecialOptionType
-ccsMATEIntegratedSettingGetSpecialOptionDefault (CCSMATEIntegratedSettingInfo *info)
-{
-    CCSMATEIntegratedSettingInfoDefaultImplPrivate *priv = (CCSMATEIntegratedSettingInfoDefaultImplPrivate *) ccsObjectGetPrivate (info);
-
-    return priv->type;
-}
-
-const char *
-ccsMATEIntegratedSettingGetMATENameDefault (CCSMATEIntegratedSettingInfo *info)
-{
-    CCSMATEIntegratedSettingInfoDefaultImplPrivate *priv = (CCSMATEIntegratedSettingInfoDefaultImplPrivate *) ccsObjectGetPrivate (info);
-
-    return priv->mateName;
-}
-
-const char *
-ccsMATEIntegratedSettingInfoPluginName (CCSIntegratedSettingInfo *info)
-{
-    CCSMATEIntegratedSettingInfoDefaultImplPrivate *priv = (CCSMATEIntegratedSettingInfoDefaultImplPrivate *) ccsObjectGetPrivate (info);
-
-    return ccsIntegratedSettingInfoPluginName (priv->sharedIntegratedSettingInfo);
-}
-
-const char *
-ccsMATEIntegratedSettingInfoSettingName (CCSIntegratedSettingInfo *info)
-{
-    CCSMATEIntegratedSettingInfoDefaultImplPrivate *priv = (CCSMATEIntegratedSettingInfoDefaultImplPrivate *) ccsObjectGetPrivate (info);
-
-    return ccsIntegratedSettingInfoSettingName (priv->sharedIntegratedSettingInfo);
-}
-
-CCSSettingType
-ccsMATEIntegratedSettingInfoGetType (CCSIntegratedSettingInfo *info)
-{
-    CCSMATEIntegratedSettingInfoDefaultImplPrivate *priv = (CCSMATEIntegratedSettingInfoDefaultImplPrivate *) ccsObjectGetPrivate (info);
-
-    return ccsIntegratedSettingInfoGetType (priv->sharedIntegratedSettingInfo);
-}
-
-void
-ccsMATESharedIntegratedSettingInfoFree (CCSIntegratedSettingInfo *info)
-{
-    CCSMATEIntegratedSettingInfoDefaultImplPrivate *priv = (CCSMATEIntegratedSettingInfoDefaultImplPrivate *) ccsObjectGetPrivate (info);
-
-    ccsIntegratedSettingInfoUnref (priv->sharedIntegratedSettingInfo);
-    ccsObjectFinalize (info);
-
-    (*info->object.object_allocation->free_) (info->object.object_allocation->allocator, info);
-}
-
-static void
-ccsMATEIntegratedSettingInfoFree (CCSMATEIntegratedSettingInfo *info)
-{
-    ccsMATESharedIntegratedSettingInfoFree ((CCSIntegratedSettingInfo *) info);
-}
-
-CCSMATEIntegratedSettingInfoInterface ccsMATEIntegratedSettingInfoDefaultImplInterface =
-{
-    ccsMATEIntegratedSettingGetSpecialOptionDefault,
-    ccsMATEIntegratedSettingGetMATENameDefault,
-    ccsMATEIntegratedSettingInfoFree
-};
-
-const CCSIntegratedSettingInfoInterface ccsMATEIntegratedSettingInfoInterface =
-{
-    ccsMATEIntegratedSettingInfoPluginName,
-    ccsMATEIntegratedSettingInfoSettingName,
-    ccsMATEIntegratedSettingInfoGetType,
-    ccsMATESharedIntegratedSettingInfoFree
-};
-
-void
-ccsFreeMATEIntegratedSettingInfo (CCSMATEIntegratedSettingInfo *info)
-{
-    (*(GET_INTERFACE (CCSMATEIntegratedSettingInfoInterface, info))->free) (info);
-}
-
-CCSMATEIntegratedSettingInfo *
-ccsMATEIntegratedSettingInfoNew (CCSIntegratedSettingInfo *base,
-				  SpecialOptionType    type,
-				  const char	   *mateName,
-				  CCSObjectAllocationInterface *ai)
-{
-    CCSMATEIntegratedSettingInfo *info = (*ai->calloc_) (ai->allocator, 1, sizeof (CCSMATEIntegratedSettingInfo));
-
-    if (!info)
-	return NULL;
-
-    CCSMATEIntegratedSettingInfoDefaultImplPrivate *priv = (*ai->calloc_) (ai->allocator, 1, sizeof (CCSMATEIntegratedSettingInfoDefaultImplPrivate));
-
-    if (!priv)
-    {
-	(*ai->free_) (ai->allocator, info);
-	return NULL;
-    }
-
-    priv->sharedIntegratedSettingInfo = base;
-    priv->mateName = mateName;
-    priv->type = type;
-
-    ccsObjectInit (info, ai);
-    ccsObjectSetPrivate (info, (CCSPrivate *) priv);
-    ccsObjectAddInterface (info, (const CCSInterface *) &ccsMATEIntegratedSettingInfoInterface, GET_INTERFACE_TYPE (CCSIntegratedSettingInfoInterface));
-    ccsObjectAddInterface (info, (const CCSInterface *) &ccsMATEIntegratedSettingInfoDefaultImplInterface, GET_INTERFACE_TYPE (CCSMATEIntegratedSettingInfoInterface));
-    ccsIntegratedSettingInfoRef ((CCSIntegratedSettingInfo *) info);
-
-    return info;
-}
 
=== removed file 'compizconfig/integration/mate/src/ccs_mate_integration.c'
--- compizconfig/integration/mate/src/ccs_mate_integration.c	2015-02-04 22:20:18 +0000
+++ compizconfig/integration/mate/src/ccs_mate_integration.c	1970-01-01 00:00:00 +0000
@@ -1,815 +0,0 @@
-/**
- *
- * compizconfig mate integration backend
- *
- * mate-integration.c
- *
- * Copyright (c) 2011 Canonical Ltd
- *
- * Based on the original compizconfig-backend-gconf
- *
- * Copyright (c) 2007 Danny Baumann <[e-mail]>
- *
- * Parts of this code are taken from libberylsettings 
- * gconf backend, written by:
- *
- * Copyright (c) 2006 Robert Carr <[e-mail]>
- * Copyright (c) 2007 Dennis Kasprzyk <[e-mail]>
- *
- * 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 <stdlib.h>
-#include <string.h>
-#include <ccs.h>
-#include <ccs-backend.h>
-#include <ccs-object.h>
-#include <gio/gio.h>
-#include "ccs_mate_integration.h"
-#include "ccs_mate_integration_constants.h"
-#include "ccs_mate_integrated_setting.h"
-
-typedef struct _CCSMATEIntegrationBackendPrivate CCMATEIntegrationBackendPrivate;
-
-struct _CCSMATEIntegrationBackendPrivate
-{
-    CCSBackend *backend;
-    CCSContext *context;
-    CCSIntegratedSettingFactory  *factory;
-    CCSIntegratedSettingsStorage *storage;
-    Bool       noWrites;
-};
-
-static CCSSetting *
-findDisplaySettingForPlugin (CCSContext *context,
-			     const char *plugin,
-			     const char *setting)
-{
-    CCSPlugin  *p;
-    CCSSetting *s;
-
-    p = ccsFindPlugin (context, plugin);
-    if (!p)
-	return NULL;
-
-    s = ccsFindSetting (p, setting);
-    if (!s)
-	return NULL;
-
-    return s;
-}
-
-static void
-unregisterAllIntegratedOptions (CCSIntegration *integration)
-{
-    CCMATEIntegrationBackendPrivate *priv = (CCMATEIntegrationBackendPrivate *) ccsObjectGetPrivate (integration);
-
-    if (priv->storage)
-	ccsIntegratedSettingsStorageUnref (priv->storage);
-
-    if (priv->factory)
-	ccsIntegratedSettingFactoryUnref (priv->factory);
-
-    priv->storage = NULL;
-    priv->factory = NULL;
-}
-
-static void
-registerAllIntegratedOptions (CCSIntegration *integration)
-{
-    CCMATEIntegrationBackendPrivate *priv = (CCMATEIntegrationBackendPrivate *) ccsObjectGetPrivate (integration);
-
-    unsigned int i = 0;
-    const CCSMATEIntegratedSettingsList *array = ccsMATEIntegratedSettingsList ();
-
-    for (; i < CCS_MATE_INTEGRATED_SETTINGS_LIST_SIZE; ++i)
-    {
-	CCSIntegratedSetting *setting = ccsIntegratedSettingFactoryCreateIntegratedSettingForCCSSettingNameAndType (priv->factory,
-														    integration,
-														    array[i].pluginName,
-														    array[i].settingName,
-														    TypeInt);
-
-	ccsIntegratedSettingsStorageAddSetting (priv->storage, setting);
-    }
-}
-
-static CCSIntegratedSetting *
-ccsMATEIntegrationBackendGetIntegratedSetting (CCSIntegration *integration,
-						const char		  *pluginName,
-						const char		  *settingName)
-{
-    CCMATEIntegrationBackendPrivate *priv = (CCMATEIntegrationBackendPrivate *) ccsObjectGetPrivate (integration);
-
-    if (ccsIntegratedSettingsStorageEmpty (priv->storage))
-	registerAllIntegratedOptions (integration);
-
-    CCSIntegratedSettingList integratedSettings = ccsIntegratedSettingsStorageFindMatchingSettingsByPluginAndSettingName (priv->storage,
-															  pluginName,
-															  settingName);
-
-    if (integratedSettings)
-    {
-	/* At the moment, we only support the first setting out of
-	 * the list. Assert the returned size is one */
-	g_assert (ccsIntegratedSettingListLength (integratedSettings) == 1);
-
-	CCSIntegratedSetting *integratedSetting = integratedSettings->data;
-	ccsIntegratedSettingListFree (integratedSettings, FALSE);
-
-	return integratedSetting;
-    }
-
-    return NULL;
-}
-
-static unsigned int
-getMateMouseButtonModifier (CCSIntegratedSetting *mouseButtonModifierSetting)
-{
-    unsigned int modMask = 0;
-    CCSSettingType type = TypeString;
-    CCSSettingValue *v = ccsIntegratedSettingReadValue (mouseButtonModifierSetting, type);
-
-    if (v)
-    {
-	modMask = ccsStringToModifiers (v->value.asString);
-
-	ccsFreeSettingValueWithType (v, type);
-    }
-
-    return modMask;
-}
-
-static unsigned int
-getButtonBindingForSetting (CCSContext   *context,
-			    const char   *plugin,
-			    const char   *setting)
-{
-    CCSSetting *s;
-
-    s = findDisplaySettingForPlugin (context, plugin, setting);
-    if (!s)
-	return 0;
-
-    if (ccsSettingGetType (s) != TypeButton)
-	return 0;
-
-    return ccsSettingGetValue (s)->value.asButton.button;
-}
-
-static Bool
-ccsMATEIntegrationBackendReadISAndSetSettingForType (CCSIntegratedSetting *integratedSetting,
-						      CCSSetting           *setting,
-						      CCSSettingValue      **v,
-						      CCSSettingType       sourceType,
-						      CCSSettingType       destinationType)
-{
-    *v = ccsIntegratedSettingReadValue (integratedSetting, sourceType);
-
-    if (*v != NULL && (*v)->value.asString)
-    {
-	/* Conversion to key type option necessary */
-	if (destinationType == TypeKey)
-	{
-	    CCSSettingKeyValue key;
-
-	    memset (&key, 0, sizeof (CCSSettingKeyValue));
-	    if (ccsStringToKeyBinding ((*v)->value.asString, &key))
-	    {
-		/* Since we effectively change the type of the value here
-		* we need to free the old string value */
-		free ((*v)->value.asString);
-		ccsSetKey (setting, key, TRUE);
-	        return TRUE;
-	    }
-	    else
-	    {
-		/* We were not successful at converting strings to keybindings
-		 * but we must free the string value anyways as we present
-		 * this value to ccsSettingValueFreeWithType as a TypeKey
-		 * intentionally made empty */
-		free ((*v)->value.asString);
-		return FALSE;
-	    }
-	}
-	return TRUE;
-    }
-
-    return FALSE;
-}
-
-static Bool
-ccsMATEIntegrationBackendReadOptionIntoSetting (CCSIntegration *integration,
-						 CCSContext	       *context,
-						 CCSSetting	       *setting,
-						 CCSIntegratedSetting   *integratedSetting)
-{
-    Bool       ret = FALSE;
-    CCSSettingValue *v = NULL;
-    CCSSettingType  type = TypeNum;
-
-    CCMATEIntegrationBackendPrivate *priv = (CCMATEIntegrationBackendPrivate *) ccsObjectGetPrivate (integration);
-    
-    if (ccsIntegratedSettingsStorageEmpty (priv->storage))
-	registerAllIntegratedOptions (integration);
-
-    if (!ccsSettingIsReadableByBackend (setting))
-	return FALSE;
-
-    switch (ccsMATEIntegratedSettingInfoGetSpecialOptionType ((CCSMATEIntegratedSettingInfo *) integratedSetting)) {
-    case OptionInt:
-	{
-	    type = TypeInt;
-	    v = ccsIntegratedSettingReadValue (integratedSetting, type);
-	    if (!v)
-		break;
-	    ccsSetInt (setting, v->value.asInt, TRUE);
-	    ret = TRUE;
-	}
-	break;
-    case OptionBool:
-	{
-	    type = TypeBool;
-	    v = ccsIntegratedSettingReadValue (integratedSetting, type);
-	    if (!v)
-		break;
-	    ccsSetBool (setting, v->value.asBool, TRUE);
-	    ret = TRUE;
-	}
-	break;
-    case OptionString:
-	{
-	    type = TypeString;
-	    v = ccsIntegratedSettingReadValue (integratedSetting, type);
-	    if (!v)
-		break;
-	    char *str = v->value.asString;
-
-	    ccsSetString (setting, str, TRUE);
-	    ret = TRUE;
-	}
-	break;
-    case OptionKey:
-	{
-	    /* Some backends store keys differently so we need to let the backend know
-	     * that we really intend to read a key and let it handle the conversion */
-	    type = TypeKey;
-	    if (ccsMATEIntegrationBackendReadISAndSetSettingForType (integratedSetting,
-								      setting,
-								      &v,
-								      TypeKey,
-								      type))
-		ret = TRUE;
-	}
-	break;
-    case OptionSpecial:
-	{
-	    const char *settingName = ccsSettingGetName (setting);
-	    const char *pluginName  = ccsPluginGetName (ccsSettingGetParent (setting));
-
-	    if (strcmp (settingName, "current_viewport") == 0)
-	    {
-		type = TypeBool;
-		v = ccsIntegratedSettingReadValue (integratedSetting, type);
-
-		if (!v)
-		    break;
-
-		Bool showAll = v->value.asBool;
-		ccsSetBool (setting, !showAll, TRUE);
-		ret = TRUE;
-	    }
-	    else if (strcmp (settingName, "fullscreen_visual_bell") == 0)
-	    {
-		type = TypeString;
-		v = ccsIntegratedSettingReadValue (integratedSetting, type);
-		if (!v)
-		    break;
-
-		const char *value = v->value.asString;
-		if (value)
-		{
-		    Bool fullscreen;
-
-		    fullscreen = strcmp (value, "fullscreen") == 0;
-		    ccsSetBool (setting, fullscreen, TRUE);
-		    ret = TRUE;
-		}
-	    }
-	    else if (strcmp (settingName, "click_to_focus") == 0)
-	    {
-		type = TypeString;
-		v = ccsIntegratedSettingReadValue (integratedSetting, type);
-		if (!v)
-		    break;
-
-		const char *focusMode = v->value.asString;
-
-		if (focusMode)
-		{
-		    Bool clickToFocus = (strcmp (focusMode, "click") == 0);
-		    ccsSetBool (setting, clickToFocus, TRUE);
-		    ret = TRUE;
-		}
-	    }
-	    else if ((strcmp (settingName, "run_command_screenshot_key") == 0 ||
-		      strcmp (settingName, "run_command_window_screenshot_key") == 0 ||
-		      strcmp (settingName, "run_command_terminal_key") == 0))
-	    {
-		/* These are always stored as strings, no matter what the backend is
-		 * so the source type should be string */
-		type = TypeKey;
-		if (ccsMATEIntegrationBackendReadISAndSetSettingForType (integratedSetting,
-									  setting,
-									  &v,
-									  TypeString,
-									  type))
-		    ret = TRUE;
-	    }
-	    else if (((strcmp (settingName, "initiate_button") == 0) &&
-		      ((strcmp (pluginName, "move") == 0) ||
-		       (strcmp (pluginName, "resize") == 0))) ||
-		      ((strcmp (settingName, "window_menu_button") == 0) &&
-		       (strcmp (pluginName, "core") == 0)))
-	    {
-		gboolean              resizeWithRightButton;
-		CCSSettingButtonValue button;
-
-		memset (&button, 0, sizeof (CCSSettingButtonValue));
-		ccsGetButton (setting, &button);
-
-		CCSIntegratedSettingList mouseModifierSetting =
-		    ccsIntegratedSettingsStorageFindMatchingSettingsByPluginAndSettingName (priv->storage,
-											    ccsMATEIntegratedPluginNames.SPECIAL,
-											    ccsMATEIntegratedSettingNames.NULL_MOUSE_BUTTON_MODIFIER.compizName);
-
-		button.buttonModMask = getMateMouseButtonModifier (mouseModifierSetting->data);
-
-		CCSIntegratedSettingList resizeButtonSetting =
-		    ccsIntegratedSettingsStorageFindMatchingSettingsByPluginAndSettingName (priv->storage,
-											    ccsMATEIntegratedPluginNames.SPECIAL,
-											    ccsMATEIntegratedSettingNames.NULL_RESIZE_WITH_RIGHT_BUTTON.compizName);
-
-		type = TypeBool;
-		v = ccsIntegratedSettingReadValue (resizeButtonSetting->data, type);
-
-		resizeWithRightButton =
-		   v->value.asBool;
-
-		if (strcmp (settingName, "window_menu_button") == 0)
-		    button.button = resizeWithRightButton ? 2 : 3;
-		else if (strcmp (pluginName, "resize") == 0)
-		    button.button = resizeWithRightButton ? 3 : 2;
-		else
-		    button.button = 1;
-
-		ccsSetButton (setting, button, TRUE);
-		ret = TRUE;
-
-		/* Free the returned lists */
-		ccsIntegratedSettingListFree (mouseModifierSetting, FALSE);
-		ccsIntegratedSettingListFree (resizeButtonSetting, FALSE);
-	    }
-
-	}
-     	break;
-    default:
-	break;
-    }
-
-    if (v)
-	ccsFreeSettingValueWithType (v, type);
-
-    return ret;
-}
-
-static Bool
-setMateMouseButtonModifier (CCSIntegratedSetting *setting,
-			     unsigned int modMask)
-{
-    char   *modifiers;
-    CCSSettingValue *v = calloc (1, sizeof (CCSSettingValue));
-
-    v->isListChild = FALSE;
-    v->parent = NULL;
-    v->refCount = 1;
-
-    modifiers = ccsModifiersToString (modMask);
-    if (!modifiers)
-    {
-	ccsFreeSettingValueWithType (v, TypeString);
-	return FALSE;
-    }
-
-    v->value.asString = modifiers;
-    ccsIntegratedSettingWriteValue (setting, v, TypeString);
-
-    ccsFreeSettingValueWithType (v, TypeString);
-
-    return TRUE;
-}
-
-static void
-setButtonBindingForSetting (CCSContext   *context,
-			    const char   *plugin,
-			    const char   *setting,
-			    unsigned int button,
-			    unsigned int buttonModMask)
-{
-    CCSSetting            *s;
-
-    s = findDisplaySettingForPlugin (context, plugin, setting);
-    if (!s)
-	return;
-
-    if (ccsSettingGetType (s) != TypeButton)
-	return;
-
-    CCSSettingButtonValue value = ccsSettingGetValue (s)->value.asButton;
-
-    if ((value.button != button) || (value.buttonModMask != buttonModMask))
-    {
-	value.button = button;
-	value.buttonModMask = buttonModMask;
-
-	ccsSetButton (s, value, TRUE);
-    }
-}
-
-static Bool
-ccsMATEIntegrationBackendKeyValueToStringValue (CCSSettingValue *keyValue,
-						 CCSSettingValue *stringValue)
-{
-    char  *newValue;
-
-    newValue = ccsKeyBindingToString (&keyValue->value.asKey);
-    if (newValue)
-    {
-	if (strcmp (newValue, "Disabled") == 0)
-	{
-	    /* Metacity doesn't like "Disabled", it wants "disabled" */
-	    newValue[0] = 'd';
-	}
-
-	stringValue->value.asString = newValue;
-
-	return TRUE;
-    }
-
-    return FALSE;
-}
-
-static void
-ccsMATEIntegrationBackendWriteOptionFromSetting (CCSIntegration *integration,
-						  CCSContext		 *context,
-						  CCSSetting		 *setting,
-						  CCSIntegratedSetting   *integratedSetting)
-{
-    GError     *err = NULL;
-    CCSSettingType type = TypeNum;
-
-    CCMATEIntegrationBackendPrivate *priv = (CCMATEIntegrationBackendPrivate *) ccsObjectGetPrivate (integration);
-
-    if (ccsIntegratedSettingsStorageEmpty (priv->storage))
-	registerAllIntegratedOptions (integration);
-
-    if (priv->noWrites)
-	return;
-
-    /* Do not allow recursing back into writeIntegratedSetting */
-    ccsIntegrationDisallowIntegratedWrites (integration);
-
-    CCSSettingType sType = ccsSettingGetType (setting);
-    CCSSettingInfo *sInfo = ccsSettingGetInfo (setting);
-
-    CCSSettingValue *vSetting = ccsSettingGetValue (setting);
-    CCSSettingValue *v = ccsCopyValue (vSetting, sType, sInfo);
-
-    if (!v)
-	return;
-
-    switch (ccsMATEIntegratedSettingInfoGetSpecialOptionType ((CCSMATEIntegratedSettingInfo *) integratedSetting))
-    {
-    case OptionInt:
-	ccsIntegratedSettingWriteValue (integratedSetting, v, TypeInt);
-	break;
-    case OptionBool:
-	ccsIntegratedSettingWriteValue (integratedSetting, v, TypeBool);
-	break;
-    case OptionString:
-	ccsIntegratedSettingWriteValue (integratedSetting, v, TypeString);
-	break;
-    case OptionKey:
-	{   
-	    CCSSettingValue *newValue = calloc (1, sizeof (CCSSettingValue));
-
-	    newValue->isListChild = FALSE;
-	    newValue->parent = NULL;
-	    newValue->refCount = 1;
-
-	    if (ccsMATEIntegrationBackendKeyValueToStringValue (v, newValue))
-	    {
-		/* Really this is a lie - the writer expects a string
-		 * but it needs to know if its a key or a string */
-		type = TypeKey;
-		ccsIntegratedSettingWriteValue (integratedSetting, newValue, type);
-	    }
-
-	    if (newValue)
-		ccsFreeSettingValueWithType (newValue, TypeString);
-	}
-	break;
-    case OptionSpecial:
-	{
-	    const char *settingName = ccsSettingGetName (setting);
-	    const char *pluginName  = ccsPluginGetName (ccsSettingGetParent (setting));
-	    CCSSettingValue *newValue = calloc (1, sizeof (CCSSettingValue));
-
-	    newValue->isListChild = FALSE;
-	    newValue->parent = NULL;
-	    newValue->refCount = 1;
-
-	    if (strcmp (settingName, "current_viewport") == 0)
-	    {
-		newValue->value.asBool = !v->value.asBool;
-		type = TypeBool;
-
-		ccsIntegratedSettingWriteValue (integratedSetting, newValue, type);
-	    }
-	    else if (strcmp (settingName, "fullscreen_visual_bell") == 0)
-	    {
-		const char *newValueString = v->value.asBool ? "fullscreen" : "frame_flash";
-		newValue->value.asString = strdup (newValueString);
-		type = TypeString;
-
-		ccsIntegratedSettingWriteValue (integratedSetting, newValue, type);
-	    }
-	    else if (strcmp (settingName, "click_to_focus") == 0)
-	    {
-		const char *newValueString = v->value.asBool ? "click" : "sloppy";
-		newValue->value.asString = strdup (newValueString);
-		type = TypeString;
-
-		ccsIntegratedSettingWriteValue (integratedSetting, newValue, type);
-	    }
-	    else if ((strcmp (settingName, "run_command_screenshot_key") == 0 ||
-		      strcmp (settingName, "run_command_window_screenshot_key") == 0 ||
-		      strcmp (settingName, "run_command_terminal_key") == 0))
-	    {
-		if (ccsMATEIntegrationBackendKeyValueToStringValue (v, newValue))
-		{
-		    /* These are actually stored as strings in the schemas */
-		    type = TypeString;
-		    ccsIntegratedSettingWriteValue (integratedSetting, newValue, type);
-		}
-
-	    }
-	    else if (((strcmp (settingName, "initiate_button") == 0) &&
-		      ((strcmp (pluginName, "move") == 0) ||
-		       (strcmp (pluginName, "resize") == 0))) ||
-		      ((strcmp (settingName, "window_menu_button") == 0) &&
-		       (strcmp (pluginName, "core") == 0)))
-	    {
-		unsigned int modMask;
-		Bool         resizeWithRightButton = FALSE;
-
-		if ((getButtonBindingForSetting (priv->context, "resize",
-						 "initiate_button") == 3) ||
-		    (getButtonBindingForSetting (priv->context, "core",
-						 "window_menu_button") == 2))
-		{
-		     resizeWithRightButton = TRUE;
-		}
-
-		CCSIntegratedSettingList resizeButtonSetting =
-		    ccsIntegratedSettingsStorageFindMatchingSettingsByPluginAndSettingName (priv->storage,
-											    ccsMATEIntegratedPluginNames.SPECIAL,
-											    ccsMATEIntegratedSettingNames.NULL_RESIZE_WITH_RIGHT_BUTTON.compizName);
-
-		newValue->value.asBool = resizeWithRightButton;
-		type = TypeBool;
-
-		ccsIntegratedSettingWriteValue (resizeButtonSetting->data, newValue, type);
-
-		CCSIntegratedSettingList mouseModifierSetting =
-		    ccsIntegratedSettingsStorageFindMatchingSettingsByPluginAndSettingName (priv->storage,
-											    ccsMATEIntegratedPluginNames.SPECIAL,
-											    ccsMATEIntegratedSettingNames.NULL_MOUSE_BUTTON_MODIFIER.compizName);
-
-		modMask = v->value.asButton.buttonModMask;
-		if (setMateMouseButtonModifier (mouseModifierSetting->data, modMask))
-		{
-		    setButtonBindingForSetting (priv->context, "move",
-						"initiate_button", 1, modMask);
-		    setButtonBindingForSetting (priv->context, "resize",
-						"initiate_button", 
-						resizeWithRightButton ? 3 : 2,
-						modMask);
-		    setButtonBindingForSetting (priv->context, "core",
-						"window_menu_button",
-						resizeWithRightButton ? 2 : 3,
-						modMask);
-		}
-
-		/* We own the returned lists, so free them */
-		ccsIntegratedSettingListFree (resizeButtonSetting, FALSE);
-		ccsIntegratedSettingListFree (mouseModifierSetting, FALSE);
-	    }
-
-	    if (newValue)
-		ccsFreeSettingValueWithType (newValue, type);
-	}
-     	break;
-    }
-
-    if (err)
-    {
-	ccsError ("%s", err->message);
-	g_error_free (err);
-    }
-
-    if (v)
-	ccsFreeSettingValueWithType (v, sType);
-
-    /* we should immediately write changed settings */
-    ccsWriteChangedSettings (priv->context);
-    ccsIntegrationAllowIntegratedWrites (integration);
-}
-
-static void
-ccsMATEIntegrationBackendUpdateIntegratedSettings (CCSIntegration *integration,
-						    CCSContext	 *context,
-						    CCSIntegratedSettingList integratedSettings)
-{
-    CCMATEIntegrationBackendPrivate *priv = (CCMATEIntegrationBackendPrivate *) ccsObjectGetPrivate (integration);
-    Bool needInit = TRUE;
-
-    CCSIntegratedSettingList iter = integratedSettings;
-
-    while (iter)
-    {
-	CCSIntegratedSetting *integrated = iter->data;
-	const char           *settingName = ccsIntegratedSettingInfoSettingName ((CCSIntegratedSettingInfo *)integrated);
-	const char	     *pluginName = ccsIntegratedSettingInfoPluginName ((CCSIntegratedSettingInfo *) integrated);
-
-	/* Special case for mouse button modifier etc */
-	if ((strcmp (settingName,
-		     "mouse_button_modifier") == 0) ||
-	    (strcmp (settingName,
-		    "resize_with_right_button") == 0))
-	{
-	    CCSSetting *s;
-
-	    if (needInit)
-	    {
-		ccsBackendReadInit (priv->backend, priv->context);
-		needInit = FALSE;
-	    }
-
-	    s = findDisplaySettingForPlugin (priv->context, "core",
-					     "window_menu_button");
-	    if (s)
-		ccsBackendReadSetting (priv->backend, priv->context, s);
-
-	    s = findDisplaySettingForPlugin (priv->context, "move",
-					     "initiate_button");
-	    if (s)
-		ccsBackendReadSetting (priv->backend, priv->context, s);
-
-	    s = findDisplaySettingForPlugin (priv->context, "resize",
-					     "initiate_button");
-	    if (s)
-		ccsBackendReadSetting (priv->backend, priv->context, s);
-	}
-	else
-	{
-	    CCSPlugin     *plugin = NULL;
-
-	    plugin = ccsFindPlugin (priv->context, pluginName);
-	    if (plugin)
-	    {
-		CCSSetting    *setting;
-		setting = ccsFindSetting (plugin, settingName);
-
-		if (setting)
-		{
-		    if (needInit)
-		    {
-			ccsBackendReadInit (priv->backend, priv->context);
-			needInit = FALSE;
-		    }
-
-		    ccsBackendReadSetting (priv->backend, priv->context, setting);
-		}
-	    }
-	}
-
-	iter = iter->next;
-    }
-}
-
-static void
-ccsMATEIntegrationDisallowIntegratedWrites (CCSIntegration *integration)
-{
-    CCMATEIntegrationBackendPrivate *priv = (CCMATEIntegrationBackendPrivate *) ccsObjectGetPrivate (integration);
-    priv->noWrites = TRUE;
-}
-
-static void
-ccsMATEIntegrationAllowIntegratedWrites (CCSIntegration *integration)
-{
-    CCMATEIntegrationBackendPrivate *priv = (CCMATEIntegrationBackendPrivate *) ccsObjectGetPrivate (integration);
-    priv->noWrites = FALSE;
-}
-
-static void
-ccsMATEIntegrationBackendFree (CCSIntegration *integration)
-{
-    CCMATEIntegrationBackendPrivate *priv = (CCMATEIntegrationBackendPrivate *) ccsObjectGetPrivate (integration);
-
-    unregisterAllIntegratedOptions (integration);
-
-    priv->backend = NULL;
-
-    ccsObjectFinalize (integration);
-    free (integration);
-}
-
-const CCSIntegrationInterface ccsMATEIntegrationBackendInterface =
-{
-    ccsMATEIntegrationBackendGetIntegratedSetting,
-    ccsMATEIntegrationBackendReadOptionIntoSetting,
-    ccsMATEIntegrationBackendWriteOptionFromSetting,
-    ccsMATEIntegrationBackendUpdateIntegratedSettings,
-    ccsMATEIntegrationDisallowIntegratedWrites,
-    ccsMATEIntegrationAllowIntegratedWrites,
-    ccsMATEIntegrationBackendFree
-};
-
-static CCMATEIntegrationBackendPrivate *
-addPrivate (CCSIntegration *backend,
-	    CCSObjectAllocationInterface *ai)
-{
-    CCMATEIntegrationBackendPrivate *priv = (*ai->calloc_) (ai->allocator, 1, sizeof (CCMATEIntegrationBackendPrivate));
-
-    if (!priv)
-    {
-	ccsObjectFinalize (backend);
-	free (backend);
-    }
-
-    ccsObjectSetPrivate (backend, (CCSPrivate *) priv);
-
-    return priv;
-}
-
-static CCSIntegration *
-ccsMATEIntegrationBackendNewCommon (CCSBackend *backend,
-				     CCSContext *context,
-				     CCSIntegratedSettingFactory *factory,
-				     CCSIntegratedSettingsStorage *storage,
-				     CCSObjectAllocationInterface *ai)
-{
-    CCSIntegration *integration = (*ai->calloc_) (ai->allocator, 1, sizeof (CCSIntegration));
-
-    if (!integration)
-	return NULL;
-
-    ccsObjectInit (integration, ai);
-
-    CCMATEIntegrationBackendPrivate *priv = addPrivate (integration, ai);
-    priv->backend = backend;
-    priv->context = context;
-    priv->factory = factory;
-    priv->storage = storage;
-    priv->noWrites = FALSE;
-
-    ccsObjectAddInterface (integration,
-			   (const CCSInterface *) &ccsMATEIntegrationBackendInterface,
-			   GET_INTERFACE_TYPE (CCSIntegrationInterface));
-
-    ccsIntegrationRef (integration);
-
-    return integration;
-}
-
-CCSIntegration *
-ccsMATEIntegrationBackendNew (CCSBackend *backend,
-			       CCSContext *context,
-			       CCSIntegratedSettingFactory *factory,
-			       CCSIntegratedSettingsStorage *storage,
-			       CCSObjectAllocationInterface *ai)
-{
-    return ccsMATEIntegrationBackendNewCommon (backend, context, factory, storage, ai);
-}
 
=== removed file 'compizconfig/integration/mate/src/ccs_mate_integration_constants.c'
--- compizconfig/integration/mate/src/ccs_mate_integration_constants.c	2015-02-04 22:20:18 +0000
+++ compizconfig/integration/mate/src/ccs_mate_integration_constants.c	1970-01-01 00:00:00 +0000
@@ -1,1099 +0,0 @@
-#include <glib.h>
-#include "ccs_mate_integration_constants.h"
-
-const char * watchedGConfMateDirectories[] = {
-    METACITY,
-    "/desktop/mate/applications/terminal",
-    "/apps/panel/applets/window_list/prefs"
-};
-
-const CCSMATEIntegratedSettingNames ccsMATEIntegratedSettingNames =
-{
-    { "audible_bell", "audible_bell" },
-    { "click_to_focus", "focus_mode" },
-    { "raise_on_click", "raise_on_click" },
-    { "autoraise_delay", "auto_raise_delay" },
-    { "autoraise", "auto_raise" },
-    { "current_viewport", "display_all_workspaces" },
-    { "command_terminal", "exec" },
-    { "command_window_screenshot", "command_window_screenshot" },
-    { "command_screenshot", "command_screenshot" },
-    { "rotate_right_window_key", "move_to_workspace_right" },
-    { "rotate_left_window_key", "move_to_workspace_left" },
-    { "rotate_to_12_window_key", "move_to_workspace_12" },
-    { "rotate_to_11_window_key", "move_to_workspace_11" },
-    { "rotate_to_10_window_key", "move_to_workspace_10" },
-    { "rotate_to_9_window_key", "move_to_workspace_9" },
-    { "rotate_to_8_window_key", "move_to_workspace_8" },
-    { "rotate_to_7_window_key", "move_to_workspace_7" },
-    { "rotate_to_6_window_key", "move_to_workspace_6" },
-    { "rotate_to_5_window_key", "move_to_workspace_5" },
-    { "rotate_to_4_window_key", "move_to_workspace_4" },
-    { "rotate_to_3_window_key", "move_to_workspace_3" },
-    { "rotate_to_2_window_key", "move_to_workspace_2" },
-    { "rotate_to_1_window_key", "move_to_workspace_1" },
-    { "put_bottom_key", "move_to_side_s" },
-    { "put_top_key", "move_to_side_n" },
-    { "put_right_key", "move_to_side_e" },
-    { "put_left_key", "move_to_side_w" },
-    { "put_bottomright_key", "move_to_corner_se" },
-    { "put_bottomleft_key", "move_to_corner_sw" },
-    { "put_topright_key", "move_to_corner_ne" },
-    { "put_topleft_key", "move_to_corner_nw" },
-    { "down_window_key", "move_to_workspace_down" },
-    { "up_window_key", "move_to_workspace_up" },
-    { "right_window_key", "move_to_workspace_right" },
-    { "left_window_key", "move_to_workspace_left" },
-    { "right_key", "switch_to_workspace_right" },
-    { "left_key", "switch_to_workspace_left" },
-    { "down_key", "switch_to_workspace_down" },
-    { "up_key", "switch_to_workspace_up" },
-    { "switch_to_12_key", "switch_to_workspace_12" },
-    { "switch_to_11_key", "switch_to_workspace_11" },
-    { "switch_to_10_key", "switch_to_workspace_10" },
-    { "switch_to_9_key", "switch_to_workspace_9" },
-    { "switch_to_8_key", "switch_to_workspace_8" },
-    { "switch_to_7_key", "switch_to_workspace_7" },
-    { "switch_to_6_key", "switch_to_workspace_6" },
-    { "switch_to_5_key", "switch_to_workspace_5" },
-    { "switch_to_4_key", "switch_to_workspace_4" },
-    { "switch_to_3_key", "switch_to_workspace_3" },
-    { "switch_to_2_key", "switch_to_workspace_2" },
-    { "switch_to_1_key", "switch_to_workspace_1" },
-    { "rotate_right_key", "switch_to_workspace_right" },
-    { "rotate_left_key", "switch_to_workspace_left" },
-    { "rotate_to_12_key", "switch_to_workspace_12" },
-    { "rotate_to_11_key", "switch_to_workspace_11" },
-    { "rotate_to_10_key", "switch_to_workspace_10" },
-    { "rotate_to_9_key", "switch_to_workspace_9" },
-    { "rotate_to_8_key", "switch_to_workspace_8" },
-    { "rotate_to_7_key", "switch_to_workspace_7" },
-    { "rotate_to_6_key", "switch_to_workspace_6" },
-    { "rotate_to_5_key", "switch_to_workspace_5" },
-    { "rotate_to_4_key", "switch_to_workspace_4" },
-    { "rotate_to_3_key", "switch_to_workspace_3" },
-    { "rotate_to_2_key", "switch_to_workspace_2" },
-    { "rotate_to_1_key", "switch_to_workspace_1" },
-    { "run_command11_key", "run_command_12" },
-    { "run_command10_key", "run_command_11" },
-    { "run_command9_key", "run_command_10" },
-    { "run_command8_key", "run_command_9" },
-    { "run_command7_key", "run_command_8" },
-    { "run_command6_key", "run_command_7" },
-    { "run_command5_key", "run_command_6" },
-    { "run_command4_key", "run_command_5" },
-    { "run_command3_key", "run_command_4" },
-    { "run_command2_key", "run_command_3" },
-    { "run_command1_key", "run_command_2" },
-    { "run_command0_key", "run_command_1" },
-    { "command11", "command_12" },
-    { "command10", "command_11" },
-    { "command9", "command_10" },
-    { "command8", "command_9" },
-    { "command7", "command_8" },
-    { "command6", "command_7" },
-    { "command5", "command_6" },
-    { "command4", "command_5" },
-    { "command3", "command_4" },
-    { "command2", "command_3" },
-    { "command1", "command_2" },
-    { "command0", "command_1" },
-    { "toggle_fullscreen_key", "toggle_fullscreen" },
-    { "toggle_sticky_key", "toggle_on_all_workspaces" },
-    { "prev_key", "switch_windows_backward" },
-    { "next_key", "switch_windows" },
-    { "fullscreen_visual_bell", "visual_bell_type" },
-    { "visual_bell", "visual_bell" },
-    { "resize_with_right_button", "resize_with_right_button" },
-    { "mouse_button_modifier", "mouse_button_modifier" },
-    { "window_menu_button", "activate_window_menu" },
-    { "initiate_button", "begin_resize" },
-    { "initiate_button", "begin_move" },
-    { "window_menu_key", "activate_window_menu" },
-    { "initiate_key", "begin_resize" },
-    { "initiate_key", "begin_move" },
-    { "show_desktop_key", "show_desktop" },
-    { "toggle_window_shaded_key", "toggle_shaded" },
-    { "close_window_key", "close" },
-    { "lower_window_key", "lower" },
-    { "raise_window_key", "raise" },
-    { "maximize_window_vertically_key", "maximize_vertically" },
-    { "maximize_window_horizontally_key", "maximize_horizontally" },
-    { "unmaximize_or_minimize_window_key", "unmaximize" },
-    { "maximize_window_key", "maximize" },
-    { "minimize_window_key", "minimize" },
-    { "toggle_window_maximized_key", "toggle_maximized" },
-    { "run_command_terminal_key", "run_command_terminal" },
-    { "run_command_window_screenshot_key", "run_command_window_screenshot" },
-    { "run_command_screenshot_key", "run_command_screenshot" },
-    { "main_menu_key", "panel_main_menu" },
-    { "run_key", "panel_run_dialog" }
-};
-
-const CCSGConfIntegrationCategories ccsGConfIntegrationCategories =
-{
-    METACITY "/general/",
-    "/apps/panel/applets/window_list/prefs/",
-    "/desktop/mate/applications/terminal/",
-    METACITY "/keybinding_commands/",
-    METACITY "/window_keybindings/",
-    METACITY "/global_keybindings/"
-};
-
-const CCSMATEIntegratedPluginNames ccsMATEIntegratedPluginNames =
-{
-    "core",
-    "thumbnail",
-    "matecompat",
-    "rotate",
-    "put",
-    "wall",
-    "vpswitch",
-    "commands",
-    "extrawm",
-    "resize",
-    "move",
-    "staticswitcher",
-    "fade",
-    "__special"
-};
-
-static gpointer
-ccsMATEIntegrationInitializeIntegratedSettingsList (gpointer data)
-{
-    CCSMATEIntegratedSettingsList *array = (CCSMATEIntegratedSettingsList *) data;
-    const CCSMATEIntegratedPluginNames  *plugins = &ccsMATEIntegratedPluginNames;
-    const CCSMATEIntegratedSettingNames *settings = &ccsMATEIntegratedSettingNames;
-
-    array[0].pluginName = plugins->CORE;
-    array[0].settingName = settings->CORE_AUDIBLE_BELL.compizName;
-    array[1].pluginName = plugins->CORE;
-    array[1].settingName = settings->CORE_CLICK_TO_FOCUS.compizName;
-    array[2].pluginName = plugins->CORE;
-    array[2].settingName = settings->CORE_RAISE_ON_CLICK.compizName;
-    array[3].pluginName = plugins->CORE;
-    array[3].settingName = settings->CORE_AUTORAISE_DELAY.compizName;
-    array[4].pluginName = plugins->CORE;
-    array[4].settingName = settings->CORE_AUTORAISE.compizName;
-    array[5].pluginName = plugins->THUMBNAIL;
-    array[5].settingName = settings->THUMBNAIL_CURRENT_VIEWPORT.compizName;
-    array[6].pluginName = plugins->MATECOMPAT;
-    array[6].settingName = settings->MATECOMPAT_COMMAND_TERMINAL.compizName;
-    array[7].pluginName = plugins->MATECOMPAT;
-    array[7].settingName = settings->MATECOMPAT_COMMAND_WINDOW_SCREENSHOT.compizName;
-    array[8].pluginName = plugins->MATECOMPAT;
-    array[8].settingName = settings->MATECOMPAT_COMMAND_SCREENSHOT.compizName;
-    array[9].pluginName = plugins->ROTATE;
-    array[9].settingName = settings->ROTATE_ROTATE_RIGHT_WINDOW_KEY.compizName;
-    array[10].pluginName = plugins->ROTATE;
-    array[10].settingName = settings->ROTATE_ROTATE_LEFT_WINDOW_KEY.compizName;
-    array[11].pluginName = plugins->ROTATE;
-    array[11].settingName = settings->ROTATE_ROTATE_TO_12_WINDOW_KEY.compizName;
-    array[12].pluginName = plugins->ROTATE;
-    array[12].settingName = settings->ROTATE_ROTATE_TO_11_WINDOW_KEY.compizName;
-    array[13].pluginName = plugins->ROTATE;
-    array[13].settingName = settings->ROTATE_ROTATE_TO_10_WINDOW_KEY.compizName;
-    array[14].pluginName = plugins->ROTATE;
-    array[14].settingName = settings->ROTATE_ROTATE_TO_9_WINDOW_KEY.compizName;
-    array[15].pluginName = plugins->ROTATE;
-    array[15].settingName = settings->ROTATE_ROTATE_TO_8_WINDOW_KEY.compizName;
-    array[16].pluginName = plugins->ROTATE;
-    array[16].settingName = settings->ROTATE_ROTATE_TO_7_WINDOW_KEY.compizName;
-    array[17].pluginName = plugins->ROTATE;
-    array[17].settingName = settings->ROTATE_ROTATE_TO_6_WINDOW_KEY.compizName;
-    array[18].pluginName = plugins->ROTATE;
-    array[18].settingName = settings->ROTATE_ROTATE_TO_5_WINDOW_KEY.compizName;
-    array[19].pluginName = plugins->ROTATE;
-    array[19].settingName = settings->ROTATE_ROTATE_TO_4_WINDOW_KEY.compizName;
-    array[20].pluginName = plugins->ROTATE;
-    array[20].settingName = settings->ROTATE_ROTATE_TO_3_WINDOW_KEY.compizName;
-    array[21].pluginName = plugins->ROTATE;
-    array[21].settingName = settings->ROTATE_ROTATE_TO_2_WINDOW_KEY.compizName;
-    array[22].pluginName = plugins->ROTATE;
-    array[22].settingName = settings->ROTATE_ROTATE_TO_1_WINDOW_KEY.compizName;
-    array[23].pluginName = plugins->PUT;
-    array[23].settingName = settings->PUT_PUT_BOTTOM_KEY.compizName;
-    array[24].pluginName = plugins->PUT;
-    array[24].settingName = settings->PUT_PUT_TOP_KEY.compizName;
-    array[25].pluginName = plugins->PUT;
-    array[25].settingName = settings->PUT_PUT_RIGHT_KEY.compizName;
-    array[26].pluginName = plugins->PUT;
-    array[26].settingName = settings->PUT_PUT_LEFT_KEY.compizName;
-    array[27].pluginName = plugins->PUT;
-    array[27].settingName = settings->PUT_PUT_BOTTOMRIGHT_KEY.compizName;
-    array[28].pluginName = plugins->PUT;
-    array[28].settingName = settings->PUT_PUT_BOTTOMLEFT_KEY.compizName;
-    array[29].pluginName = plugins->PUT;
-    array[29].settingName = settings->PUT_PUT_TOPRIGHT_KEY.compizName;
-    array[30].pluginName = plugins->PUT;
-    array[30].settingName = settings->PUT_PUT_TOPLEFT_KEY.compizName;
-    array[31].pluginName = plugins->WALL;
-    array[31].settingName = settings->WALL_DOWN_WINDOW_KEY.compizName;
-    array[32].pluginName = plugins->WALL;
-    array[32].settingName = settings->WALL_UP_WINDOW_KEY.compizName;
-    array[33].pluginName = plugins->WALL;
-    array[33].settingName = settings->WALL_RIGHT_WINDOW_KEY.compizName;
-    array[34].pluginName = plugins->WALL;
-    array[34].settingName = settings->WALL_LEFT_WINDOW_KEY.compizName;
-    array[35].pluginName = plugins->WALL;
-    array[35].settingName = settings->WALL_RIGHT_KEY.compizName;
-    array[36].pluginName = plugins->WALL;
-    array[36].settingName = settings->WALL_LEFT_KEY.compizName;
-    array[37].pluginName = plugins->WALL;
-    array[37].settingName = settings->WALL_DOWN_KEY.compizName;
-    array[38].pluginName = plugins->WALL;
-    array[38].settingName = settings->WALL_UP_KEY.compizName;
-    array[39].pluginName = plugins->VPSWITCH;
-    array[39].settingName = settings->VPSWITCH_SWITCH_TO_12_KEY.compizName;
-    array[40].pluginName = plugins->VPSWITCH;
-    array[40].settingName = settings->VPSWITCH_SWITCH_TO_11_KEY.compizName;
-    array[41].pluginName = plugins->VPSWITCH;
-    array[41].settingName = settings->VPSWITCH_SWITCH_TO_10_KEY.compizName;
-    array[42].pluginName = plugins->VPSWITCH;
-    array[42].settingName = settings->VPSWITCH_SWITCH_TO_9_KEY.compizName;
-    array[43].pluginName = plugins->VPSWITCH;
-    array[43].settingName = settings->VPSWITCH_SWITCH_TO_8_KEY.compizName;
-    array[44].pluginName = plugins->VPSWITCH;
-    array[44].settingName = settings->VPSWITCH_SWITCH_TO_7_KEY.compizName;
-    array[45].pluginName = plugins->VPSWITCH;
-    array[45].settingName = settings->VPSWITCH_SWITCH_TO_6_KEY.compizName;
-    array[46].pluginName = plugins->VPSWITCH;
-    array[46].settingName = settings->VPSWITCH_SWITCH_TO_5_KEY.compizName;
-    array[47].pluginName = plugins->VPSWITCH;
-    array[47].settingName = settings->VPSWITCH_SWITCH_TO_4_KEY.compizName;
-    array[48].pluginName = plugins->VPSWITCH;
-    array[48].settingName = settings->VPSWITCH_SWITCH_TO_3_KEY.compizName;
-    array[49].pluginName = plugins->VPSWITCH;
-    array[49].settingName = settings->VPSWITCH_SWITCH_TO_2_KEY.compizName;
-    array[50].pluginName = plugins->VPSWITCH;
-    array[50].settingName = settings->VPSWITCH_SWITCH_TO_1_KEY.compizName;
-    array[51].pluginName = plugins->ROTATE;
-    array[51].settingName = settings->ROTATE_ROTATE_RIGHT_KEY.compizName;
-    array[52].pluginName = plugins->ROTATE;
-    array[52].settingName = settings->ROTATE_ROTATE_LEFT_KEY.compizName;
-    array[53].pluginName = plugins->ROTATE;
-    array[53].settingName = settings->ROTATE_ROTATE_TO_12_KEY.compizName;
-    array[54].pluginName = plugins->ROTATE;
-    array[54].settingName = settings->ROTATE_ROTATE_TO_11_KEY.compizName;
-    array[55].pluginName = plugins->ROTATE;
-    array[55].settingName = settings->ROTATE_ROTATE_TO_10_KEY.compizName;
-    array[56].pluginName = plugins->ROTATE;
-    array[56].settingName = settings->ROTATE_ROTATE_TO_9_KEY.compizName;
-    array[57].pluginName = plugins->ROTATE;
-    array[57].settingName = settings->ROTATE_ROTATE_TO_8_KEY.compizName;
-    array[58].pluginName = plugins->ROTATE;
-    array[58].settingName = settings->ROTATE_ROTATE_TO_7_KEY.compizName;
-    array[59].pluginName = plugins->ROTATE;
-    array[59].settingName = settings->ROTATE_ROTATE_TO_6_KEY.compizName;
-    array[60].pluginName = plugins->ROTATE;
-    array[60].settingName = settings->ROTATE_ROTATE_TO_5_KEY.compizName;
-    array[61].pluginName = plugins->ROTATE;
-    array[61].settingName = settings->ROTATE_ROTATE_TO_4_KEY.compizName;
-    array[62].pluginName = plugins->ROTATE;
-    array[62].settingName = settings->ROTATE_ROTATE_TO_3_KEY.compizName;
-    array[63].pluginName = plugins->ROTATE;
-    array[63].settingName = settings->ROTATE_ROTATE_TO_2_KEY.compizName;
-    array[64].pluginName = plugins->ROTATE;
-    array[64].settingName = settings->ROTATE_ROTATE_TO_1_KEY.compizName;
-    array[65].pluginName = plugins->COMMANDS;
-    array[65].settingName = settings->COMMANDS_RUN_COMMAND11_KEY.compizName;
-    array[66].pluginName = plugins->COMMANDS;
-    array[66].settingName = settings->COMMANDS_RUN_COMMAND10_KEY.compizName;
-    array[67].pluginName = plugins->COMMANDS;
-    array[67].settingName = settings->COMMANDS_RUN_COMMAND9_KEY.compizName;
-    array[68].pluginName = plugins->COMMANDS;
-    array[68].settingName = settings->COMMANDS_RUN_COMMAND8_KEY.compizName;
-    array[69].pluginName = plugins->COMMANDS;
-    array[69].settingName = settings->COMMANDS_RUN_COMMAND7_KEY.compizName;
-    array[70].pluginName = plugins->COMMANDS;
-    array[70].settingName = settings->COMMANDS_RUN_COMMAND6_KEY.compizName;
-    array[71].pluginName = plugins->COMMANDS;
-    array[71].settingName = settings->COMMANDS_RUN_COMMAND5_KEY.compizName;
-    array[72].pluginName = plugins->COMMANDS;
-    array[72].settingName = settings->COMMANDS_RUN_COMMAND4_KEY.compizName;
-    array[73].pluginName = plugins->COMMANDS;
-    array[73].settingName = settings->COMMANDS_RUN_COMMAND3_KEY.compizName;
-    array[74].pluginName = plugins->COMMANDS;
-    array[74].settingName = settings->COMMANDS_RUN_COMMAND2_KEY.compizName;
-    array[75].pluginName = plugins->COMMANDS;
-    array[75].settingName = settings->COMMANDS_RUN_COMMAND1_KEY.compizName;
-    array[76].pluginName = plugins->COMMANDS;
-    array[76].settingName = settings->COMMANDS_RUN_COMMAND0_KEY.compizName;
-    array[77].pluginName = plugins->COMMANDS;
-    array[77].settingName = settings->COMMANDS_COMMAND11.compizName;
-    array[78].pluginName = plugins->COMMANDS;
-    array[78].settingName = settings->COMMANDS_COMMAND10.compizName;
-    array[79].pluginName = plugins->COMMANDS;
-    array[79].settingName = settings->COMMANDS_COMMAND9.compizName;
-    array[80].pluginName = plugins->COMMANDS;
-    array[80].settingName = settings->COMMANDS_COMMAND8.compizName;
-    array[81].pluginName = plugins->COMMANDS;
-    array[81].settingName = settings->COMMANDS_COMMAND7.compizName;
-    array[82].pluginName = plugins->COMMANDS;
-    array[82].settingName = settings->COMMANDS_COMMAND6.compizName;
-    array[83].pluginName = plugins->COMMANDS;
-    array[83].settingName = settings->COMMANDS_COMMAND5.compizName;
-    array[84].pluginName = plugins->COMMANDS;
-    array[84].settingName = settings->COMMANDS_COMMAND4.compizName;
-    array[85].pluginName = plugins->COMMANDS;
-    array[85].settingName = settings->COMMANDS_COMMAND3.compizName;
-    array[86].pluginName = plugins->COMMANDS;
-    array[86].settingName = settings->COMMANDS_COMMAND2.compizName;
-    array[87].pluginName = plugins->COMMANDS;
-    array[87].settingName = settings->COMMANDS_COMMAND1.compizName;
-    array[88].pluginName = plugins->COMMANDS;
-    array[88].settingName = settings->COMMANDS_COMMAND0.compizName;
-    array[89].pluginName = plugins->EXTRAWM;
-    array[89].settingName = settings->EXTRAWM_TOGGLE_FULLSCREEN_KEY.compizName;
-    array[90].pluginName = plugins->EXTRAWM;
-    array[90].settingName = settings->EXTRAWM_TOGGLE_STICKY_KEY.compizName;
-    array[91].pluginName = plugins->STATICSWITCHER;
-    array[91].settingName = settings->STATICSWITCHER_PREV_KEY.compizName;
-    array[92].pluginName = plugins->STATICSWITCHER;
-    array[92].settingName = settings->STATICSWITCHER_NEXT_KEY.compizName;
-    array[93].pluginName = plugins->FADE;
-    array[93].settingName = settings->FADE_FULLSCREEN_VISUAL_BELL.compizName;
-    array[94].pluginName = plugins->FADE;
-    array[94].settingName = settings->FADE_VISUAL_BELL.compizName;
-    array[95].pluginName = plugins->SPECIAL;
-    array[95].settingName = settings->NULL_RESIZE_WITH_RIGHT_BUTTON.compizName;
-    array[96].pluginName = plugins->SPECIAL;
-    array[96].settingName = settings->NULL_MOUSE_BUTTON_MODIFIER.compizName;
-    array[97].pluginName = plugins->CORE;
-    array[97].settingName = settings->CORE_WINDOW_MENU_BUTTON.compizName;
-    array[98].pluginName = plugins->RESIZE;
-    array[98].settingName = settings->RESIZE_INITIATE_BUTTON.compizName;
-    array[99].pluginName = plugins->MOVE;
-    array[99].settingName = settings->MOVE_INITIATE_BUTTON.compizName;
-    array[100].pluginName = plugins->CORE;
-    array[100].settingName = settings->CORE_WINDOW_MENU_KEY.compizName;
-    array[101].pluginName = plugins->RESIZE;
-    array[101].settingName = settings->RESIZE_INITIATE_KEY.compizName;
-    array[102].pluginName = plugins->MOVE;
-    array[102].settingName = settings->MOVE_INITIATE_KEY.compizName;
-    array[103].pluginName = plugins->CORE;
-    array[103].settingName = settings->CORE_SHOW_DESKTOP_KEY.compizName;
-    array[104].pluginName = plugins->CORE;
-    array[104].settingName = settings->CORE_TOGGLE_WINDOW_SHADED_KEY.compizName;
-    array[105].pluginName = plugins->CORE;
-    array[105].settingName = settings->CORE_CLOSE_WINDOW_KEY.compizName;
-    array[106].pluginName = plugins->CORE;
-    array[106].settingName = settings->CORE_LOWER_WINDOW_KEY.compizName;
-    array[107].pluginName = plugins->CORE;
-    array[107].settingName = settings->CORE_RAISE_WINDOW_KEY.compizName;
-    array[108].pluginName = plugins->CORE;
-    array[108].settingName = settings->CORE_MAXIMIZE_WINDOW_VERTICALLY_KEY.compizName;
-    array[109].pluginName = plugins->CORE;
-    array[109].settingName = settings->CORE_MAXIMIZE_WINDOW_HORIZONTALLY_KEY.compizName;
-    array[110].pluginName = plugins->CORE;
-    array[110].settingName = settings->CORE_UNMAXIMIZE_OR_MINIMIZE_WINDOW_KEY.compizName;
-    array[111].pluginName = plugins->CORE;
-    array[111].settingName = settings->CORE_MAXIMIZE_WINDOW_KEY.compizName;
-    array[112].pluginName = plugins->CORE;
-    array[112].settingName = settings->CORE_MINIMIZE_WINDOW_KEY.compizName;
-    array[113].pluginName = plugins->CORE;
-    array[113].settingName = settings->CORE_TOGGLE_WINDOW_MAXIMIZED_KEY.compizName;
-    array[114].pluginName = plugins->MATECOMPAT;
-    array[114].settingName = settings->MATECOMPAT_RUN_COMMAND_TERMINAL_KEY.compizName;
-    array[115].pluginName = plugins->MATECOMPAT;
-    array[115].settingName = settings->MATECOMPAT_RUN_COMMAND_WINDOW_SCREENSHOT_KEY.compizName;
-    array[116].pluginName = plugins->MATECOMPAT;
-    array[116].settingName = settings->MATECOMPAT_RUN_COMMAND_SCREENSHOT_KEY.compizName;
-    array[117].pluginName = plugins->MATECOMPAT;
-    array[117].settingName = settings->MATECOMPAT_MAIN_MENU_KEY.compizName;
-    array[118].pluginName = plugins->MATECOMPAT;
-    array[118].settingName = settings->MATECOMPAT_RUN_KEY.compizName;
-
-
-    return NULL;
-}
-
-const CCSMATEIntegratedSettingsList *
-ccsMATEIntegratedSettingsList ()
-{
-    static GOnce initIntegratedSettings = G_ONCE_INIT;
-    static CCSMATEIntegratedSettingsList settings[CCS_MATE_INTEGRATED_SETTINGS_LIST_SIZE];
-
-    g_once (&initIntegratedSettings, ccsMATEIntegrationInitializeIntegratedSettingsList, (gpointer) settings);
-
-    return settings;
-}
-
-gpointer
-ccsMATEGSettingsIntegrationInitializeIntegratedSchemasQuarks (gpointer data)
-{
-    CCSGSettingsWrapperIntegratedSchemasQuarks *quarks = (CCSGSettingsWrapperIntegratedSchemasQuarks *) data;
-
-    static const char *org_compiz_integrated = "org.compiz.integrated";
-    static const char *org_mate_desktop_wm_keybindings = "org.mate.Marco.global-keybindings";
-    static const char *org_mate_desktop_wm_preferences = "org.mate.Marco.general";
-    static const char *org_mate_settings_daemon_plugins_media_keys = "org.mate.SettingsDaemon.plugins.media-keys";
-    static const char *org_mate_desktop_default_applications_terminal = "org.mate.applications-terminal";
-
-    quarks->ORG_COMPIZ_INTEGRATED = g_quark_from_string (org_compiz_integrated);
-    quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS = g_quark_from_string (org_mate_desktop_wm_keybindings);
-    quarks->ORG_MATE_DESKTOP_WM_PREFERENCES = g_quark_from_string (org_mate_desktop_wm_preferences);
-    quarks->ORG_MATE_SETTINGS_DAEMON_PLUGINS_MEDIA_KEYS = g_quark_from_string (org_mate_settings_daemon_plugins_media_keys);
-    quarks->ORG_MATE_DESKTOP_DEFAULT_APPLICATIONS_TERMINAL = g_quark_from_string (org_mate_desktop_default_applications_terminal);
-
-    return NULL;
-}
-
-const CCSGSettingsWrapperIntegratedSchemasQuarks *
-ccsMATEGSettingsWrapperQuarks ()
-{
-    static GOnce initIntegratedSchemaQuarks = G_ONCE_INIT;
-    static CCSGSettingsWrapperIntegratedSchemasQuarks quarks;
-
-    g_once (&initIntegratedSchemaQuarks, ccsMATEGSettingsIntegrationInitializeIntegratedSchemasQuarks, (gpointer) &quarks);
-
-    return &quarks;
-}
-
-static void destroyHashTableInternal (void *ht)
-{
-    g_hash_table_unref ((GHashTable *) ht);
-}
-
-GHashTable *
-ccsMATEGSettingsIntegrationPopulateSettingNameToIntegratedSchemasQuarksHashTable ()
-{
-    GHashTable *masterHashTable = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, destroyHashTableInternal);
-    GHashTable *coreHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *thumbnailHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *matecompatHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *rotateHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *putHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *wallHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *vpswitchHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *commandsHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *extrawmHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *resizeHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *moveHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *staticswitcherHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *fadeHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *specialHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-
-    const CCSMATEIntegratedSettingNames *names = &ccsMATEIntegratedSettingNames;
-    const CCSMATEIntegratedPluginNames  *plugins = &ccsMATEIntegratedPluginNames;
-    const CCSGSettingsWrapperIntegratedSchemasQuarks *quarks = ccsMATEGSettingsWrapperQuarks ();
-
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->CORE, coreHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->THUMBNAIL, thumbnailHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->MATECOMPAT, matecompatHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->ROTATE, rotateHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->PUT, putHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->WALL, wallHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->VPSWITCH, vpswitchHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->COMMANDS, commandsHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->EXTRAWM, extrawmHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->STATICSWITCHER, staticswitcherHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->FADE, fadeHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->RESIZE, resizeHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->MOVE, moveHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->SPECIAL, specialHashTable);
-
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_AUDIBLE_BELL.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_PREFERENCES));
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_CLICK_TO_FOCUS.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_PREFERENCES));
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_RAISE_ON_CLICK.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_PREFERENCES));
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_AUTORAISE_DELAY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_PREFERENCES));
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_AUTORAISE.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_PREFERENCES));
-    g_hash_table_insert (thumbnailHashTable, (gpointer) names->THUMBNAIL_CURRENT_VIEWPORT.compizName, GINT_TO_POINTER (quarks->ORG_COMPIZ_INTEGRATED));
-    g_hash_table_insert (matecompatHashTable, (gpointer) names->MATECOMPAT_COMMAND_TERMINAL.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_DEFAULT_APPLICATIONS_TERMINAL));
-    g_hash_table_insert (matecompatHashTable, (gpointer) names->MATECOMPAT_COMMAND_WINDOW_SCREENSHOT.compizName, GINT_TO_POINTER (quarks->ORG_COMPIZ_INTEGRATED));
-    g_hash_table_insert (matecompatHashTable, (gpointer) names->MATECOMPAT_COMMAND_SCREENSHOT.compizName, GINT_TO_POINTER (quarks->ORG_COMPIZ_INTEGRATED));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_RIGHT_WINDOW_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_LEFT_WINDOW_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_12_WINDOW_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_11_WINDOW_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_10_WINDOW_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_9_WINDOW_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_8_WINDOW_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_7_WINDOW_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_6_WINDOW_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_5_WINDOW_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_4_WINDOW_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_3_WINDOW_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_2_WINDOW_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_1_WINDOW_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (putHashTable, (gpointer) names->PUT_PUT_BOTTOM_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (putHashTable, (gpointer) names->PUT_PUT_TOP_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (putHashTable, (gpointer) names->PUT_PUT_RIGHT_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (putHashTable, (gpointer) names->PUT_PUT_LEFT_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (putHashTable, (gpointer) names->PUT_PUT_BOTTOMRIGHT_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (putHashTable, (gpointer) names->PUT_PUT_BOTTOMLEFT_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (putHashTable, (gpointer) names->PUT_PUT_TOPRIGHT_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (putHashTable, (gpointer) names->PUT_PUT_TOPLEFT_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (wallHashTable, (gpointer) names->WALL_DOWN_WINDOW_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (wallHashTable, (gpointer) names->WALL_UP_WINDOW_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (wallHashTable, (gpointer) names->WALL_RIGHT_WINDOW_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (wallHashTable, (gpointer) names->WALL_LEFT_WINDOW_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (wallHashTable, (gpointer) names->WALL_RIGHT_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (wallHashTable, (gpointer) names->WALL_LEFT_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (wallHashTable, (gpointer) names->WALL_DOWN_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (wallHashTable, (gpointer) names->WALL_UP_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_12_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_11_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_10_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_9_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_8_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_7_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_6_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_5_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_4_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_3_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_2_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_1_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_RIGHT_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_LEFT_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_12_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_11_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_10_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_9_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_8_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_7_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_6_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_5_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_4_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_3_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_2_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_1_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND11_KEY.compizName, GINT_TO_POINTER (quarks->ORG_COMPIZ_INTEGRATED));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND10_KEY.compizName, GINT_TO_POINTER (quarks->ORG_COMPIZ_INTEGRATED));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND9_KEY.compizName, GINT_TO_POINTER (quarks->ORG_COMPIZ_INTEGRATED));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND8_KEY.compizName, GINT_TO_POINTER (quarks->ORG_COMPIZ_INTEGRATED));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND7_KEY.compizName, GINT_TO_POINTER (quarks->ORG_COMPIZ_INTEGRATED));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND6_KEY.compizName, GINT_TO_POINTER (quarks->ORG_COMPIZ_INTEGRATED));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND5_KEY.compizName, GINT_TO_POINTER (quarks->ORG_COMPIZ_INTEGRATED));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND4_KEY.compizName, GINT_TO_POINTER (quarks->ORG_COMPIZ_INTEGRATED));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND3_KEY.compizName, GINT_TO_POINTER (quarks->ORG_COMPIZ_INTEGRATED));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND2_KEY.compizName, GINT_TO_POINTER (quarks->ORG_COMPIZ_INTEGRATED));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND1_KEY.compizName, GINT_TO_POINTER (quarks->ORG_COMPIZ_INTEGRATED));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND0_KEY.compizName, GINT_TO_POINTER (quarks->ORG_COMPIZ_INTEGRATED));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND11.compizName, GINT_TO_POINTER (quarks->ORG_COMPIZ_INTEGRATED));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND10.compizName, GINT_TO_POINTER (quarks->ORG_COMPIZ_INTEGRATED));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND9.compizName, GINT_TO_POINTER (quarks->ORG_COMPIZ_INTEGRATED));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND8.compizName, GINT_TO_POINTER (quarks->ORG_COMPIZ_INTEGRATED));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND7.compizName, GINT_TO_POINTER (quarks->ORG_COMPIZ_INTEGRATED));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND6.compizName, GINT_TO_POINTER (quarks->ORG_COMPIZ_INTEGRATED));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND5.compizName, GINT_TO_POINTER (quarks->ORG_COMPIZ_INTEGRATED));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND4.compizName, GINT_TO_POINTER (quarks->ORG_COMPIZ_INTEGRATED));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND3.compizName, GINT_TO_POINTER (quarks->ORG_COMPIZ_INTEGRATED));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND2.compizName, GINT_TO_POINTER (quarks->ORG_COMPIZ_INTEGRATED));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND1.compizName, GINT_TO_POINTER (quarks->ORG_COMPIZ_INTEGRATED));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND0.compizName, GINT_TO_POINTER (quarks->ORG_COMPIZ_INTEGRATED));
-    g_hash_table_insert (extrawmHashTable, (gpointer) names->EXTRAWM_TOGGLE_FULLSCREEN_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (extrawmHashTable, (gpointer) names->EXTRAWM_TOGGLE_STICKY_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (staticswitcherHashTable, (gpointer) names->STATICSWITCHER_PREV_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (staticswitcherHashTable, (gpointer) names->STATICSWITCHER_NEXT_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (fadeHashTable, (gpointer) names->FADE_FULLSCREEN_VISUAL_BELL.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_PREFERENCES));
-    g_hash_table_insert (fadeHashTable, (gpointer) names->FADE_VISUAL_BELL.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_PREFERENCES));
-    g_hash_table_insert (specialHashTable, (gpointer) names->NULL_RESIZE_WITH_RIGHT_BUTTON.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_PREFERENCES));
-    g_hash_table_insert (specialHashTable, (gpointer) names->NULL_MOUSE_BUTTON_MODIFIER.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_PREFERENCES));
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_WINDOW_MENU_BUTTON.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (resizeHashTable, (gpointer) names->RESIZE_INITIATE_BUTTON.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (moveHashTable, (gpointer) names->MOVE_INITIATE_BUTTON.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_WINDOW_MENU_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (resizeHashTable, (gpointer) names->RESIZE_INITIATE_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (moveHashTable, (gpointer) names->MOVE_INITIATE_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_SHOW_DESKTOP_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_TOGGLE_WINDOW_SHADED_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_CLOSE_WINDOW_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_LOWER_WINDOW_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_RAISE_WINDOW_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_MAXIMIZE_WINDOW_VERTICALLY_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_MAXIMIZE_WINDOW_HORIZONTALLY_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_UNMAXIMIZE_OR_MINIMIZE_WINDOW_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_MAXIMIZE_WINDOW_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_MINIMIZE_WINDOW_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_TOGGLE_WINDOW_MAXIMIZED_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (matecompatHashTable, (gpointer) names->MATECOMPAT_RUN_COMMAND_TERMINAL_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_SETTINGS_DAEMON_PLUGINS_MEDIA_KEYS));
-    g_hash_table_insert (matecompatHashTable, (gpointer) names->MATECOMPAT_RUN_COMMAND_WINDOW_SCREENSHOT_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_SETTINGS_DAEMON_PLUGINS_MEDIA_KEYS));
-    g_hash_table_insert (matecompatHashTable, (gpointer) names->MATECOMPAT_RUN_COMMAND_SCREENSHOT_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_SETTINGS_DAEMON_PLUGINS_MEDIA_KEYS));
-    g_hash_table_insert (matecompatHashTable, (gpointer) names->MATECOMPAT_MAIN_MENU_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (matecompatHashTable, (gpointer) names->MATECOMPAT_RUN_KEY.compizName, GINT_TO_POINTER (quarks->ORG_MATE_DESKTOP_WM_KEYBINDINGS));
-
-    return masterHashTable;
-}
-
-GHashTable *
-ccsMATEIntegrationPopulateCategoriesHashTables ()
-{
-    GHashTable *masterHashTable = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, destroyHashTableInternal);
-    GHashTable *coreHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *thumbnailHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *matecompatHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *rotateHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *putHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *wallHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *vpswitchHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *commandsHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *extrawmHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *resizeHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *moveHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *staticswitcherHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *fadeHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *specialHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-
-    const CCSMATEIntegratedSettingNames *names = &ccsMATEIntegratedSettingNames;
-    const CCSGConfIntegrationCategories  *categories = &ccsGConfIntegrationCategories;
-    const CCSMATEIntegratedPluginNames  *plugins = &ccsMATEIntegratedPluginNames;
-
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->CORE, coreHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->THUMBNAIL, thumbnailHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->MATECOMPAT, matecompatHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->ROTATE, rotateHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->PUT, putHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->WALL, wallHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->VPSWITCH, vpswitchHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->COMMANDS, commandsHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->EXTRAWM, extrawmHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->STATICSWITCHER, staticswitcherHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->FADE, fadeHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->RESIZE, resizeHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->MOVE, moveHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->SPECIAL, specialHashTable);
-
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_AUDIBLE_BELL.compizName, (gpointer) categories->GENERAL);
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_CLICK_TO_FOCUS.compizName, (gpointer) categories->GENERAL);
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_RAISE_ON_CLICK.compizName, (gpointer) categories->GENERAL);
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_AUTORAISE_DELAY.compizName, (gpointer) categories->GENERAL);
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_AUTORAISE.compizName, (gpointer) categories->GENERAL);
-    g_hash_table_insert (thumbnailHashTable, (gpointer) names->THUMBNAIL_CURRENT_VIEWPORT.compizName, (gpointer) categories->APPS);
-    g_hash_table_insert (matecompatHashTable, (gpointer) names->MATECOMPAT_COMMAND_TERMINAL.compizName, (gpointer) categories->DESKTOP);
-    g_hash_table_insert (matecompatHashTable, (gpointer) names->MATECOMPAT_COMMAND_WINDOW_SCREENSHOT.compizName, (gpointer) categories->KEYBINDING_COMMANDS);
-    g_hash_table_insert (matecompatHashTable, (gpointer) names->MATECOMPAT_COMMAND_SCREENSHOT.compizName, (gpointer) categories->KEYBINDING_COMMANDS);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_RIGHT_WINDOW_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_LEFT_WINDOW_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_12_WINDOW_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_11_WINDOW_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_10_WINDOW_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_9_WINDOW_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_8_WINDOW_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_7_WINDOW_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_6_WINDOW_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_5_WINDOW_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_4_WINDOW_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_3_WINDOW_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_2_WINDOW_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_1_WINDOW_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (putHashTable, (gpointer) names->PUT_PUT_BOTTOM_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (putHashTable, (gpointer) names->PUT_PUT_TOP_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (putHashTable, (gpointer) names->PUT_PUT_RIGHT_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (putHashTable, (gpointer) names->PUT_PUT_LEFT_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (putHashTable, (gpointer) names->PUT_PUT_BOTTOMRIGHT_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (putHashTable, (gpointer) names->PUT_PUT_BOTTOMLEFT_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (putHashTable, (gpointer) names->PUT_PUT_TOPRIGHT_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (putHashTable, (gpointer) names->PUT_PUT_TOPLEFT_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (wallHashTable, (gpointer) names->WALL_DOWN_WINDOW_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (wallHashTable, (gpointer) names->WALL_UP_WINDOW_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (wallHashTable, (gpointer) names->WALL_RIGHT_WINDOW_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (wallHashTable, (gpointer) names->WALL_LEFT_WINDOW_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (wallHashTable, (gpointer) names->WALL_RIGHT_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (wallHashTable, (gpointer) names->WALL_LEFT_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (wallHashTable, (gpointer) names->WALL_DOWN_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (wallHashTable, (gpointer) names->WALL_UP_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_12_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_11_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_10_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_9_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_8_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_7_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_6_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_5_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_4_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_3_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_2_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_1_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_RIGHT_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_LEFT_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_12_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_11_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_10_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_9_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_8_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_7_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_6_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_5_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_4_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_3_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_2_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_1_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND11_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND10_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND9_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND8_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND7_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND6_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND5_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND4_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND3_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND2_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND1_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND0_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND11.compizName, (gpointer) categories->KEYBINDING_COMMANDS);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND10.compizName, (gpointer) categories->KEYBINDING_COMMANDS);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND9.compizName, (gpointer) categories->KEYBINDING_COMMANDS);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND8.compizName, (gpointer) categories->KEYBINDING_COMMANDS);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND7.compizName, (gpointer) categories->KEYBINDING_COMMANDS);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND6.compizName, (gpointer) categories->KEYBINDING_COMMANDS);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND5.compizName, (gpointer) categories->KEYBINDING_COMMANDS);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND4.compizName, (gpointer) categories->KEYBINDING_COMMANDS);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND3.compizName, (gpointer) categories->KEYBINDING_COMMANDS);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND2.compizName, (gpointer) categories->KEYBINDING_COMMANDS);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND1.compizName, (gpointer) categories->KEYBINDING_COMMANDS);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND0.compizName, (gpointer) categories->KEYBINDING_COMMANDS);
-    g_hash_table_insert (extrawmHashTable, (gpointer) names->EXTRAWM_TOGGLE_FULLSCREEN_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (extrawmHashTable, (gpointer) names->EXTRAWM_TOGGLE_STICKY_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (staticswitcherHashTable, (gpointer) names->STATICSWITCHER_PREV_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (staticswitcherHashTable, (gpointer) names->STATICSWITCHER_NEXT_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (fadeHashTable, (gpointer) names->FADE_FULLSCREEN_VISUAL_BELL.compizName, (gpointer) categories->GENERAL);
-    g_hash_table_insert (fadeHashTable, (gpointer) names->FADE_VISUAL_BELL.compizName, (gpointer) categories->GENERAL);
-    g_hash_table_insert (specialHashTable, (gpointer) names->NULL_RESIZE_WITH_RIGHT_BUTTON.compizName, (gpointer) categories->GENERAL);
-    g_hash_table_insert (specialHashTable, (gpointer) names->NULL_MOUSE_BUTTON_MODIFIER.compizName, (gpointer) categories->GENERAL);
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_WINDOW_MENU_BUTTON.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (resizeHashTable, (gpointer) names->RESIZE_INITIATE_BUTTON.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (moveHashTable, (gpointer) names->MOVE_INITIATE_BUTTON.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_WINDOW_MENU_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (resizeHashTable, (gpointer) names->RESIZE_INITIATE_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (moveHashTable, (gpointer) names->MOVE_INITIATE_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_SHOW_DESKTOP_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_TOGGLE_WINDOW_SHADED_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_CLOSE_WINDOW_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_LOWER_WINDOW_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_RAISE_WINDOW_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_MAXIMIZE_WINDOW_VERTICALLY_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_MAXIMIZE_WINDOW_HORIZONTALLY_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_UNMAXIMIZE_OR_MINIMIZE_WINDOW_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_MAXIMIZE_WINDOW_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_MINIMIZE_WINDOW_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_TOGGLE_WINDOW_MAXIMIZED_KEY.compizName, (gpointer) categories->WINDOW_KEYBINDINGS);
-    g_hash_table_insert (matecompatHashTable, (gpointer) names->MATECOMPAT_RUN_COMMAND_TERMINAL_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (matecompatHashTable, (gpointer) names->MATECOMPAT_RUN_COMMAND_WINDOW_SCREENSHOT_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (matecompatHashTable, (gpointer) names->MATECOMPAT_RUN_COMMAND_SCREENSHOT_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (matecompatHashTable, (gpointer) names->MATECOMPAT_MAIN_MENU_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-    g_hash_table_insert (matecompatHashTable, (gpointer) names->MATECOMPAT_RUN_KEY.compizName, (gpointer) categories->GLOBAL_KEYBINDINGS);
-
-    return masterHashTable;
-}
-
-
-GHashTable *
-ccsMATEIntegrationPopulateSpecialTypesHashTables ()
-{
-    GHashTable *masterHashTable = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, destroyHashTableInternal);
-    GHashTable *coreHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *thumbnailHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *matecompatHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *rotateHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *putHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *wallHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *vpswitchHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *commandsHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *extrawmHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *resizeHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *moveHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *staticswitcherHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *fadeHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *specialHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-
-    const CCSMATEIntegratedSettingNames *names = &ccsMATEIntegratedSettingNames;
-    const CCSMATEIntegratedPluginNames  *plugins = &ccsMATEIntegratedPluginNames;
-
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->CORE, coreHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->THUMBNAIL, thumbnailHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->MATECOMPAT, matecompatHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->ROTATE, rotateHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->PUT, putHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->WALL, wallHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->VPSWITCH, vpswitchHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->COMMANDS, commandsHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->EXTRAWM, extrawmHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->STATICSWITCHER, staticswitcherHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->FADE, fadeHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->RESIZE, resizeHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->MOVE, moveHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->SPECIAL, specialHashTable);
-
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_AUDIBLE_BELL.compizName, GINT_TO_POINTER (OptionBool));
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_CLICK_TO_FOCUS.compizName, GINT_TO_POINTER (OptionSpecial));
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_RAISE_ON_CLICK.compizName, GINT_TO_POINTER (OptionBool));
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_AUTORAISE_DELAY.compizName, GINT_TO_POINTER (OptionInt));
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_AUTORAISE.compizName, GINT_TO_POINTER (OptionBool));
-    g_hash_table_insert (thumbnailHashTable, (gpointer) names->THUMBNAIL_CURRENT_VIEWPORT.compizName, GINT_TO_POINTER (OptionSpecial));
-    g_hash_table_insert (matecompatHashTable, (gpointer) names->MATECOMPAT_COMMAND_TERMINAL.compizName, GINT_TO_POINTER (OptionString));
-    g_hash_table_insert (matecompatHashTable, (gpointer) names->MATECOMPAT_COMMAND_WINDOW_SCREENSHOT.compizName, GINT_TO_POINTER (OptionString));
-    g_hash_table_insert (matecompatHashTable, (gpointer) names->MATECOMPAT_COMMAND_SCREENSHOT.compizName, GINT_TO_POINTER (OptionString));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_RIGHT_WINDOW_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_LEFT_WINDOW_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_12_WINDOW_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_11_WINDOW_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_10_WINDOW_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_9_WINDOW_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_8_WINDOW_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_7_WINDOW_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_6_WINDOW_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_5_WINDOW_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_4_WINDOW_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_3_WINDOW_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_2_WINDOW_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_1_WINDOW_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (putHashTable, (gpointer) names->PUT_PUT_BOTTOM_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (putHashTable, (gpointer) names->PUT_PUT_TOP_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (putHashTable, (gpointer) names->PUT_PUT_RIGHT_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (putHashTable, (gpointer) names->PUT_PUT_LEFT_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (putHashTable, (gpointer) names->PUT_PUT_BOTTOMRIGHT_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (putHashTable, (gpointer) names->PUT_PUT_BOTTOMLEFT_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (putHashTable, (gpointer) names->PUT_PUT_TOPRIGHT_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (putHashTable, (gpointer) names->PUT_PUT_TOPLEFT_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (wallHashTable, (gpointer) names->WALL_DOWN_WINDOW_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (wallHashTable, (gpointer) names->WALL_UP_WINDOW_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (wallHashTable, (gpointer) names->WALL_RIGHT_WINDOW_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (wallHashTable, (gpointer) names->WALL_LEFT_WINDOW_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (wallHashTable, (gpointer) names->WALL_RIGHT_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (wallHashTable, (gpointer) names->WALL_LEFT_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (wallHashTable, (gpointer) names->WALL_DOWN_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (wallHashTable, (gpointer) names->WALL_UP_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_12_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_11_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_10_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_9_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_8_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_7_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_6_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_5_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_4_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_3_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_2_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_1_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_RIGHT_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_LEFT_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_12_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_11_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_10_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_9_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_8_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_7_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_6_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_5_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_4_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_3_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_2_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_1_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND11_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND10_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND9_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND8_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND7_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND6_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND5_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND4_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND3_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND2_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND1_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND0_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND11.compizName, GINT_TO_POINTER (OptionString));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND10.compizName, GINT_TO_POINTER (OptionString));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND9.compizName, GINT_TO_POINTER (OptionString));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND8.compizName, GINT_TO_POINTER (OptionString));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND7.compizName, GINT_TO_POINTER (OptionString));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND6.compizName, GINT_TO_POINTER (OptionString));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND5.compizName, GINT_TO_POINTER (OptionString));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND4.compizName, GINT_TO_POINTER (OptionString));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND3.compizName, GINT_TO_POINTER (OptionString));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND2.compizName, GINT_TO_POINTER (OptionString));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND1.compizName, GINT_TO_POINTER (OptionString));
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND0.compizName, GINT_TO_POINTER (OptionString));
-    g_hash_table_insert (extrawmHashTable, (gpointer) names->EXTRAWM_TOGGLE_FULLSCREEN_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (extrawmHashTable, (gpointer) names->EXTRAWM_TOGGLE_STICKY_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (staticswitcherHashTable, (gpointer) names->STATICSWITCHER_PREV_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (staticswitcherHashTable, (gpointer) names->STATICSWITCHER_NEXT_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (fadeHashTable, (gpointer) names->FADE_FULLSCREEN_VISUAL_BELL.compizName, GINT_TO_POINTER (OptionSpecial));
-    g_hash_table_insert (fadeHashTable, (gpointer) names->FADE_VISUAL_BELL.compizName, GINT_TO_POINTER (OptionBool));
-    g_hash_table_insert (specialHashTable, (gpointer) names->NULL_RESIZE_WITH_RIGHT_BUTTON.compizName, GINT_TO_POINTER (OptionSpecial));
-    g_hash_table_insert (specialHashTable, (gpointer) names->NULL_MOUSE_BUTTON_MODIFIER.compizName, GINT_TO_POINTER (OptionSpecial));
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_WINDOW_MENU_BUTTON.compizName, GINT_TO_POINTER (OptionSpecial));
-    g_hash_table_insert (resizeHashTable, (gpointer) names->RESIZE_INITIATE_BUTTON.compizName, GINT_TO_POINTER (OptionSpecial));
-    g_hash_table_insert (moveHashTable, (gpointer) names->MOVE_INITIATE_BUTTON.compizName, GINT_TO_POINTER (OptionSpecial));
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_WINDOW_MENU_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (resizeHashTable, (gpointer) names->RESIZE_INITIATE_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (moveHashTable, (gpointer) names->MOVE_INITIATE_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_SHOW_DESKTOP_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_TOGGLE_WINDOW_SHADED_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_CLOSE_WINDOW_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_LOWER_WINDOW_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_RAISE_WINDOW_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_MAXIMIZE_WINDOW_VERTICALLY_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_MAXIMIZE_WINDOW_HORIZONTALLY_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_UNMAXIMIZE_OR_MINIMIZE_WINDOW_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_MAXIMIZE_WINDOW_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_MINIMIZE_WINDOW_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_TOGGLE_WINDOW_MAXIMIZED_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (matecompatHashTable, (gpointer) names->MATECOMPAT_RUN_COMMAND_TERMINAL_KEY.compizName, GINT_TO_POINTER (OptionSpecial));
-    g_hash_table_insert (matecompatHashTable, (gpointer) names->MATECOMPAT_RUN_COMMAND_WINDOW_SCREENSHOT_KEY.compizName, GINT_TO_POINTER (OptionSpecial));
-    g_hash_table_insert (matecompatHashTable, (gpointer) names->MATECOMPAT_RUN_COMMAND_SCREENSHOT_KEY.compizName, GINT_TO_POINTER (OptionSpecial));
-    g_hash_table_insert (matecompatHashTable, (gpointer) names->MATECOMPAT_MAIN_MENU_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (matecompatHashTable, (gpointer) names->MATECOMPAT_RUN_KEY.compizName, GINT_TO_POINTER (OptionKey));
-
-    return masterHashTable;
-}
-
-GHashTable *
-ccsMATEIntegrationPopulateSettingNameToMATENameHashTables ()
-{
-    GHashTable *masterHashTable = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, destroyHashTableInternal);
-    GHashTable *coreHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *thumbnailHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *matecompatHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *rotateHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *putHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *wallHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *vpswitchHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *commandsHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *extrawmHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *resizeHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *moveHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *staticswitcherHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *fadeHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-    GHashTable *specialHashTable = g_hash_table_new (g_str_hash, g_str_equal);
-
-    const CCSMATEIntegratedSettingNames *names = &ccsMATEIntegratedSettingNames;
-    const CCSMATEIntegratedPluginNames  *plugins = &ccsMATEIntegratedPluginNames;
-
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->CORE, coreHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->THUMBNAIL, thumbnailHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->MATECOMPAT, matecompatHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->ROTATE, rotateHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->PUT, putHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->WALL, wallHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->VPSWITCH, vpswitchHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->COMMANDS, commandsHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->EXTRAWM, extrawmHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->STATICSWITCHER, staticswitcherHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->FADE, fadeHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->RESIZE, resizeHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->MOVE, moveHashTable);
-    g_hash_table_insert (masterHashTable, (gpointer) plugins->SPECIAL, specialHashTable);
-
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_AUDIBLE_BELL.compizName, (gpointer) names->CORE_AUDIBLE_BELL.mateName);
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_CLICK_TO_FOCUS.compizName, (gpointer) names->CORE_CLICK_TO_FOCUS.mateName);
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_RAISE_ON_CLICK.compizName, (gpointer) names->CORE_RAISE_ON_CLICK.mateName);
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_AUTORAISE_DELAY.compizName, (gpointer) names->CORE_AUTORAISE_DELAY.mateName);
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_AUTORAISE.compizName, (gpointer) names->CORE_AUTORAISE.mateName);
-    g_hash_table_insert (thumbnailHashTable, (gpointer) names->THUMBNAIL_CURRENT_VIEWPORT.compizName, (gpointer) names->THUMBNAIL_CURRENT_VIEWPORT.mateName);
-    g_hash_table_insert (matecompatHashTable, (gpointer) names->MATECOMPAT_COMMAND_TERMINAL.compizName, (gpointer) names->MATECOMPAT_COMMAND_TERMINAL.mateName);
-    g_hash_table_insert (matecompatHashTable, (gpointer) names->MATECOMPAT_COMMAND_WINDOW_SCREENSHOT.compizName, (gpointer) names->MATECOMPAT_COMMAND_WINDOW_SCREENSHOT.mateName);
-    g_hash_table_insert (matecompatHashTable, (gpointer) names->MATECOMPAT_COMMAND_SCREENSHOT.compizName, (gpointer) names->MATECOMPAT_COMMAND_SCREENSHOT.mateName);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_RIGHT_WINDOW_KEY.compizName, (gpointer) names->ROTATE_ROTATE_RIGHT_WINDOW_KEY.mateName);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_LEFT_WINDOW_KEY.compizName, (gpointer) names->ROTATE_ROTATE_LEFT_WINDOW_KEY.mateName);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_12_WINDOW_KEY.compizName, (gpointer) names->ROTATE_ROTATE_TO_12_WINDOW_KEY.mateName);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_11_WINDOW_KEY.compizName, (gpointer) names->ROTATE_ROTATE_TO_11_WINDOW_KEY.mateName);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_10_WINDOW_KEY.compizName, (gpointer) names->ROTATE_ROTATE_TO_10_WINDOW_KEY.mateName);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_9_WINDOW_KEY.compizName, (gpointer) names->ROTATE_ROTATE_TO_9_WINDOW_KEY.mateName);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_8_WINDOW_KEY.compizName, (gpointer) names->ROTATE_ROTATE_TO_8_WINDOW_KEY.mateName);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_7_WINDOW_KEY.compizName, (gpointer) names->ROTATE_ROTATE_TO_7_WINDOW_KEY.mateName);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_6_WINDOW_KEY.compizName, (gpointer) names->ROTATE_ROTATE_TO_6_WINDOW_KEY.mateName);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_5_WINDOW_KEY.compizName, (gpointer) names->ROTATE_ROTATE_TO_5_WINDOW_KEY.mateName);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_4_WINDOW_KEY.compizName, (gpointer) names->ROTATE_ROTATE_TO_4_WINDOW_KEY.mateName);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_3_WINDOW_KEY.compizName, (gpointer) names->ROTATE_ROTATE_TO_3_WINDOW_KEY.mateName);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_2_WINDOW_KEY.compizName, (gpointer) names->ROTATE_ROTATE_TO_2_WINDOW_KEY.mateName);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_1_WINDOW_KEY.compizName, (gpointer) names->ROTATE_ROTATE_TO_1_WINDOW_KEY.mateName);
-    g_hash_table_insert (putHashTable, (gpointer) names->PUT_PUT_BOTTOM_KEY.compizName, (gpointer) names->PUT_PUT_BOTTOM_KEY.mateName);
-    g_hash_table_insert (putHashTable, (gpointer) names->PUT_PUT_TOP_KEY.compizName, (gpointer) names->PUT_PUT_TOP_KEY.mateName);
-    g_hash_table_insert (putHashTable, (gpointer) names->PUT_PUT_RIGHT_KEY.compizName, (gpointer) names->PUT_PUT_RIGHT_KEY.mateName);
-    g_hash_table_insert (putHashTable, (gpointer) names->PUT_PUT_LEFT_KEY.compizName, (gpointer) names->PUT_PUT_LEFT_KEY.mateName);
-    g_hash_table_insert (putHashTable, (gpointer) names->PUT_PUT_BOTTOMRIGHT_KEY.compizName, (gpointer) names->PUT_PUT_BOTTOMRIGHT_KEY.mateName);
-    g_hash_table_insert (putHashTable, (gpointer) names->PUT_PUT_BOTTOMLEFT_KEY.compizName, (gpointer) names->PUT_PUT_BOTTOMLEFT_KEY.mateName);
-    g_hash_table_insert (putHashTable, (gpointer) names->PUT_PUT_TOPRIGHT_KEY.compizName, (gpointer) names->PUT_PUT_TOPRIGHT_KEY.mateName);
-    g_hash_table_insert (putHashTable, (gpointer) names->PUT_PUT_TOPLEFT_KEY.compizName, (gpointer) names->PUT_PUT_TOPLEFT_KEY.mateName);
-    g_hash_table_insert (wallHashTable, (gpointer) names->WALL_DOWN_WINDOW_KEY.compizName, (gpointer) names->WALL_DOWN_WINDOW_KEY.mateName);
-    g_hash_table_insert (wallHashTable, (gpointer) names->WALL_UP_WINDOW_KEY.compizName, (gpointer) names->WALL_UP_WINDOW_KEY.mateName);
-    g_hash_table_insert (wallHashTable, (gpointer) names->WALL_RIGHT_WINDOW_KEY.compizName, (gpointer) names->WALL_RIGHT_WINDOW_KEY.mateName);
-    g_hash_table_insert (wallHashTable, (gpointer) names->WALL_LEFT_WINDOW_KEY.compizName, (gpointer) names->WALL_LEFT_WINDOW_KEY.mateName);
-    g_hash_table_insert (wallHashTable, (gpointer) names->WALL_RIGHT_KEY.compizName, (gpointer) names->WALL_RIGHT_KEY.mateName);
-    g_hash_table_insert (wallHashTable, (gpointer) names->WALL_LEFT_KEY.compizName, (gpointer) names->WALL_LEFT_KEY.mateName);
-    g_hash_table_insert (wallHashTable, (gpointer) names->WALL_DOWN_KEY.compizName, (gpointer) names->WALL_DOWN_KEY.mateName);
-    g_hash_table_insert (wallHashTable, (gpointer) names->WALL_UP_KEY.compizName, (gpointer) names->WALL_UP_KEY.mateName);
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_12_KEY.compizName, (gpointer) names->VPSWITCH_SWITCH_TO_12_KEY.mateName);
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_11_KEY.compizName, (gpointer) names->VPSWITCH_SWITCH_TO_11_KEY.mateName);
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_10_KEY.compizName, (gpointer) names->VPSWITCH_SWITCH_TO_10_KEY.mateName);
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_9_KEY.compizName, (gpointer) names->VPSWITCH_SWITCH_TO_9_KEY.mateName);
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_8_KEY.compizName, (gpointer) names->VPSWITCH_SWITCH_TO_8_KEY.mateName);
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_7_KEY.compizName, (gpointer) names->VPSWITCH_SWITCH_TO_7_KEY.mateName);
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_6_KEY.compizName, (gpointer) names->VPSWITCH_SWITCH_TO_6_KEY.mateName);
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_5_KEY.compizName, (gpointer) names->VPSWITCH_SWITCH_TO_5_KEY.mateName);
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_4_KEY.compizName, (gpointer) names->VPSWITCH_SWITCH_TO_4_KEY.mateName);
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_3_KEY.compizName, (gpointer) names->VPSWITCH_SWITCH_TO_3_KEY.mateName);
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_2_KEY.compizName, (gpointer) names->VPSWITCH_SWITCH_TO_2_KEY.mateName);
-    g_hash_table_insert (vpswitchHashTable, (gpointer) names->VPSWITCH_SWITCH_TO_1_KEY.compizName, (gpointer) names->VPSWITCH_SWITCH_TO_1_KEY.mateName);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_RIGHT_KEY.compizName, (gpointer) names->ROTATE_ROTATE_RIGHT_KEY.mateName);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_LEFT_KEY.compizName, (gpointer) names->ROTATE_ROTATE_LEFT_KEY.mateName);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_12_KEY.compizName, (gpointer) names->ROTATE_ROTATE_TO_12_KEY.mateName);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_11_KEY.compizName, (gpointer) names->ROTATE_ROTATE_TO_11_KEY.mateName);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_10_KEY.compizName, (gpointer) names->ROTATE_ROTATE_TO_10_KEY.mateName);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_9_KEY.compizName, (gpointer) names->ROTATE_ROTATE_TO_9_KEY.mateName);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_8_KEY.compizName, (gpointer) names->ROTATE_ROTATE_TO_8_KEY.mateName);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_7_KEY.compizName, (gpointer) names->ROTATE_ROTATE_TO_7_KEY.mateName);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_6_KEY.compizName, (gpointer) names->ROTATE_ROTATE_TO_6_KEY.mateName);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_5_KEY.compizName, (gpointer) names->ROTATE_ROTATE_TO_5_KEY.mateName);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_4_KEY.compizName, (gpointer) names->ROTATE_ROTATE_TO_4_KEY.mateName);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_3_KEY.compizName, (gpointer) names->ROTATE_ROTATE_TO_3_KEY.mateName);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_2_KEY.compizName, (gpointer) names->ROTATE_ROTATE_TO_2_KEY.mateName);
-    g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_TO_1_KEY.compizName, (gpointer) names->ROTATE_ROTATE_TO_1_KEY.mateName);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND11_KEY.compizName, (gpointer) names->COMMANDS_RUN_COMMAND11_KEY.mateName);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND10_KEY.compizName, (gpointer) names->COMMANDS_RUN_COMMAND10_KEY.mateName);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND9_KEY.compizName, (gpointer) names->COMMANDS_RUN_COMMAND9_KEY.mateName);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND8_KEY.compizName, (gpointer) names->COMMANDS_RUN_COMMAND8_KEY.mateName);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND7_KEY.compizName, (gpointer) names->COMMANDS_RUN_COMMAND7_KEY.mateName);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND6_KEY.compizName, (gpointer) names->COMMANDS_RUN_COMMAND6_KEY.mateName);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND5_KEY.compizName, (gpointer) names->COMMANDS_RUN_COMMAND5_KEY.mateName);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND4_KEY.compizName, (gpointer) names->COMMANDS_RUN_COMMAND4_KEY.mateName);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND3_KEY.compizName, (gpointer) names->COMMANDS_RUN_COMMAND3_KEY.mateName);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND2_KEY.compizName, (gpointer) names->COMMANDS_RUN_COMMAND2_KEY.mateName);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND1_KEY.compizName, (gpointer) names->COMMANDS_RUN_COMMAND1_KEY.mateName);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_RUN_COMMAND0_KEY.compizName, (gpointer) names->COMMANDS_RUN_COMMAND0_KEY.mateName);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND11.compizName, (gpointer) names->COMMANDS_COMMAND11.mateName);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND10.compizName, (gpointer) names->COMMANDS_COMMAND10.mateName);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND9.compizName, (gpointer) names->COMMANDS_COMMAND9.mateName);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND8.compizName, (gpointer) names->COMMANDS_COMMAND8.mateName);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND7.compizName, (gpointer) names->COMMANDS_COMMAND7.mateName);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND6.compizName, (gpointer) names->COMMANDS_COMMAND6.mateName);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND5.compizName, (gpointer) names->COMMANDS_COMMAND5.mateName);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND4.compizName, (gpointer) names->COMMANDS_COMMAND4.mateName);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND3.compizName, (gpointer) names->COMMANDS_COMMAND3.mateName);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND2.compizName, (gpointer) names->COMMANDS_COMMAND2.mateName);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND1.compizName, (gpointer) names->COMMANDS_COMMAND1.mateName);
-    g_hash_table_insert (commandsHashTable, (gpointer) names->COMMANDS_COMMAND0.compizName, (gpointer) names->COMMANDS_COMMAND0.mateName);
-    g_hash_table_insert (extrawmHashTable, (gpointer) names->EXTRAWM_TOGGLE_FULLSCREEN_KEY.compizName, (gpointer) names->EXTRAWM_TOGGLE_FULLSCREEN_KEY.mateName);
-    g_hash_table_insert (extrawmHashTable, (gpointer) names->EXTRAWM_TOGGLE_STICKY_KEY.compizName, (gpointer) names->EXTRAWM_TOGGLE_STICKY_KEY.mateName);
-    g_hash_table_insert (staticswitcherHashTable, (gpointer) names->STATICSWITCHER_PREV_KEY.compizName, (gpointer) names->STATICSWITCHER_PREV_KEY.mateName);
-    g_hash_table_insert (staticswitcherHashTable, (gpointer) names->STATICSWITCHER_NEXT_KEY.compizName, (gpointer) names->STATICSWITCHER_NEXT_KEY.mateName);
-    g_hash_table_insert (fadeHashTable, (gpointer) names->FADE_FULLSCREEN_VISUAL_BELL.compizName, (gpointer) names->FADE_FULLSCREEN_VISUAL_BELL.mateName);
-    g_hash_table_insert (fadeHashTable, (gpointer) names->FADE_VISUAL_BELL.compizName, (gpointer) names->FADE_VISUAL_BELL.mateName);
-    g_hash_table_insert (specialHashTable, (gpointer) names->NULL_RESIZE_WITH_RIGHT_BUTTON.compizName, (gpointer) names->NULL_RESIZE_WITH_RIGHT_BUTTON.mateName);
-    g_hash_table_insert (specialHashTable, (gpointer) names->NULL_MOUSE_BUTTON_MODIFIER.compizName, (gpointer) names->NULL_MOUSE_BUTTON_MODIFIER.mateName);
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_WINDOW_MENU_BUTTON.compizName, (gpointer) names->CORE_WINDOW_MENU_BUTTON.mateName);
-    g_hash_table_insert (resizeHashTable, (gpointer) names->RESIZE_INITIATE_BUTTON.compizName, (gpointer) names->RESIZE_INITIATE_BUTTON.mateName);
-    g_hash_table_insert (moveHashTable, (gpointer) names->MOVE_INITIATE_BUTTON.compizName, (gpointer) names->MOVE_INITIATE_BUTTON.mateName);
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_WINDOW_MENU_KEY.compizName, (gpointer) names->CORE_WINDOW_MENU_KEY.mateName);
-    g_hash_table_insert (resizeHashTable, (gpointer) names->RESIZE_INITIATE_KEY.compizName, (gpointer) names->RESIZE_INITIATE_KEY.mateName);
-    g_hash_table_insert (moveHashTable, (gpointer) names->MOVE_INITIATE_KEY.compizName, (gpointer) names->MOVE_INITIATE_KEY.mateName);
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_SHOW_DESKTOP_KEY.compizName, (gpointer) names->CORE_SHOW_DESKTOP_KEY.mateName);
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_TOGGLE_WINDOW_SHADED_KEY.compizName, (gpointer) names->CORE_TOGGLE_WINDOW_SHADED_KEY.mateName);
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_CLOSE_WINDOW_KEY.compizName, (gpointer) names->CORE_CLOSE_WINDOW_KEY.mateName);
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_LOWER_WINDOW_KEY.compizName, (gpointer) names->CORE_LOWER_WINDOW_KEY.mateName);
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_RAISE_WINDOW_KEY.compizName, (gpointer) names->CORE_RAISE_WINDOW_KEY.mateName);
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_MAXIMIZE_WINDOW_VERTICALLY_KEY.compizName, (gpointer) names->CORE_MAXIMIZE_WINDOW_VERTICALLY_KEY.mateName);
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_MAXIMIZE_WINDOW_HORIZONTALLY_KEY.compizName, (gpointer) names->CORE_MAXIMIZE_WINDOW_HORIZONTALLY_KEY.mateName);
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_UNMAXIMIZE_OR_MINIMIZE_WINDOW_KEY.compizName, (gpointer) names->CORE_UNMAXIMIZE_OR_MINIMIZE_WINDOW_KEY.mateName);
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_MAXIMIZE_WINDOW_KEY.compizName, (gpointer) names->CORE_MAXIMIZE_WINDOW_KEY.mateName);
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_MINIMIZE_WINDOW_KEY.compizName, (gpointer) names->CORE_MINIMIZE_WINDOW_KEY.mateName);
-    g_hash_table_insert (coreHashTable, (gpointer) names->CORE_TOGGLE_WINDOW_MAXIMIZED_KEY.compizName, (gpointer) names->CORE_TOGGLE_WINDOW_MAXIMIZED_KEY.mateName);
-    g_hash_table_insert (matecompatHashTable, (gpointer) names->MATECOMPAT_RUN_COMMAND_TERMINAL_KEY.compizName, (gpointer) names->MATECOMPAT_RUN_COMMAND_TERMINAL_KEY.mateName);
-    g_hash_table_insert (matecompatHashTable, (gpointer) names->MATECOMPAT_RUN_COMMAND_WINDOW_SCREENSHOT_KEY.compizName, (gpointer) names->MATECOMPAT_RUN_COMMAND_WINDOW_SCREENSHOT_KEY.mateName);
-    g_hash_table_insert (matecompatHashTable, (gpointer) names->MATECOMPAT_RUN_COMMAND_SCREENSHOT_KEY.compizName, (gpointer) names->MATECOMPAT_RUN_COMMAND_SCREENSHOT_KEY.mateName);
-    g_hash_table_insert (matecompatHashTable, (gpointer) names->MATECOMPAT_MAIN_MENU_KEY.compizName, (gpointer) names->MATECOMPAT_MAIN_MENU_KEY.mateName);
-    g_hash_table_insert (matecompatHashTable, (gpointer) names->MATECOMPAT_RUN_KEY.compizName, (gpointer) names->MATECOMPAT_RUN_KEY.mateName);
-
-    return masterHashTable;
-}
 
=== removed directory 'compizconfig/integration/mate/tests'
=== removed file 'compizconfig/integration/mate/tests/CMakeLists.txt'
--- compizconfig/integration/mate/tests/CMakeLists.txt	2015-07-30 19:56:19 +0000
+++ compizconfig/integration/mate/tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-include_directories (${GTEST_INCLUDE_DIRS})
-include_directories (${CMAKE_SOURCE_DIR}/include)
-include_directories (${CMAKE_SOURCE_DIR}/tests/shared)
-include_directories (${CMAKE_SOURCE_DIR}/tests/shared/glib)
-include_directories (${CMAKE_CURRENT_SOURCE_DIR}/../../../mocks/libcompizconfig)
-include_directories (${CMAKE_CURRENT_SOURCE_DIR}/../../../gsettings/tests)
-include_directories (${CMAKE_CURRENT_SOURCE_DIR}/../../../gsettings/mocks)
-include_directories (${CMAKE_SOURCE_DIR}/compizconfig/tests)
-link_directories (${CMAKE_INSTALL_PREFIX}/lib)
-
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
-add_library (compizconfig_ccs_mock_mate_integrated_setting_composition
-	     ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig_ccs_mock_mate_integrated_setting_composition.c)
-
-target_link_libraries (compizconfig_ccs_mock_mate_integrated_setting_composition
-		       compizconfig_ccs_integrated_setting_mock
-		       compizconfig_mate_integrated_setting
-		       compizconfig)
-
-add_executable (compizconfig_test_ccs_mate_integration
-		${CMAKE_CURRENT_SOURCE_DIR}/compizconfig_test_ccs_mate_integration.cpp)
-
-target_link_libraries (compizconfig_test_ccs_mate_integration
-		       ${GTEST_BOTH_LIBRARIES}
-		       ${GMOCK_LIBRARY}
-		       ${GMOCK_MAIN_LIBRARY}
-		       ${LIBCOMPIZCONFIG_LIBRARIES}
-		       compizconfig
-		       compizconfig_ccs_context_mock
-		       compizconfig_ccs_backend_mock
-		       compizconfig_ccs_setting_mock
-		       compizconfig_ccs_plugin_mock
-		       compizconfig_ccs_list_wrapper
-		       compizconfig_ccs_setting_value_operators
-		       compizconfig_ccs_setting_value_matcher
-		       compizconfig_ccs_integrated_setting_mock
-		       compizconfig_ccs_integrated_setting_factory_mock
-		       compizconfig_ccs_integrated_setting_storage_mock
-		       compizconfig_ccs_mock_mate_integrated_setting_composition
-		       compizconfig_mate_integration)
-
-compiz_discover_tests (compizconfig_test_ccs_mate_integration
-		       COVERAGE
-		       compizconfig_mate_integration
-		       compizconfig_mate_integration_constants)
 
=== removed file 'compizconfig/integration/mate/tests/compizconfig_ccs_mock_mate_integrated_setting_composition.c'
--- compizconfig/integration/mate/tests/compizconfig_ccs_mock_mate_integrated_setting_composition.c	2015-02-04 22:20:18 +0000
+++ compizconfig/integration/mate/tests/compizconfig_ccs_mock_mate_integrated_setting_composition.c	1970-01-01 00:00:00 +0000
@@ -1,220 +0,0 @@
-/*
- * Compiz configuration system library
- *
- * Copyright (C) 2012 Canonical Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
-
- * This library 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
- * Lesser General Public License for more details.
-
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Authored By:
- * Sam Spilsbury <[e-mail]>
- */
-
-#include <ccs.h>
-#include <ccs-backend.h>
-#include <ccs_mate_integrated_setting.h>
-#include "compizconfig_ccs_mock_mate_integrated_setting_composition.h"
-
-typedef struct _CCSMockMATEIntegratedSettingCompositionPrivate
-{
-    CCSIntegratedSetting          *integratedSetting;
-    CCSMATEIntegratedSettingInfo *mateIntegratedSettingInfo;
-    CCSIntegratedSettingInfo      *integratedSettingInfo;
-} CCSMockMATEIntegratedSettingCompositionPrivate;
-
-static CCSIntegratedSetting *
-allocateCCSIntegratedSetting (CCSObjectAllocationInterface *allocator)
-{
-    CCSIntegratedSetting *setting =
-	    (*allocator->calloc_) (allocator->allocator,
-				   1,
-				   sizeof (CCSIntegratedSetting));
-
-    ccsObjectInit (setting, allocator);
-
-    return setting;
-}
-
-static CCSMockMATEIntegratedSettingCompositionPrivate *
-allocatePrivate (CCSIntegratedSetting         *integratedSetting,
-		 CCSObjectAllocationInterface *allocator)
-{
-    CCSMockMATEIntegratedSettingCompositionPrivate *priv =
-	    (*allocator->calloc_) (allocator->allocator,
-				   1,
-				   sizeof (CCSMockMATEIntegratedSettingCompositionPrivate));
-
-    if (!priv)
-    {
-	ccsObjectFinalize (integratedSetting);
-	(*allocator->free_) (allocator->allocator, integratedSetting);
-	return NULL;
-    }
-
-    return priv;
-}
-
-static SpecialOptionType
-ccsMockCompositionIntegratedSettingGetSpecialOptionType (CCSMATEIntegratedSettingInfo *setting)
-{
-    CCSMockMATEIntegratedSettingCompositionPrivate *priv = GET_PRIVATE (CCSMockMATEIntegratedSettingCompositionPrivate, setting);
-
-    return ccsMATEIntegratedSettingInfoGetSpecialOptionType (priv->mateIntegratedSettingInfo);
-}
-
-static const char *
-ccsMockCompositionIntegratedSettingGetMATEName (CCSMATEIntegratedSettingInfo *setting)
-{
-    CCSMockMATEIntegratedSettingCompositionPrivate *priv = GET_PRIVATE (CCSMockMATEIntegratedSettingCompositionPrivate, setting);
-
-    return ccsMATEIntegratedSettingInfoGetMATEName (priv->mateIntegratedSettingInfo);
-}
-
-static CCSSettingValue *
-ccsMockCompositionIntegratedSettingReadValue (CCSIntegratedSetting *setting, CCSSettingType type)
-{
-    CCSMockMATEIntegratedSettingCompositionPrivate *priv =
-	    GET_PRIVATE (CCSMockMATEIntegratedSettingCompositionPrivate, setting);
-
-    return ccsIntegratedSettingReadValue (priv->integratedSetting, type);
-}
-
-static void
-ccsMockCompositionIntegratedSettingWriteValue (CCSIntegratedSetting *setting, CCSSettingValue *v, CCSSettingType type)
-{
-    CCSMockMATEIntegratedSettingCompositionPrivate *priv =
-	    GET_PRIVATE (CCSMockMATEIntegratedSettingCompositionPrivate, setting);
-
-    ccsIntegratedSettingWriteValue (priv->integratedSetting, v, type);
-}
-
-static const char *
-ccsMockCompositionIntegratedSettingInfoPluginName (CCSIntegratedSettingInfo *setting)
-{
-    CCSMockMATEIntegratedSettingCompositionPrivate *priv = GET_PRIVATE (CCSMockMATEIntegratedSettingCompositionPrivate, setting);
-
-    return ccsIntegratedSettingInfoPluginName (priv->integratedSettingInfo);
-}
-
-static const char *
-ccsMockCompositionIntegratedSettingInfoSettingName (CCSIntegratedSettingInfo *setting)
-{
-    CCSMockMATEIntegratedSettingCompositionPrivate *priv = GET_PRIVATE (CCSMockMATEIntegratedSettingCompositionPrivate, setting);
-
-    return ccsIntegratedSettingInfoSettingName (priv->integratedSettingInfo);
-}
-
-static CCSSettingType
-ccsMockCompositionIntegratedSettingInfoGetType (CCSIntegratedSettingInfo *setting)
-{
-    CCSMockMATEIntegratedSettingCompositionPrivate *priv = GET_PRIVATE (CCSMockMATEIntegratedSettingCompositionPrivate, setting);
-
-    return ccsIntegratedSettingInfoGetType (priv->integratedSettingInfo);
-}
-
-static void
-ccsMockCompositionIntegratedSettingFree (CCSIntegratedSetting        *integratedSetting)
-{
-    CCSMockMATEIntegratedSettingCompositionPrivate *priv =
-	    GET_PRIVATE (CCSMockMATEIntegratedSettingCompositionPrivate, integratedSetting);
-
-    ccsIntegratedSettingUnref (priv->integratedSetting);
-    ccsMATEIntegratedSettingInfoUnref (priv->mateIntegratedSettingInfo);
-
-    ccsObjectFinalize (integratedSetting);
-    (*integratedSetting->object.object_allocation->free_)
-	    (integratedSetting->object.object_allocation->allocator, integratedSetting);
-}
-
-static void
-ccsMockCompositionIntegratedSettingInfoFree (CCSIntegratedSettingInfo *info)
-{
-    return ccsMockCompositionIntegratedSettingFree ((CCSIntegratedSetting *) info);
-}
-
-static void
-ccsMockCompositionMATEIntegratedSettingInfoFree (CCSMATEIntegratedSettingInfo *info)
-{
-    return ccsMockCompositionIntegratedSettingFree ((CCSIntegratedSetting *) info);
-}
-
-const CCSMATEIntegratedSettingInfoInterface ccsMockCompositionMATEIntegratedSettingInfo =
-{
-    ccsMockCompositionIntegratedSettingGetSpecialOptionType,
-    ccsMockCompositionIntegratedSettingGetMATEName,
-    ccsMockCompositionMATEIntegratedSettingInfoFree
-};
-
-const CCSIntegratedSettingInterface ccsMockCompositionIntegratedSetting =
-{
-    ccsMockCompositionIntegratedSettingReadValue,
-    ccsMockCompositionIntegratedSettingWriteValue,
-    ccsMockCompositionIntegratedSettingFree
-};
-
-const CCSIntegratedSettingInfoInterface ccsMockCompositionIntegratedSettingInfo =
-{
-    ccsMockCompositionIntegratedSettingInfoPluginName,
-    ccsMockCompositionIntegratedSettingInfoSettingName,
-    ccsMockCompositionIntegratedSettingInfoGetType,
-    ccsMockCompositionIntegratedSettingInfoFree
-};
-
-CCSIntegratedSetting *
-ccsMockCompositionIntegratedSettingNew (CCSIntegratedSetting          *integratedSetting,
-					CCSMATEIntegratedSettingInfo *mateInfo,
-					CCSIntegratedSettingInfo      *settingInfo,
-					CCSObjectAllocationInterface  *allocator)
-{
-    CCSIntegratedSetting *composition = allocateCCSIntegratedSetting (allocator);
-
-    if (!composition)
-	return NULL;
-
-    CCSMockMATEIntegratedSettingCompositionPrivate *priv = allocatePrivate (composition,
-									     allocator);
-
-    if (!priv)
-	return NULL;
-
-    const CCSInterface *integratedSettingImpl =
-	    (const CCSInterface *) (&ccsMockCompositionIntegratedSetting);
-    const CCSInterface *integratedSettingInfoImpl =
-	    (const CCSInterface *) (&ccsMockCompositionIntegratedSettingInfo);
-    const CCSInterface *mateSettingImpl =
-	    (const CCSInterface *) (&ccsMockCompositionMATEIntegratedSettingInfo);
-
-    priv->integratedSetting          = integratedSetting;
-    priv->mateIntegratedSettingInfo = mateInfo;
-    priv->integratedSettingInfo      = settingInfo;
-
-    ccsIntegratedSettingRef (priv->integratedSetting);
-    ccsMATEIntegratedSettingInfoRef (priv->mateIntegratedSettingInfo);
-
-    ccsObjectSetPrivate (composition, (CCSPrivate *) (priv));
-    ccsObjectAddInterface (composition,
-			   integratedSettingImpl,
-			   GET_INTERFACE_TYPE (CCSIntegratedSettingInterface));
-    ccsObjectAddInterface (composition,
-			   integratedSettingInfoImpl,
-			   GET_INTERFACE_TYPE (CCSIntegratedSettingInfoInterface));
-    ccsObjectAddInterface (composition,
-			   mateSettingImpl,
-			   GET_INTERFACE_TYPE (CCSMATEIntegratedSettingInfoInterface));
-
-    ccsObjectRef (composition);
-
-    return composition;
-}
-
 
=== removed file 'compizconfig/integration/mate/tests/compizconfig_ccs_mock_mate_integrated_setting_composition.h'
--- compizconfig/integration/mate/tests/compizconfig_ccs_mock_mate_integrated_setting_composition.h	2015-02-04 22:20:18 +0000
+++ compizconfig/integration/mate/tests/compizconfig_ccs_mock_mate_integrated_setting_composition.h	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-/*
- * Compiz configuration system library
- *
- * Copyright (C) 2012 Canonical Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
-
- * This library 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
- * Lesser General Public License for more details.
-
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Authored By:
- * Sam Spilsbury <[e-mail]>
- */
-#ifndef _COMPIZCONFIG_CCS_MOCK_MATE_INTEGRATED_SETTING_COMPOSITION_H
-#define _COMPIZCONFIG_CCS_MOCK_MATE_INTEGRATED_SETTING_COMPOSITION_H
-
-#include <ccs-defs.h>
-#include <ccs-fwd.h>
-#include <ccs_mate_fwd.h>
-
-COMPIZCONFIG_BEGIN_DECLS
-
-CCSIntegratedSetting *
-ccsMockCompositionIntegratedSettingNew (CCSIntegratedSetting          *integratedSetting,
-					CCSMATEIntegratedSettingInfo *mateInfo,
-					CCSIntegratedSettingInfo      *settingInfo,
-					CCSObjectAllocationInterface  *allocator);
-
-COMPIZCONFIG_END_DECLS
-
-#endif
-
 
=== removed file 'compizconfig/integration/mate/tests/compizconfig_test_ccs_mate_integration.cpp'
--- compizconfig/integration/mate/tests/compizconfig_test_ccs_mate_integration.cpp	2015-02-04 22:20:18 +0000
+++ compizconfig/integration/mate/tests/compizconfig_test_ccs_mate_integration.cpp	1970-01-01 00:00:00 +0000
@@ -1,981 +0,0 @@
-/*
- * Compiz configuration system library
- *
- * Copyright (C) 2012 Canonical Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
-
- * This library 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
- * Lesser General Public License for more details.
-
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Authored By:
- * Sam Spilsbury <[e-mail]>
- */
-#include <tr1/tuple>
-
-#include <gtest/gtest.h>
-#include <gmock/gmock.h>
-
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
-
-#include <gtest_shared_autodestroy.h>
-#include <gtest_unspecified_bool_type_matcher.h>
-
-#include <compizconfig_ccs_list_wrapper.h>
-#include <compizconfig_ccs_setting_value_operators.h>
-
-#include <ccs.h>
-#include <ccs-backend.h>
-#include <ccs_mate_integrated_setting.h>
-#include <ccs_mate_integration.h>
-#include <ccs_mate_integration_constants.h>
-#include <compizconfig_ccs_context_mock.h>
-#include <compizconfig_ccs_setting_mock.h>
-#include <compizconfig_ccs_plugin_mock.h>
-#include <compizconfig_ccs_backend_mock.h>
-#include <compizconfig_ccs_integrated_setting_factory_mock.h>
-#include <compizconfig_ccs_integrated_setting_storage_mock.h>
-#include <compizconfig_ccs_integrated_setting_mock.h>
-#include "compizconfig_ccs_mock_mate_integrated_setting_composition.h"
-#include "compizconfig_ccs_setting_value_matcher.h"
-
-namespace cc  = compiz::config;
-namespace cci = compiz::config::impl;
-
-using ::testing::Pointee;
-using ::testing::Eq;
-using ::testing::Return;
-using ::testing::ReturnNull;
-using ::testing::SetArgPointee;
-using ::testing::DoAll;
-using ::testing::Values;
-using ::testing::WithParamInterface;
-using ::testing::_;
-
-namespace
-{
-    typedef std::tr1::tuple <CCSIntegratedSettingGMock                &,
-			     boost::shared_ptr <CCSIntegratedSetting>   > IntegratedSettingWithMock;
-
-    typedef boost::shared_ptr <IntegratedSettingWithMock> IntegratedSettingWithMockPtr;
-
-    IntegratedSettingWithMockPtr
-    createIntegratedSettingCompositionFromMock (const std::string            &plugin,
-						const std::string            &setting,
-						CCSSettingType               type,
-						SpecialOptionType            mateType,
-						const std::string            &mateName,
-						CCSObjectAllocationInterface *allocator)
-    {
-	CCSIntegratedSettingInfo *integratedSettingInfo =
-		ccsSharedIntegratedSettingInfoNew (plugin.c_str (),
-						   setting.c_str (),
-						   type,
-						   allocator);
-	/* This takes ownership of integratedSettingInfo */
-	CCSMATEIntegratedSettingInfo *mateIntegratedSettingInfo =
-		ccsMATEIntegratedSettingInfoNew (integratedSettingInfo,
-						  mateType,
-						  mateName.c_str (),
-						  allocator);
-	CCSIntegratedSetting          *integratedSetting =
-		ccsMockIntegratedSettingNew (allocator);
-
-	CCSIntegratedSettingGMock *mockPtr = GET_PRIVATE (CCSIntegratedSettingGMock, integratedSetting)
-	CCSIntegratedSettingGMock &mock (*mockPtr);
-
-	boost::shared_ptr <CCSIntegratedSetting> composition =
-		AutoDestroy (ccsMockCompositionIntegratedSettingNew (integratedSetting,
-								     mateIntegratedSettingInfo,
-								     integratedSettingInfo,
-								     allocator),
-			     ccsIntegratedSettingUnref);
-
-	/* We want the composition to take ownership here, so unref the
-	 * original members of the composition */
-	ccsMATEIntegratedSettingInfoUnref (mateIntegratedSettingInfo);
-	ccsIntegratedSettingUnref (integratedSetting);
-
-	return boost::make_shared <IntegratedSettingWithMock> (mock, composition);
-    }
-
-    CCSIntegratedSettingGMock &
-    Mock (IntegratedSettingWithMock &integratedSettingWithMocks)
-    {
-	return std::tr1::get <0> (integratedSettingWithMocks);
-    }
-
-    CCSIntegratedSetting *
-    Real (IntegratedSettingWithMock &integratedSettingWithMocks)
-    {
-	return std::tr1::get <1> (integratedSettingWithMocks).get ();
-    }
-
-    typedef std::tr1::tuple <CCSContextGMock                   &,
-			     CCSBackendGMock                   &,
-			     CCSIntegratedSettingsStorageGMock &,
-			     CCSIntegratedSettingFactoryGMock  &,
-			     boost::shared_ptr <CCSContext>     ,
-			     boost::shared_ptr <CCSBackend>     ,
-			     CCSIntegratedSettingsStorage      *,
-			     CCSIntegratedSettingFactory       *,
-			     boost::shared_ptr <CCSIntegration> > CCSMATEIntegrationWithMocks;
-
-    CCSMATEIntegrationWithMocks
-    createIntegrationWithMocks (CCSObjectAllocationInterface *ai)
-    {
-	boost::shared_ptr <CCSContext>     context (AutoDestroy (ccsMockContextNew (),
-								 ccsFreeContext));
-	boost::shared_ptr <CCSBackend>     backend (AutoDestroy (ccsMockBackendNew (),
-								 ccsFreeMockBackend));
-	/* The MATE Integration backend takes ownership of these two */
-	CCSIntegratedSettingsStorage       *storage (ccsMockIntegratedSettingsStorageNew (ai));
-	CCSIntegratedSettingFactory        *factory (ccsMockIntegratedSettingFactoryNew (ai));
-	boost::shared_ptr <CCSIntegration> integration (AutoDestroy (ccsMATEIntegrationBackendNew (backend.get (),
-												    context.get (),
-												    factory,
-												    storage,
-												    ai),
-							ccsIntegrationUnref));
-
-	CCSContextGMock                   &gmockContext = *(reinterpret_cast <CCSContextGMock *> (ccsObjectGetPrivate (context.get ())));
-	CCSBackendGMock                   &gmockBackend = *(reinterpret_cast <CCSBackendGMock *> (ccsObjectGetPrivate (backend.get ())));
-	CCSIntegratedSettingsStorageGMock &gmockStorage = *(reinterpret_cast <CCSIntegratedSettingsStorageGMock *> (ccsObjectGetPrivate (storage)));
-	CCSIntegratedSettingFactoryGMock  &gmockFactory = *(reinterpret_cast <CCSIntegratedSettingFactoryGMock *> (ccsObjectGetPrivate (factory)));
-
-	return CCSMATEIntegrationWithMocks (gmockContext,
-					     gmockBackend,
-					     gmockStorage,
-					     gmockFactory,
-					     context,
-					     backend,
-					     storage,
-					     factory,
-					     integration);
-    }
-
-    CCSIntegration *
-    Real (CCSMATEIntegrationWithMocks &integrationWithMocks)
-    {
-	return std::tr1::get <8> (integrationWithMocks).get ();
-    }
-
-    CCSContextGMock &
-    MockContext (CCSMATEIntegrationWithMocks &integrationWithMocks)
-    {
-	return std::tr1::get <0> (integrationWithMocks);
-    }
-
-    CCSIntegratedSettingsStorageGMock &
-    MockStorage (CCSMATEIntegrationWithMocks &integrationWithMocks)
-    {
-	return std::tr1::get <2> (integrationWithMocks);
-    }
-
-    void
-    IgnoreRegistration (CCSIntegratedSettingsStorageGMock &storage)
-    {
-	EXPECT_CALL (storage, empty ()).WillOnce (Return (FALSE));
-    }
-
-    void
-    AllowReadability (CCSSettingGMock &setting)
-    {
-	EXPECT_CALL (setting, isReadableByBackend ()).WillOnce (Return (TRUE));
-    }
-
-    void
-    ExpectWriteSettings (CCSContextGMock &context)
-    {
-	EXPECT_CALL (context, writeChangedSettings ());
-    }
-
-    void
-    SetNames (CCSSettingGMock   &setting,
-	      CCSPluginGMock    &plugin,
-	      const std::string &settingName,
-	      const std::string &pluginName)
-    {
-	EXPECT_CALL (setting, getName ()).WillOnce (Return (settingName.c_str ()));
-	EXPECT_CALL (setting, getParent ());
-	EXPECT_CALL (plugin, getName ()).WillOnce (Return (pluginName.c_str ()));
-    }
-
-    void
-    SetTypeInfo (CCSSettingGMock &setting,
-		 CCSSettingType  type,
-		 CCSSettingInfo  *info)
-    {
-	EXPECT_CALL (setting, getType ()).WillOnce (Return (type));
-	EXPECT_CALL (setting, getInfo ()).WillOnce (Return (info));
-    }
-
-    CCSSettingValue *
-    MakeSettingValue ()
-    {
-	CCSSettingValue *v = reinterpret_cast <CCSSettingValue *> (calloc (1, sizeof (CCSSettingValue)));
-	v->parent = NULL;
-	v->isListChild = FALSE;
-	v->refCount = 1;
-
-	return v;
-    }
-
-    boost::shared_ptr <CCSSettingValue>
-    MakeAutoDestroySettingValue (CCSSettingType type)
-    {
-	CCSSettingValue *v = reinterpret_cast <CCSSettingValue *> (calloc (1, sizeof (CCSSettingValue)));
-	v->parent = NULL;
-	v->isListChild = FALSE;
-	v->refCount = 1;
-
-	return boost::shared_ptr <CCSSettingValue> (v,
-						    boost::bind (ccsFreeSettingValueWithType, _1, type));
-    }
-
-    const std::string MOCK_PLUGIN ("mock");
-    const std::string MOCK_SETTING ("mock");
-    const std::string MOCK_MATE_NAME ("mock");
-    const CCSSettingType MOCK_SETTING_TYPE = TypeInt;
-    const SpecialOptionType MOCK_MATE_SETTING_TYPE = OptionInt;
-}
-
-TEST (CCSMATEIntegrationTest, TestConstructComposition)
-{
-    IntegratedSettingWithMockPtr settingWithMock (
-	createIntegratedSettingCompositionFromMock (MOCK_PLUGIN,
-						    MOCK_SETTING,
-						    MOCK_SETTING_TYPE,
-						    MOCK_MATE_SETTING_TYPE,
-						    MOCK_MATE_NAME,
-						    &ccsDefaultObjectAllocator));
-}
-
-class CCSMATEIntegrationTestWithMocks :
-    public ::testing::Test
-{
-    public:
-
-	CCSMATEIntegrationTestWithMocks () :
-	    mIntegration (createIntegrationWithMocks (&ccsDefaultObjectAllocator)),
-	    mSetting (AutoDestroy (ccsMockSettingNew (),
-				   ccsSettingUnref)),
-	    mSettingMock ((*(reinterpret_cast <CCSSettingGMock *> (ccsObjectGetPrivate (mSetting.get ()))))),
-	    mIntegratedSetting (),
-	    mPlugin (AutoDestroy (ccsMockPluginNew (),
-				  ccsPluginUnref)),
-	    mPluginMock ((*(reinterpret_cast <CCSPluginGMock *> (ccsObjectGetPrivate (mPlugin.get ())))))
-	{
-	    ON_CALL (mSettingMock, getParent ()).WillByDefault (Return (mPlugin.get ()));
-	}
-
-    protected:
-
-	CCSMATEIntegrationWithMocks   mIntegration;
-	boost::shared_ptr <CCSSetting> mSetting;
-	CCSSettingGMock                &mSettingMock;
-	IntegratedSettingWithMockPtr   mIntegratedSetting;
-	boost::shared_ptr <CCSPlugin>  mPlugin;
-	CCSPluginGMock                 &mPluginMock;
-};
-
-class CCSMATEIntegrationTestReadIntegrated :
-    public CCSMATEIntegrationTestWithMocks
-{
-    public:
-
-	virtual void SetUp ()
-	{
-	    IgnoreRegistration (MockStorage (mIntegration));
-	    AllowReadability (mSettingMock);
-	}
-};
-
-class CCSMATEIntegrationTestWriteIntegrated :
-    public CCSMATEIntegrationTestWithMocks
-{
-    public:
-
-	virtual void SetUp ()
-	{
-	    IgnoreRegistration (MockStorage (mIntegration));
-	    ExpectWriteSettings (MockContext (mIntegration));
-	}
-};
-
-TEST_F (CCSMATEIntegrationTestWithMocks, TestConstructMATEIntegration)
-{
-}
-
-TEST_F (CCSMATEIntegrationTestWithMocks, TestGetIntegratedSettingFromStorage)
-{
-    mIntegratedSetting = createIntegratedSettingCompositionFromMock (MOCK_PLUGIN,
-								     MOCK_SETTING,
-								     TypeBool,
-								     OptionSpecial,
-								     MOCK_MATE_NAME,
-								     &ccsDefaultObjectAllocator);
-
-    CCSIntegratedSettingList returnIntegratedSettings =
-	ccsIntegratedSettingListAppend (NULL, Real (*mIntegratedSetting));
-    CCSIntegratedSettingsStorageGMock &mockStorage (MockStorage (mIntegration));
-
-    EXPECT_CALL (mockStorage, empty ()).WillOnce (Return (FALSE));
-    EXPECT_CALL (mockStorage, findMatchingSettingsByPluginAndSettingName (Eq (MOCK_PLUGIN),
-									  Eq (MOCK_SETTING)))
-	    .WillOnce (Return (returnIntegratedSettings));
-
-    EXPECT_EQ (Real (*mIntegratedSetting),
-	       ccsIntegrationGetIntegratedSetting (Real (mIntegration),
-						   MOCK_PLUGIN.c_str (),
-						   MOCK_SETTING.c_str ()));
-}
-
-TEST_F (CCSMATEIntegrationTestReadIntegrated, TestReadInKeyOption)
-{
-    CCSSettingValue *v = MakeSettingValue ();
-    v->value.asString = strdup ("<Control>a");
-
-    mIntegratedSetting = createIntegratedSettingCompositionFromMock (MOCK_PLUGIN,
-								     MOCK_SETTING,
-								     TypeKey,
-								     OptionKey,
-								     MOCK_MATE_NAME,
-								     &ccsDefaultObjectAllocator);
-
-    CCSSettingKeyValue keyValue;
-    ASSERT_TRUE (ccsStringToKeyBinding (v->value.asString, &keyValue));
-    EXPECT_CALL (Mock (*mIntegratedSetting), readValue (TypeKey)).WillOnce (Return (v));
-    EXPECT_CALL (mSettingMock, setKey (Eq (keyValue), IsTrue ()));
-
-    EXPECT_THAT (ccsIntegrationReadOptionIntoSetting (Real (mIntegration),
-						      NULL,
-						      mSetting.get (),
-						      Real (*mIntegratedSetting)), IsTrue ());
-}
-
-TEST_F (CCSMATEIntegrationTestReadIntegrated, TestReadInSpecialOptionCurrentViewport)
-{
-    const std::string settingName ("current_viewport");
-    CCSSettingValue   *v = MakeSettingValue ();
-    v->value.asBool = FALSE;
-
-    mIntegratedSetting = createIntegratedSettingCompositionFromMock (MOCK_PLUGIN,
-								     settingName,
-								     TypeBool,
-								     OptionSpecial,
-								     MOCK_MATE_NAME,
-								     &ccsDefaultObjectAllocator);
-    SetNames (mSettingMock, mPluginMock, settingName, MOCK_PLUGIN);
-    EXPECT_CALL (Mock (*mIntegratedSetting), readValue (TypeBool)).WillOnce (Return (v));
-    EXPECT_CALL (mSettingMock, setBool (IsTrue (), IsTrue ()));
-
-    EXPECT_THAT (ccsIntegrationReadOptionIntoSetting (Real (mIntegration),
-						      NULL,
-						      mSetting.get (),
-						      Real (*mIntegratedSetting)), IsTrue ());
-}
-
-TEST_F (CCSMATEIntegrationTestReadIntegrated, TestReadInSpecialOptionFullscreenVisualBell)
-{
-    const std::string settingName ("fullscreen_visual_bell");
-    CCSSettingValue   *v = MakeSettingValue ();
-    v->value.asString = strdup ("fullscreen");
-
-    mIntegratedSetting = createIntegratedSettingCompositionFromMock (MOCK_PLUGIN,
-								     settingName,
-								     TypeString,
-								     OptionSpecial,
-								     MOCK_MATE_NAME,
-								     &ccsDefaultObjectAllocator);
-    SetNames (mSettingMock, mPluginMock, settingName, MOCK_PLUGIN);
-    EXPECT_CALL (Mock (*mIntegratedSetting), readValue (TypeString)).WillOnce (Return (v));
-    EXPECT_CALL (mSettingMock, setBool (IsTrue (), IsTrue ()));
-
-    EXPECT_THAT (ccsIntegrationReadOptionIntoSetting (Real (mIntegration),
-						      NULL,
-						      mSetting.get (),
-						      Real (*mIntegratedSetting)), IsTrue ());
-}
-
-TEST_F (CCSMATEIntegrationTestReadIntegrated, TestReadInSpecialOptionClickToFocus)
-{
-    const std::string settingName ("click_to_focus");
-    CCSSettingValue   *v = MakeSettingValue ();
-    v->value.asString = strdup ("click");
-
-    mIntegratedSetting = createIntegratedSettingCompositionFromMock (MOCK_PLUGIN,
-								     settingName,
-								     TypeString,
-								     OptionSpecial,
-								     MOCK_MATE_NAME,
-								     &ccsDefaultObjectAllocator);
-    SetNames (mSettingMock, mPluginMock, settingName, MOCK_PLUGIN);
-    EXPECT_CALL (Mock (*mIntegratedSetting), readValue (TypeString)).WillOnce (Return (v));
-    EXPECT_CALL (mSettingMock, setBool (IsTrue (), IsTrue ()));
-
-    EXPECT_THAT (ccsIntegrationReadOptionIntoSetting (Real (mIntegration),
-						      NULL,
-						      mSetting.get (),
-						      Real (*mIntegratedSetting)), IsTrue ());
-}
-
-namespace
-{
-    struct IntegratedMediaKeysParam
-    {
-	public:
-
-	    IntegratedMediaKeysParam (const std::string &settingName,
-				      const std::string &integratedName,
-				      const std::string &keyValueString) :
-		settingName (settingName),
-		integratedName (integratedName),
-		keyValueString (keyValueString)
-	    {
-		EXPECT_TRUE (ccsStringToKeyBinding (keyValueString.c_str (),
-						    &keyValue));
-	    }
-
-	    const std::string  settingName;
-	    const std::string  integratedName;
-	    const std::string  keyValueString;
-	    CCSSettingKeyValue keyValue;
-    };
-}
-
-namespace
-{
-    std::string RUN_COMMAND_SCREENSHOT_KEY ("run_command_screenshot_key");
-    std::string SCREENSHOT ("screenshot");
-    std::string SCREENSHOT_BINDING ("<Alt>Print");
-    std::string RUN_COMMAND_WINDOW_SCREENSHOT_KEY ("run_command_window_screenshot_key");
-    std::string WINDOW_SCREENSHOT ("window_screenshot");
-    std::string WINDOW_SCREENSHOT_BINDING ("<Control><Alt>Print");
-    std::string RUN_COMMAND_TERMINAL_KEY ("run_command_terminal_key");
-    std::string TERMINAL ("terminal");
-    std::string TERMINAL_BINDING ("<Control><Alt>t");
-}
-
-class CCSMATEIntegrationTestReadIntegratedMediaKeys :
-    public CCSMATEIntegrationTestReadIntegrated,
-    public WithParamInterface <IntegratedMediaKeysParam>
-{
-};
-
-TEST_P (CCSMATEIntegrationTestReadIntegratedMediaKeys, TestReadIntegratedMediaKey)
-{
-    const std::string settingName (GetParam ().settingName);
-    CCSSettingValue   *v = MakeSettingValue ();
-    v->value.asString = strdup (GetParam ().keyValueString.c_str ());
-
-    mIntegratedSetting = createIntegratedSettingCompositionFromMock (MOCK_PLUGIN,
-								     settingName,
-								     TypeString,
-								     OptionSpecial,
-								     MOCK_MATE_NAME,
-								     &ccsDefaultObjectAllocator);
-    SetNames (mSettingMock, mPluginMock, settingName, MOCK_PLUGIN);
-    EXPECT_CALL (Mock (*mIntegratedSetting), readValue (TypeString)).WillOnce (Return (v));
-    EXPECT_CALL (mSettingMock, setKey (Eq (GetParam ().keyValue), IsTrue ()));
-
-    EXPECT_THAT (ccsIntegrationReadOptionIntoSetting (Real (mIntegration),
-						      NULL,
-						      mSetting.get (),
-						      Real (*mIntegratedSetting)), IsTrue ());
-}
-
-INSTANTIATE_TEST_CASE_P (CCSMATEMediaKeys, CCSMATEIntegrationTestReadIntegratedMediaKeys,
-			 Values (IntegratedMediaKeysParam (RUN_COMMAND_SCREENSHOT_KEY,
-							   SCREENSHOT,
-							   SCREENSHOT_BINDING),
-				 IntegratedMediaKeysParam (RUN_COMMAND_WINDOW_SCREENSHOT_KEY,
-							   WINDOW_SCREENSHOT,
-							   WINDOW_SCREENSHOT_BINDING),
-				 IntegratedMediaKeysParam (RUN_COMMAND_TERMINAL_KEY,
-							   TERMINAL,
-							   TERMINAL_BINDING)));
-
-namespace
-{
-    const std::string DEFAULT_MOUSE_BUTTON_MODIFIERS_STRING ("<Alt>");
-    const std::string MATE_MOUSE_BUTTON_MODIFIERS_STRING ("<Super>");
-    const unsigned int DEFAULT_MOUSE_BUTTON_MODIFIERS =
-	ccsStringToModifiers (DEFAULT_MOUSE_BUTTON_MODIFIERS_STRING.c_str ());
-    const unsigned int MATE_MOUSE_BUTTON_MODIFIERS =
-	ccsStringToModifiers (MATE_MOUSE_BUTTON_MODIFIERS_STRING.c_str ());
-
-    const unsigned int LEFT_BUTTON = 1;
-    const unsigned int MIDDLE_BUTTON = 2;
-    const unsigned int RIGHT_BUTTON = 3;
-}
-
-class CCSMATEIntegrationTestWithMocksIntegratedMouseButtonModifiers
-{
-    public:
-
-	virtual ~CCSMATEIntegrationTestWithMocksIntegratedMouseButtonModifiers () {}
-
-	CCSMATEIntegrationTestWithMocksIntegratedMouseButtonModifiers () :
-	    mIntegratedSettingMBM (AutoDestroy (ccsMockIntegratedSettingNew (&ccsDefaultObjectAllocator),
-						ccsIntegratedSettingUnref)),
-	    mIntegratedSettingMBMMock (*(reinterpret_cast <CCSIntegratedSettingGMock *> (ccsObjectGetPrivate (mIntegratedSettingMBM.get ())))),
-	    mIntegratedSettingResizeWithRB (AutoDestroy (ccsMockIntegratedSettingNew (&ccsDefaultObjectAllocator),
-							 ccsIntegratedSettingUnref)),
-	    mIntegratedSettingResizeWithRBMock (*(reinterpret_cast <CCSIntegratedSettingGMock *> (ccsObjectGetPrivate (mIntegratedSettingResizeWithRB.get ()))))
-	{
-	    memset (&mButtonValue, 0, sizeof (CCSSettingButtonValue));
-
-	    mButtonValue.button        = MIDDLE_BUTTON;
-	    mButtonValue.buttonModMask = DEFAULT_MOUSE_BUTTON_MODIFIERS;
-	    mButtonValue.edgeMask      = 0;
-	}
-
-	virtual void MateSetUp (CCSMATEIntegrationWithMocks &integration)
-	{
-	    /* Create new lists as we expect the caller to free them once it
-	     * has retreived them */
-	    CCSIntegratedSettingList integratedSettingsMBM =
-		ccsIntegratedSettingListAppend (NULL, mIntegratedSettingMBM.get ());
-	    CCSIntegratedSettingList integratedSettingsResizeWithRB =
-		ccsIntegratedSettingListAppend (NULL, mIntegratedSettingResizeWithRB.get ());
-
-	    EXPECT_CALL (MockStorage (integration),
-			 findMatchingSettingsByPluginAndSettingName (Eq (std::string (ccsMATEIntegratedPluginNames.SPECIAL)),
-								     Eq (std::string (ccsMATEIntegratedSettingNames.NULL_MOUSE_BUTTON_MODIFIER.compizName))))
-		.WillOnce (Return (integratedSettingsMBM));
-	    EXPECT_CALL (MockStorage (integration),
-			 findMatchingSettingsByPluginAndSettingName (Eq (std::string (ccsMATEIntegratedPluginNames.SPECIAL)),
-								     Eq (std::string (ccsMATEIntegratedSettingNames.NULL_RESIZE_WITH_RIGHT_BUTTON.compizName))))
-		.WillOnce (Return (integratedSettingsResizeWithRB));
-	}
-
-
-    protected:
-
-	boost::shared_ptr <CCSIntegratedSetting> mIntegratedSettingMBM;
-	CCSIntegratedSettingGMock                &mIntegratedSettingMBMMock;
-	boost::shared_ptr <CCSIntegratedSetting> mIntegratedSettingResizeWithRB;
-	CCSIntegratedSettingGMock                &mIntegratedSettingResizeWithRBMock;
-	CCSSettingButtonValue                    mButtonValue;
-};
-
-class CCSMATEIntegrationTestWithMocksReadIntegratedMouseButtonModifiers :
-    public CCSMATEIntegrationTestReadIntegrated,
-    public CCSMATEIntegrationTestWithMocksIntegratedMouseButtonModifiers
-{
-    public:
-
-	virtual void SetUp ()
-	{
-	    CCSSettingValue   *vRB = MakeSettingValue ();
-	    CCSSettingValue   *vMBM = MakeSettingValue ();
-	    vRB->value.asBool = TRUE;
-	    vMBM->value.asString = strdup (MATE_MOUSE_BUTTON_MODIFIERS_STRING.c_str ());
-
-	    CCSMATEIntegrationTestReadIntegrated::SetUp ();
-	    CCSMATEIntegrationTestWithMocksIntegratedMouseButtonModifiers::MateSetUp (mIntegration);
-
-	    EXPECT_CALL (mSettingMock, getButton (_))
-		    .WillOnce (DoAll (
-				SetArgPointee <0> (
-				  mButtonValue),
-				Return (TRUE)));
-
-	    /* Get the MATE Mouse button modifier */
-	    EXPECT_CALL (mIntegratedSettingMBMMock, readValue (TypeString)).WillOnce (Return (vMBM));
-	    EXPECT_CALL (mIntegratedSettingResizeWithRBMock, readValue (TypeBool)).WillOnce (Return (vRB));
-	}
-};
-
-class CCSMATEIntegrationTestWithMocksWriteIntegratedMouseButtonModifiers :
-    public CCSMATEIntegrationTestWriteIntegrated,
-    public CCSMATEIntegrationTestWithMocksIntegratedMouseButtonModifiers
-{
-    public:
-
-	CCSMATEIntegrationTestWithMocksWriteIntegratedMouseButtonModifiers () :
-	    corePlugin (AutoDestroy (ccsMockPluginNew (),
-				     ccsPluginUnref)),
-	    corePluginMock (*(reinterpret_cast <CCSPluginGMock *> (ccsObjectGetPrivate (corePlugin.get ())))),
-	    resizePlugin (AutoDestroy (ccsMockPluginNew (),
-				       ccsPluginUnref)),
-	    resizePluginMock (*(reinterpret_cast <CCSPluginGMock *> (ccsObjectGetPrivate (resizePlugin.get ())))),
-	    movePlugin (AutoDestroy (ccsMockPluginNew (),
-				     ccsPluginUnref)),
-	    movePluginMock (*(reinterpret_cast <CCSPluginGMock *> (ccsObjectGetPrivate (movePlugin.get ())))),
-	    resizeInitiateButtonSetting (AutoDestroy (ccsMockSettingNew (),
-						      ccsSettingUnref)),
-	    resizeInitiateButtonSettingMock (*(reinterpret_cast <CCSSettingGMock *> (ccsObjectGetPrivate (resizeInitiateButtonSetting.get ())))),
-	    moveInitiateButtonSetting (AutoDestroy (ccsMockSettingNew (),
-						    ccsSettingUnref)),
-	    moveInitiateButtonSettingMock (*(reinterpret_cast <CCSSettingGMock *> (ccsObjectGetPrivate (moveInitiateButtonSetting.get ())))),
-	    coreWindowMenuSetting (AutoDestroy (ccsMockSettingNew (),
-						ccsSettingUnref)),
-	    coreWindowMenuSettingMock (*(reinterpret_cast <CCSSettingGMock *> (ccsObjectGetPrivate (coreWindowMenuSetting.get ())))),
-	    resizeInitiateButton (MakeAutoDestroySettingValue (TypeButton)),
-	    moveInitiateButton (MakeAutoDestroySettingValue (TypeButton)),
-	    coreWindowMenuButton (MakeAutoDestroySettingValue (TypeButton))
-	{
-	    resizeInitiateButton->value.asButton.button = LEFT_BUTTON;
-	    resizeInitiateButton->value.asButton.buttonModMask = 0;
-	    resizeInitiateButton->value.asButton.edgeMask = 0;
-	    moveInitiateButton->value.asButton.button = LEFT_BUTTON;
-	    moveInitiateButton->value.asButton.buttonModMask = DEFAULT_MOUSE_BUTTON_MODIFIERS;
-	    moveInitiateButton->value.asButton.edgeMask = 0;
-	    coreWindowMenuButton->value.asButton.button = MIDDLE_BUTTON;
-	    coreWindowMenuButton->value.asButton.buttonModMask = 0;
-	    coreWindowMenuButton->value.asButton.edgeMask = 0;
-	}
-
-	virtual void SetUp ()
-	{
-	    CCSMATEIntegrationTestWriteIntegrated::SetUp ();
-	    CCSMATEIntegrationTestWithMocksIntegratedMouseButtonModifiers::MateSetUp (mIntegration);
-	}
-
-    protected:
-
-	boost::shared_ptr <CCSPlugin> corePlugin;
-	CCSPluginGMock                &corePluginMock;
-	boost::shared_ptr <CCSPlugin> resizePlugin;
-	CCSPluginGMock                &resizePluginMock;
-	boost::shared_ptr <CCSPlugin> movePlugin;
-	CCSPluginGMock                &movePluginMock;
-
-	boost::shared_ptr <CCSSetting> resizeInitiateButtonSetting;
-	CCSSettingGMock                &resizeInitiateButtonSettingMock;
-	boost::shared_ptr <CCSSetting> moveInitiateButtonSetting;
-	CCSSettingGMock                &moveInitiateButtonSettingMock;
-	boost::shared_ptr <CCSSetting> coreWindowMenuSetting;
-	CCSSettingGMock                &coreWindowMenuSettingMock;
-
-	boost::shared_ptr <CCSSettingValue> resizeInitiateButton;
-	boost::shared_ptr <CCSSettingValue> moveInitiateButton;
-	boost::shared_ptr <CCSSettingValue> coreWindowMenuButton;
-};
-
-TEST_F (CCSMATEIntegrationTestWithMocksReadIntegratedMouseButtonModifiers, TestReadInSpecialOptionMoveInitiateButton)
-{
-    const std::string settingName ("initiate_button");
-    const std::string pluginName ("move");
-
-    CCSSettingButtonValue newButtonValue = mButtonValue;
-    newButtonValue.button = LEFT_BUTTON;
-    newButtonValue.buttonModMask = MATE_MOUSE_BUTTON_MODIFIERS;
-
-    mIntegratedSetting = createIntegratedSettingCompositionFromMock (pluginName,
-								     settingName,
-								     TypeBool,
-								     OptionSpecial,
-								     MOCK_MATE_NAME,
-								     &ccsDefaultObjectAllocator);
-    SetNames (mSettingMock, mPluginMock, settingName, pluginName);
-