Merge lp:~smspillaz/compiz-libcompizconfig/compiz-libcompizconfig.context-funcs-behind-interface into lp:~compiz-team/compiz-libcompizconfig/0.9.8

[Sam Spilsbury]

This is all about bug 990690.

!! - It probably isn't a good idea to test this branch in isolation, as it is part of a pipeline to get compiz-libcompizconfig under test. If you want to test the result of this work, you should probably look at testing

lp:~smspillaz/compiz-libcompizconfig/compiz-libcompizconfig.mock-context
lp:~smspillaz/compiz-compizconfig-python/compiz-compizconfig-python.setting-api
lp:~smspillaz/compiz-compizconfig-gconf/compiz-compizconfig-gconf.adapt-to-new-interfaces

.. that's all !!

This branch converts the context object to use the base object in its implementation and indirects all of the context object's api through an interface.

Unmerged revisions

440. By Sam Spilsbury on 2012-04-28

Use the interface constructs in CCSObject to implement the interface

439. By Sam Spilsbury on 2012-04-28

Use the finalize func

438. By Sam Spilsbury on 2012-04-28

Merged refactor-context into context-funcs-behind-interface.

437. By Sam Spilsbury on 2012-04-28

Merged refactor-context into context-funcs-behind-interface.

436. By Sam Spilsbury on 2012-04-28

Migrate CCSContext to CCSObject

435. By Sam Spilsbury on 2012-04-28

Merge

434. By Sam Spilsbury on 2012-04-28

Merged refactor-context into context-funcs-behind-interface.

433. By Sam Spilsbury on 2012-04-19

Hide the private stuff behind the interface too

432. By Sam Spilsbury on 2012-04-19

Hide all of the public CCSContext API behind interface

431. By Sam Spilsbury on 2012-04-19

Made interfaces bindable

=== modified file 'include/ccs.h'
--- include/ccs.h	2012-04-28 18:57:21 +0000
+++ include/ccs.h	2012-04-28 18:57:21 +0000
@@ -169,8 +169,7 @@
 unsigned int
 ccsAllocateType ();
 
-#define GET_INTERFACE_TYPE(Interface) \
-    ccs##Interface##GetType ();
+#define GET_INTERFACE_TYPE(Interface) ccs##Interface##GetType ()
 
 #define INTERFACE_TYPE(Interface) \
     inline unsigned int ccs##Interface##GetType () \
@@ -182,6 +181,8 @@
 	return type_id; \
     }
 
+#define GET_INTERFACE(CType,IType, o) (CType *) ccsObjectGetInterface ((CCSObject *) o, IType)
+
 /**
  * reference counting
  * 
@@ -232,6 +233,31 @@
 typedef CCSSettingList (*CCSContextStealChangedSettings) (CCSContext *context);
 typedef void * (*CCSContextGetPrivatePtr) (CCSContext *context);
 typedef void (*CCSContextSetPrivatePtr) (CCSContext *context, void *ptr);
+typedef Bool (*CCSContextLoadPlugin) (CCSContext *context, char *name);
+typedef CCSPlugin * (*CCSContextFindPlugin) (CCSContext *context, const char *name);
+typedef Bool (*CCSContextPluginIsActive) (CCSContext *context, char *name);
+typedef CCSPluginList (*CCSContextGetActivePluginList) (CCSContext *context);
+typedef CCSStringList (*CCSContextGetSortedPluginStringList) (CCSContext *context);
+typedef Bool (*CCSContextSetBackend) (CCSContext *context, char *name);
+typedef char * (*CCSContextGetBackend) (CCSContext *context);
+typedef void (*CCSContextSetIntegrationEnabled) (CCSContext *context, Bool value);
+typedef void (*CCSContextSetProfile) (CCSContext *context, char *name);
+typedef void (*CCSContextSetPluginListAutoSort) (CCSContext *context, Bool value);
+typedef char * (*CCSContextGetProfile) (CCSContext *context);
+typedef Bool (*CCSContextGetIntegrationEnabled) (CCSContext *context);
+typedef Bool (*CCSContextGetPluginListAutoSort) (CCSContext *context);
+typedef void (*CCSContextProcessEvents) (CCSContext *context, unsigned int flags);
+typedef void (*CCSContextReadSettings) (CCSContext *context);
+typedef void (*CCSContextWriteSettings) (CCSContext *context);
+typedef void (*CCSContextWriteChangedSettings) (CCSContext *context);
+typedef Bool (*CCSContextExportToFile) (CCSContext *context, const char *fileName, Bool skipDefaults);
+typedef Bool (*CCSContextImportFromFile) (CCSContext *context, const char *fileName, Bool overwriteNonDefault);
+typedef CCSPluginConflictList (*CCSContextCanEnablePlugin) (CCSContext *context, CCSPlugin *plugin);
+typedef CCSPluginConflictList (*CCSContextCanDisablePlugin) (CCSContext *context, CCSPlugin *plugin);
+typedef CCSStringList (*CCSContextGetExistingProfiles) (CCSContext *context);
+typedef void (*CCSContextDeleteProfile) (CCSContext *context, char *name);
+typedef Bool (*CCSContextCheckForSettingsUpgrade) (CCSContext *context);
+typedef void (*CCSContextLoadPlugins) (CCSContext *context);
 
 struct _CCSContextInterface
 {
@@ -244,8 +270,35 @@
     CCSContextStealChangedSettings contextStealChangedSettings;
     CCSContextGetPrivatePtr contextGetPrivatePtr;
     CCSContextSetPrivatePtr contextSetPrivatePtr;
+    CCSContextLoadPlugin contextLoadPlugin;
+    CCSContextFindPlugin contextFindPlugin;
+    CCSContextPluginIsActive contextPluginIsActive;
+    CCSContextGetActivePluginList contextGetActivePluginList;
+    CCSContextGetSortedPluginStringList contextGetSortedPluginStringList;
+    CCSContextSetBackend contextSetBackend;
+    CCSContextGetBackend contextGetBackend;
+    CCSContextSetIntegrationEnabled contextSetIntegrationEnabled;
+    CCSContextSetProfile contextSetProfile;
+    CCSContextSetPluginListAutoSort contextSetPluginListAutoSort;
+    CCSContextGetProfile contextGetProfile;
+    CCSContextGetIntegrationEnabled contextGetIntegrationEnabled;
+    CCSContextGetPluginListAutoSort contextGetPluginListAutoSort;
+    CCSContextProcessEvents contextProcessEvents;
+    CCSContextReadSettings contextReadSettings;
+    CCSContextWriteSettings contextWriteSettings;
+    CCSContextWriteChangedSettings contextWriteChangedSettings;
+    CCSContextExportToFile contextExportToFile;
+    CCSContextImportFromFile contextImportFromFile;
+    CCSContextCanEnablePlugin contextCanEnablePlugin;
+    CCSContextCanDisablePlugin contextCanDisablePlugin;
+    CCSContextGetExistingProfiles contextGetExistingProfiles;
+    CCSContextDeleteProfile contextDeleteProfile;
+    CCSContextCheckForSettingsUpgrade contextCheckForSettingsUpgrade;
+    CCSContextLoadPlugins contextLoadPlugins;
 };
 
+inline unsigned int ccsCCSContextInterfaceGetType ();
+
 /* CCSContext accessor functions */
 CCSPluginList ccsContextGetPlugins (CCSContext *);
 CCSPluginCategory * ccsContextGetCategories (CCSContext *);
@@ -264,10 +317,11 @@
 
 struct _CCSContext
 {
-    void              *ccsPrivate;     /* private pointer for compizconfig
-					  internal usage */
+    CCSObject object;
 };
 
+#define CCS_CONTEXT_INTERFACE_TYPE GET_INTERFACE_TYPE(CCSContextInterface)
+
 struct _CCSBackendInfo
 {
     char *name;              /* name of the backend */
@@ -1008,9 +1062,6 @@
 
 CCSStrExtensionList ccsGetPluginStrExtensions (CCSPlugin *plugin);
 
-/* Checks if settings need to be constrained */
-Bool ccsContextNeedsConstraining (CCSContext *context);
-
 #ifdef __cplusplus
 }
 #endif

=== modified file 'src/ccs-private.h'
--- src/ccs-private.h	2012-04-28 18:57:21 +0000
+++ src/ccs-private.h	2012-04-28 18:57:21 +0000
@@ -26,7 +26,7 @@
 #include <ccs-backend.h>
 
 #define CONTEXT_PRIV(c) \
-    CCSContextPrivate *cPrivate = (CCSContextPrivate *) c->ccsPrivate;
+    CCSContextPrivate *cPrivate = (CCSContextPrivate *) ccsObjectGetPrivate ((CCSObject *) c);
 #define PLUGIN_PRIV(p) \
     CCSPluginPrivate *pPrivate = (CCSPluginPrivate *) p->ccsPrivate;
 
@@ -51,7 +51,6 @@
 
     unsigned int screenNum; /* screen number this context is assigned to */
     const CCSInterfaceTable *object_interfaces;
-    const CCSContextInterface *interface;
 } CCSContextPrivate;
 
 typedef struct _CCSPluginPrivate
@@ -89,6 +88,9 @@
 void ccsLoadPluginSettings (CCSPlugin * plugin);
 void collateGroups (CCSPluginPrivate * p);
 
+Bool ccsLoadPluginDefault (CCSContext *context, char *name);
+void ccsLoadPluginsDefault (CCSContext *context);
+
 void ccsCheckFileWatches (void);
 
 typedef enum {

=== modified file 'src/compiz.cpp'
--- src/compiz.cpp	2012-04-28 18:57:21 +0000
+++ src/compiz.cpp	2012-04-28 18:57:21 +0000
@@ -2991,7 +2991,7 @@
 #endif
 
 Bool
-ccsLoadPlugin (CCSContext * context, char *name)
+ccsLoadPluginDefault (CCSContext * context, char *name)
 {
 #ifdef USE_PROTOBUF
     initPBLoading ();
@@ -3021,8 +3021,14 @@
     return (ccsFindPlugin (context, name) != NULL);
 }
 
+Bool
+ccsLoadPlugin (CCSContext *context, char *name)
+{
+    return (*(GET_INTERFACE (CCSContextInterface, CCS_CONTEXT_INTERFACE_TYPE, context))->contextLoadPlugin) (context, name);
+}
+
 void
-ccsLoadPlugins (CCSContext * context)
+ccsLoadPluginsDefault (CCSContext * context)
 {
     D (D_FULL, "Adding plugins\n");
 
@@ -3056,6 +3062,12 @@
     loadPluginsFromName (context, (char *)PLUGINDIR);
 }
 
+void
+ccsLoadPlugins (CCSContext *context)
+{
+    (*(GET_INTERFACE (CCSContextInterface, CCS_CONTEXT_INTERFACE_TYPE, context))->contextLoadPlugins) (context);
+}
+
 static void
 loadOptionsStringExtensionsFromXML (CCSPlugin * plugin,
 				    void * pluginPBv,

=== modified file 'src/main.c'
--- src/main.c	2012-04-28 18:57:21 +0000
+++ src/main.c	2012-04-28 18:57:21 +0000
@@ -167,6 +167,8 @@
     return start;
 }
 
+INTERFACE_TYPE (CCSContextInterface)
+
 Bool basicMetadata = FALSE;
 
 void
@@ -231,19 +233,22 @@
     if (!context)
 	return NULL;
 
-    context->ccsPrivate = calloc (1, sizeof (CCSContextPrivate));
-    if (!context->ccsPrivate)
+    CCSContextPrivate *ccsPrivate = calloc (1, sizeof (CCSContextPrivate));
+    if (!ccsPrivate)
     {
 	free (context);
 	return NULL;
     }
 
+    ccsObjectSetPrivate ((CCSObject *) context, (CCSPrivate *) ccsPrivate);
+
     CONTEXT_PRIV (context);
 
     cPrivate->object_interfaces = object_interfaces;
-    cPrivate->interface = object_interfaces->contextInterface;
     cPrivate->screenNum = screenNum;
 
+    ccsObjectAddInterface ((CCSObject *) context, (CCSInterface *) object_interfaces->contextInterface, CCS_CONTEXT_INTERFACE_TYPE);
+
     initGeneralOptions (context);
     cPrivate->configWatchId = ccsAddConfigWatch (context, configChangeNotify);
 
@@ -336,89 +341,58 @@
     return l;
 }
 
-static const CCSContextInterface ccsDefaultContextInterface =
-{
-    ccsContextGetPluginsDefault,
-    ccsContextGetCategoriesDefault,
-    ccsContextGetChangedSettingsDefault,
-    ccsContextGetScreenNumDefault,
-    ccsContextAddChangedSettingDefault,
-    ccsContextClearChangedSettingsDefault,
-    ccsContextStealChangedSettingsDefault,
-    ccsContextGetPrivatePtrDefault,
-    ccsContextSetPrivatePtrDefault
-};
-
 CCSPluginList
 ccsContextGetPlugins (CCSContext *context)
 {
-    CONTEXT_PRIV (context);
-
-    return (*cPrivate->interface->contextGetPlugins) (context);
+    return (*(GET_INTERFACE (CCSContextInterface, CCS_CONTEXT_INTERFACE_TYPE, context))->contextGetPlugins) (context);
 }
 
 CCSPluginCategory *
 ccsContextGetCategories (CCSContext *context)
 {
-    CONTEXT_PRIV (context);
-
-    return (*cPrivate->interface->contextGetCategories) (context);
+    return (*(GET_INTERFACE (CCSContextInterface, CCS_CONTEXT_INTERFACE_TYPE, context))->contextGetCategories) (context);
 }
 
 CCSSettingList
 ccsContextGetChangedSettings (CCSContext *context)
 {
-    CONTEXT_PRIV (context);
-
-    return (*cPrivate->interface->contextGetChangedSettings) (context);
+    return (*(GET_INTERFACE (CCSContextInterface, CCS_CONTEXT_INTERFACE_TYPE, context))->contextGetChangedSettings) (context);
 }
 
 unsigned int
 ccsContextGetScreenNum (CCSContext *context)
 {
-    CONTEXT_PRIV (context);
-
-    return (*cPrivate->interface->contextGetScreenNum) (context);
+    return (*(GET_INTERFACE (CCSContextInterface, CCS_CONTEXT_INTERFACE_TYPE, context))->contextGetScreenNum) (context);
 }
 
 Bool
 ccsContextAddChangedSetting (CCSContext *context, CCSSetting *setting)
 {
-    CONTEXT_PRIV (context);
-
-    return (*cPrivate->interface->contextAddChangedSetting) (context, setting);
+    return (*(GET_INTERFACE (CCSContextInterface, CCS_CONTEXT_INTERFACE_TYPE, context))->contextAddChangedSetting) (context, setting);
 }
 
 Bool
 ccsContextClearChangedSettings (CCSContext *context)
 {
-    CONTEXT_PRIV (context);
-
-    return (*cPrivate->interface->contextClearChangedSettings) (context);
+    return (*(GET_INTERFACE (CCSContextInterface, CCS_CONTEXT_INTERFACE_TYPE, context))->contextClearChangedSettings) (context);
 }
 
 CCSSettingList
 ccsContextStealChangedSettings (CCSContext *context)
 {
-    CONTEXT_PRIV (context);
-
-    return (*cPrivate->interface->contextStealChangedSettings) (context);
+    return (*(GET_INTERFACE (CCSContextInterface, CCS_CONTEXT_INTERFACE_TYPE, context))->contextStealChangedSettings) (context);
 }
 
 void *
 ccsContextGetPrivatePtr (CCSContext *context)
 {
-    CONTEXT_PRIV (context);
-
-    return (*cPrivate->interface->contextGetPrivatePtr) (context);
+    return (*(GET_INTERFACE (CCSContextInterface, CCS_CONTEXT_INTERFACE_TYPE, context))->contextGetPrivatePtr) (context);
 }
 
 void
 ccsContextSetPrivatePtr (CCSContext *context, void *ptr)
 {
-    CONTEXT_PRIV (context);
-
-    return (*cPrivate->interface->contextSetPrivatePtr) (context, ptr);
+    (*(GET_INTERFACE (CCSContextInterface, CCS_CONTEXT_INTERFACE_TYPE, context))->contextSetPrivatePtr) (context, ptr);
 }
 
 void *
@@ -512,7 +486,7 @@
 }
 
 CCSPlugin *
-ccsFindPlugin (CCSContext * context, const char *name)
+ccsFindPluginDefault (CCSContext * context, const char *name)
 {
     if (!name)
 	name = "";
@@ -531,6 +505,12 @@
     return NULL;
 }
 
+CCSPlugin *
+ccsFindPlugin (CCSContext *context, const char *name)
+{
+    return (*(GET_INTERFACE (CCSContextInterface, CCS_CONTEXT_INTERFACE_TYPE, context))->contextFindPlugin) (context, name);
+}
+
 CCSSetting *
 ccsFindSetting (CCSPlugin * plugin, const char *name)
 {
@@ -559,7 +539,7 @@
 }
 
 Bool
-ccsPluginIsActive (CCSContext * context, char *name)
+ccsPluginIsActiveDefault (CCSContext * context, char *name)
 {
     CCSPlugin *plugin;
 
@@ -572,6 +552,12 @@
     return pPrivate->active;
 }
 
+Bool
+ccsPluginIsActive (CCSContext *context, char *name)
+{
+    return (*(GET_INTERFACE (CCSContextInterface, CCS_CONTEXT_INTERFACE_TYPE, context))->contextPluginIsActive) (context, name);
+}
+
 
 static void
 subGroupAdd (CCSSetting * setting, CCSGroup * group)
@@ -659,9 +645,7 @@
 
     ccsPluginListFree (cPrivate->plugins, TRUE);
 
-    if (c->ccsPrivate)
-	free (c->ccsPrivate);
-
+    ccsObjectFinalize ((CCSObject *) c);
     free (c);
 }
 
@@ -960,7 +944,7 @@
 }
 
 Bool
-ccsSetBackend (CCSContext * context, char *name)
+ccsSetBackendDefault (CCSContext * context, char *name)
 {
     Bool fallbackMode = FALSE;
     CONTEXT_PRIV (context);
@@ -1025,6 +1009,11 @@
     return TRUE;
 }
 
+Bool
+ccsSetBackend (CCSContext *context, char *name)
+{
+    return (*(GET_INTERFACE (CCSContextInterface, CCS_CONTEXT_INTERFACE_TYPE, context))->contextSetBackend) (context, name);
+}
 
 static Bool
 ccsCompareLists (CCSSettingValueList l1, CCSSettingValueList l2,
@@ -1983,7 +1972,7 @@
 }
 
 CCSPluginList
-ccsGetActivePluginList (CCSContext * context)
+ccsGetActivePluginListDefault (CCSContext * context)
 {
     CONTEXT_PRIV (context);
 
@@ -2004,6 +1993,12 @@
     return rv;
 }
 
+CCSPluginList
+ccsGetActivePluginList (CCSContext *context)
+{
+    return (*(GET_INTERFACE (CCSContextInterface, CCS_CONTEXT_INTERFACE_TYPE, context))->contextGetActivePluginList) (context);
+}
+
 static CCSPlugin *
 findPluginInList (CCSPluginList list, char *name)
 {
@@ -2028,7 +2023,7 @@
 } PluginSortHelper;
 
 CCSStringList
-ccsGetSortedPluginStringList (CCSContext * context)
+ccsGetSortedPluginStringListDefault (CCSContext * context)
 {
     CCSPluginList ap = ccsGetActivePluginList (context);
     CCSPluginList list;
@@ -2188,8 +2183,14 @@
     return rv;
 }
 
+CCSStringList
+ccsGetSortedPluginStringList (CCSContext *context)
+{
+    return (*(GET_INTERFACE (CCSContextInterface, CCS_CONTEXT_INTERFACE_TYPE, context))->contextGetSortedPluginStringList) (context);
+}
+
 char *
-ccsGetBackend (CCSContext * context)
+ccsGetBackendDefault (CCSContext * context)
 {
     if (!context)
 	return NULL;
@@ -2202,8 +2203,14 @@
     return cPrivate->backend->vTable->name;
 }
 
+char *
+ccsGetBackend (CCSContext *context)
+{
+    return (*(GET_INTERFACE (CCSContextInterface, CCS_CONTEXT_INTERFACE_TYPE, context))->contextGetBackend) (context);
+}
+
 Bool
-ccsGetIntegrationEnabled (CCSContext * context)
+ccsGetIntegrationEnabledDefault (CCSContext * context)
 {
     if (!context)
 	return FALSE;
@@ -2213,8 +2220,17 @@
     return cPrivate->deIntegration;
 }
 
+Bool
+ccsGetIntegrationEnabled (CCSContext *context)
+{
+    if (!context)
+	return FALSE;
+
+    return (*(GET_INTERFACE (CCSContextInterface, CCS_CONTEXT_INTERFACE_TYPE, context))->contextGetIntegrationEnabled) (context);
+}
+
 char *
-ccsGetProfile (CCSContext * context)
+ccsGetProfileDefault (CCSContext * context)
 {
     if (!context)
 	return NULL;
@@ -2224,8 +2240,17 @@
     return cPrivate->profile;
 }
 
+char *
+ccsGetProfile (CCSContext *context)
+{
+    if (!context)
+	return NULL;
+
+    return (*(GET_INTERFACE (CCSContextInterface, CCS_CONTEXT_INTERFACE_TYPE, context))->contextGetProfile) (context);
+}
+
 Bool
-ccsGetPluginListAutoSort (CCSContext * context)
+ccsGetPluginListAutoSortDefault (CCSContext * context)
 {
     if (!context)
 	return FALSE;
@@ -2235,8 +2260,17 @@
     return cPrivate->pluginListAutoSort;
 }
 
+Bool
+ccsGetPluginListAutoSort (CCSContext *context)
+{
+    if (!context)
+	return FALSE;
+
+    return (*(GET_INTERFACE (CCSContextInterface, CCS_CONTEXT_INTERFACE_TYPE, context))->contextGetPluginListAutoSort) (context);
+}
+
 void
-ccsSetIntegrationEnabled (CCSContext * context, Bool value)
+ccsSetIntegrationEnabledDefault (CCSContext * context, Bool value)
 {
     CONTEXT_PRIV (context);
 
@@ -2252,6 +2286,12 @@
     ccsEnableFileWatch (cPrivate->configWatchId);
 }
 
+void
+ccsSetIntegrationEnabled (CCSContext *context, Bool value)
+{
+    (*(GET_INTERFACE (CCSContextInterface, CCS_CONTEXT_INTERFACE_TYPE, context))->contextSetIntegrationEnabled) (context, value);
+}
+
 static void
 ccsWriteAutoSortedPluginList (CCSContext *context)
 {
@@ -2279,7 +2319,7 @@
 }
 
 void
-ccsSetPluginListAutoSort (CCSContext * context, Bool value)
+ccsSetPluginListAutoSortDefault (CCSContext * context, Bool value)
 {
     CONTEXT_PRIV (context);
 
@@ -2299,7 +2339,13 @@
 }
 
 void
-ccsSetProfile (CCSContext * context, char *name)
+ccsSetPluginListAutoSort (CCSContext *context, Bool value)
+{
+    (*(GET_INTERFACE (CCSContextInterface, CCS_CONTEXT_INTERFACE_TYPE, context))->contextSetPluginListAutoSort) (context, value);
+}
+
+void
+ccsSetProfileDefault (CCSContext * context, char *name)
 {
     if (!name)
 	name = "";
@@ -2321,7 +2367,13 @@
 }
 
 void
-ccsProcessEvents (CCSContext * context, unsigned int flags)
+ccsSetProfile (CCSContext *context, char *name)
+{
+    (*(GET_INTERFACE (CCSContextInterface, CCS_CONTEXT_INTERFACE_TYPE, context))->contextSetProfile) (context, name);
+}
+
+void
+ccsProcessEventsDefault (CCSContext * context, unsigned int flags)
 {
     if (!context)
 	return;
@@ -2335,7 +2387,16 @@
 }
 
 void
-ccsReadSettings (CCSContext * context)
+ccsProcessEvents (CCSContext *context, unsigned int flags)
+{
+    if (!context)
+	return;
+
+    (*(GET_INTERFACE (CCSContextInterface, CCS_CONTEXT_INTERFACE_TYPE, context))->contextProcessEvents) (context, flags);
+}
+
+void
+ccsReadSettingsDefault (CCSContext * context)
 {
     if (!context)
 	return;
@@ -2372,6 +2433,15 @@
 }
 
 void
+ccsReadSettings (CCSContext *context)
+{
+    if (!context)
+	return;
+
+    (*(GET_INTERFACE (CCSContextInterface, CCS_CONTEXT_INTERFACE_TYPE, context))->contextReadSettings) (context);
+}
+
+void
 ccsReadPluginSettings (CCSPlugin * plugin)
 {
     if (!plugin || !plugin->context)
@@ -2403,7 +2473,7 @@
 }
 
 void
-ccsWriteSettings (CCSContext * context)
+ccsWriteSettingsDefault (CCSContext * context)
 {
     if (!context)
 	return;
@@ -2443,7 +2513,16 @@
 }
 
 void
-ccsWriteChangedSettings (CCSContext * context)
+ccsWriteSettings (CCSContext *context)
+{
+    if (!context)
+	return;
+
+    (*(GET_INTERFACE (CCSContextInterface, CCS_CONTEXT_INTERFACE_TYPE, context))->contextWriteSettings) (context);
+}
+
+void
+ccsWriteChangedSettingsDefault (CCSContext * context)
 {
     if (!context)
 	return;
@@ -2478,6 +2557,15 @@
 	ccsSettingListFree (cPrivate->changedSettings, FALSE);
 }
 
+void
+ccsWriteChangedSettings (CCSContext *context)
+{
+    if (!context)
+	return;
+
+    (*(GET_INTERFACE (CCSContextInterface, CCS_CONTEXT_INTERFACE_TYPE, context))->contextWriteChangedSettings) (context);
+}
+
 Bool
 ccsIsEqualColor (CCSSettingColorValue c1, CCSSettingColorValue c2)
 {
@@ -2530,7 +2618,7 @@
 }
 
 CCSPluginConflictList
-ccsCanEnablePlugin (CCSContext * context, CCSPlugin * plugin)
+ccsCanEnablePluginDefault (CCSContext * context, CCSPlugin * plugin)
 {
     CCSPluginConflictList list = NULL;
     CCSPluginList pl, pl2;
@@ -2748,7 +2836,13 @@
 }
 
 CCSPluginConflictList
-ccsCanDisablePlugin (CCSContext * context, CCSPlugin * plugin)
+ccsCanEnablePlugin (CCSContext *context, CCSPlugin *plugin)
+{
+    return (*(GET_INTERFACE (CCSContextInterface, CCS_CONTEXT_INTERFACE_TYPE, context))->contextCanEnablePlugin) (context, plugin);
+}
+
+CCSPluginConflictList
+ccsCanDisablePluginDefault (CCSContext * context, CCSPlugin * plugin)
 {
     CCSPluginConflictList list = NULL;
     CCSPluginConflict *conflict = NULL;
@@ -2851,8 +2945,14 @@
     return list;
 }
 
+CCSPluginConflictList
+ccsCanDisablePlugin (CCSContext *context, CCSPlugin *plugin)
+{
+    return (*(GET_INTERFACE (CCSContextInterface, CCS_CONTEXT_INTERFACE_TYPE, context))->contextCanDisablePlugin) (context, plugin);
+}
+
 CCSStringList
-ccsGetExistingProfiles (CCSContext * context)
+ccsGetExistingProfilesDefault (CCSContext * context)
 {
     if (!context)
 	return NULL;
@@ -2868,8 +2968,17 @@
     return NULL;
 }
 
+CCSStringList
+ccsGetExistingProfiles (CCSContext *context)
+{
+    if (!context)
+	return NULL;
+
+    return (*(GET_INTERFACE (CCSContextInterface, CCS_CONTEXT_INTERFACE_TYPE, context))->contextGetExistingProfiles) (context);
+}
+
 void
-ccsDeleteProfile (CCSContext * context, char *name)
+ccsDeleteProfileDefault (CCSContext * context, char *name)
 {
     if (!context)
 	return;
@@ -2892,6 +3001,15 @@
 	(*cPrivate->backend->vTable->deleteProfile) (context, name);
 }
 
+void
+ccsDeleteProfile (CCSContext *context, char *name)
+{
+    if (!context)
+	return;
+
+    (*(GET_INTERFACE (CCSContextInterface, CCS_CONTEXT_INTERFACE_TYPE, context))->contextDeleteProfile) (context, name);
+}
+
 static void
 addBackendInfo (CCSBackendInfoList * bl, char *file)
 {
@@ -3020,9 +3138,9 @@
 }
 
 Bool
-ccsExportToFile (CCSContext *context,
-		 const char *fileName,
-		 Bool       skipDefaults)
+ccsExportToFileDefault (CCSContext *context,
+			const char *fileName,
+			Bool       skipDefaults)
 {
     IniDictionary *exportFile;
     CCSPluginList p;
@@ -3115,6 +3233,15 @@
     return TRUE;
 }
 
+Bool
+ccsExportToFile (CCSContext *context, const char *fileName, Bool skipDefaults)
+{
+    if (!context)
+	return FALSE;
+
+    return (*(GET_INTERFACE (CCSContextInterface, CCS_CONTEXT_INTERFACE_TYPE, context))->contextExportToFile) (context, fileName, skipDefaults);
+}
+
 /* + with a value will attempt to append or overwrite that value if there is no -
  * - with a value will attempt to clear any value set to that to the default
  * if there is no +
@@ -3742,7 +3869,7 @@
 }
 
 Bool
-ccsCheckForSettingsUpgrade (CCSContext *context)
+ccsCheckForSettingsUpgradeDefault (CCSContext *context)
 {
     struct dirent 	   **nameList;
     int 	  	   nFile, i;
@@ -3822,9 +3949,9 @@
 }
 
 Bool
-ccsImportFromFile (CCSContext *context,
-		   const char *fileName,
-		   Bool       overwriteNonDefault)
+ccsImportFromFileDefault (CCSContext *context,
+			  const char *fileName,
+			  Bool       overwriteNonDefault)
 {
     IniDictionary *importFile;
     CCSPluginList p;
@@ -3986,6 +4113,21 @@
     return TRUE;
 }
 
+Bool
+ccsCheckForSettingsUpgrade (CCSContext *context)
+{
+    return (*(GET_INTERFACE (CCSContextInterface, CCS_CONTEXT_INTERFACE_TYPE, context))->contextCheckForSettingsUpgrade) (context);
+}
+
+Bool
+ccsImportFromFile (CCSContext *context, const char *fileName, Bool overwriteNonDefault)
+{
+    if (!context)
+	return FALSE;
+
+    return (*(GET_INTERFACE (CCSContextInterface, CCS_CONTEXT_INTERFACE_TYPE, context))->contextImportFromFile) (context, fileName, overwriteNonDefault);
+}
+
 CCSSettingList ccsGetPluginSettings (CCSPlugin *plugin)
 
 {
@@ -4049,6 +4191,44 @@
     return pPrivate->stringExtensions;
 }
 
+static const CCSContextInterface ccsDefaultContextInterface =
+{
+    ccsContextGetPluginsDefault,
+    ccsContextGetCategoriesDefault,
+    ccsContextGetChangedSettingsDefault,
+    ccsContextGetScreenNumDefault,
+    ccsContextAddChangedSettingDefault,
+    ccsContextClearChangedSettingsDefault,
+    ccsContextStealChangedSettingsDefault,
+    ccsContextGetPrivatePtrDefault,
+    ccsContextSetPrivatePtrDefault,
+    ccsLoadPluginDefault,
+    ccsFindPluginDefault,
+    ccsPluginIsActiveDefault,
+    ccsGetActivePluginListDefault,
+    ccsGetSortedPluginStringListDefault,
+    ccsSetBackendDefault,
+    ccsGetBackendDefault,
+    ccsSetIntegrationEnabledDefault,
+    ccsSetProfileDefault,
+    ccsSetPluginListAutoSortDefault,
+    ccsGetProfileDefault,
+    ccsGetIntegrationEnabledDefault,
+    ccsGetPluginListAutoSortDefault,
+    ccsProcessEventsDefault,
+    ccsReadSettingsDefault,
+    ccsWriteSettingsDefault,
+    ccsWriteChangedSettingsDefault,
+    ccsExportToFileDefault,
+    ccsImportFromFileDefault,
+    ccsCanEnablePluginDefault,
+    ccsCanDisablePluginDefault,
+    ccsGetExistingProfilesDefault,
+    ccsDeleteProfileDefault,
+    ccsCheckForSettingsUpgradeDefault,
+    ccsLoadPluginsDefault
+};
+
 const CCSInterfaceTable ccsDefaultInterfaceTable =
 {
     &ccsDefaultContextInterface