Merge lp:~smspillaz/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/setting-mock
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.

[Alan Griffiths (alan-griffiths)]

GET_INTERFACE seems overcomplicated and error prone. It requires the first two parameters to match up - when in every use the second is a second macro with no other use that calls a third with the first parameter. Confused?

Current usage: GET_INTERFACE (CCSContextInterface, CCS_CONTEXT_INTERFACE_TYPE, context))
Suggest usage: GET_INTERFACE (CCSContextInterface, context))

Current #define GET_INTERFACE(CType,IType, o) (CType *) ccsObjectGetInterface ((CCSObject *) o, IType)
Suggest #define GET_INTERFACE(CType, o) (CType*)ccsObjectGetInterface((CCSObject*) o, GET_INTERFACE_TYPE(CType))

And get rid of CCS_CONTEXT_INTERFACE_TYPE which is then unused.

review: Needs Fixing

[Sam Spilsbury (smspillaz)]

> GET_INTERFACE seems overcomplicated and error prone. It requires the first
> two parameters to match up - when in every use the second is a second macro
> with no other use that calls a third with the first parameter. Confused?
>
> Current usage: GET_INTERFACE (CCSContextInterface, CCS_CONTEXT_INTERFACE_TYPE,
> context))
> Suggest usage: GET_INTERFACE (CCSContextInterface, context))
>
>
> Current #define GET_INTERFACE(CType,IType, o) (CType *) ccsObjectGetInterface
> ((CCSObject *) o, IType)
> Suggest #define GET_INTERFACE(CType, o)
> (CType*)ccsObjectGetInterface((CCSObject*) o, GET_INTERFACE_TYPE(CType))
>
> And get rid of CCS_CONTEXT_INTERFACE_TYPE which is then unused.

I'm a bit confused - how would GET_INTERFACE_TYPE(CCSContext) be able to replace CCS_CONTEXT_INTERFACE_TYPE ? There's no templates available so we can't do it that way ....

[lp:~smspillaz/compiz-libcompizconfig/context-funcs-behind-interface]

448. By Sam Spilsbury on 2012-05-07

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

449. By Sam Spilsbury on 2012-05-07

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

450. By Sam Spilsbury on 2012-05-07

Merge

451. By Sam Spilsbury on 2012-05-07

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

[Alan Griffiths (alan-griffiths)]

Looks basically OK, but there are merge conflicts with pre-requisites

review: Needs Fixing

[Sam Spilsbury (smspillaz)]

The conflicts seem to be gone now

[lp:~smspillaz/compiz-libcompizconfig/context-funcs-behind-interface]

452. By Sam Spilsbury on 2012-05-11

Move null check

Unmerged revisions

452. By Sam Spilsbury on 2012-05-11

Move null check

451. By Sam Spilsbury on 2012-05-07

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

450. By Sam Spilsbury on 2012-05-07

Merge

449. By Sam Spilsbury on 2012-05-07

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

448. By Sam Spilsbury on 2012-05-07

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

447. By Sam Spilsbury on 2012-05-04

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

446. By Sam Spilsbury on 2012-05-04

Remove usage #define

445. By Sam Spilsbury on 2012-05-04

Simplify dynamic context interface

444. By Sam Spilsbury on 2012-05-04

Make it work with the new API

443. By Sam Spilsbury on 2012-05-04

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

=== modified file 'include/ccs.h'
--- include/ccs.h	2012-05-07 14:58:24 +0000
+++ include/ccs.h	2012-05-07 14:58:24 +0000
@@ -223,6 +223,8 @@
 	return type_id; \
     }
 
+#define GET_INTERFACE(CType, o) (CType *) ccsObjectGetInterface (o, GET_INTERFACE_TYPE(CType))
+
 /**
  * reference counting
  * 
@@ -273,6 +275,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
 {
@@ -285,8 +312,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 *);
@@ -305,8 +359,7 @@
 
 struct _CCSContext
 {
-    void              *ccsPrivate;     /* private pointer for compizconfig
-					  internal usage */
+    CCSObject object;
 };
 
 struct _CCSBackendInfo
@@ -1049,9 +1102,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-05-07 14:58:24 +0000
+++ src/ccs-private.h	2012-05-07 14:58:24 +0000
@@ -26,7 +26,7 @@
 #include <ccs-backend.h>
 
 #define CONTEXT_PRIV(c) \
-    CCSContextPrivate *cPrivate = (CCSContextPrivate *) c->ccsPrivate;
+    CCSContextPrivate *cPrivate = (CCSContextPrivate *) ccsObjectGetPrivate (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-05-07 14:58:24 +0000
+++ src/compiz.cpp	2012-05-07 14:58:24 +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, 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, context))->contextLoadPlugins) (context);
+}
+
 static void
 loadOptionsStringExtensionsFromXML (CCSPlugin * plugin,
 				    void * pluginPBv,

=== modified file 'src/main.c'
--- src/main.c	2012-05-07 14:58:24 +0000
+++ src/main.c	2012-05-07 14:58:24 +0000
@@ -228,6 +228,8 @@
     return start;
 }
 
+INTERFACE_TYPE (CCSContextInterface)
+
 Bool basicMetadata = FALSE;
 
 void
@@ -289,22 +291,28 @@
     CCSContext *context;
 
     context = calloc (1, sizeof (CCSContext));
+
+    ccsObjectInit (context, &ccsDefaultObjectAllocator);
+
     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 (context, (CCSPrivate *) ccsPrivate);
+
     CONTEXT_PRIV (context);
 
     cPrivate->object_interfaces = object_interfaces;
-    cPrivate->interface = object_interfaces->contextInterface;
     cPrivate->screenNum = screenNum;
 
+    ccsObjectAddInterface (context, (CCSInterface *) object_interfaces->contextInterface, GET_INTERFACE_TYPE (CCSContextInterface));
+
     initGeneralOptions (context);
     cPrivate->configWatchId = ccsAddConfigWatch (context, configChangeNotify);
 
@@ -397,89 +405,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, context))->contextGetPlugins) (context);
 }
 
 CCSPluginCategory *
 ccsContextGetCategories (CCSContext *context)
 {
-    CONTEXT_PRIV (context);
-
-    return (*cPrivate->interface->contextGetCategories) (context);
+    return (*(GET_INTERFACE (CCSContextInterface, context))->contextGetCategories) (context);
 }
 
 CCSSettingList
 ccsContextGetChangedSettings (CCSContext *context)
 {
-    CONTEXT_PRIV (context);
-
-    return (*cPrivate->interface->contextGetChangedSettings) (context);
+    return (*(GET_INTERFACE (CCSContextInterface, context))->contextGetChangedSettings) (context);
 }
 
 unsigned int
 ccsContextGetScreenNum (CCSContext *context)
 {
-    CONTEXT_PRIV (context);
-
-    return (*cPrivate->interface->contextGetScreenNum) (context);
+    return (*(GET_INTERFACE (CCSContextInterface, context))->contextGetScreenNum) (context);
 }
 
 Bool
 ccsContextAddChangedSetting (CCSContext *context, CCSSetting *setting)
 {
-    CONTEXT_PRIV (context);
-
-    return (*cPrivate->interface->contextAddChangedSetting) (context, setting);
+    return (*(GET_INTERFACE (CCSContextInterface, context))->contextAddChangedSetting) (context, setting);
 }
 
 Bool
 ccsContextClearChangedSettings (CCSContext *context)
 {
-    CONTEXT_PRIV (context);
-
-    return (*cPrivate->interface->contextClearChangedSettings) (context);
+    return (*(GET_INTERFACE (CCSContextInterface, context))->contextClearChangedSettings) (context);
 }
 
 CCSSettingList
 ccsContextStealChangedSettings (CCSContext *context)
 {
-    CONTEXT_PRIV (context);
-
-    return (*cPrivate->interface->contextStealChangedSettings) (context);
+    return (*(GET_INTERFACE (CCSContextInterface, context))->contextStealChangedSettings) (context);
 }
 
 void *
 ccsContextGetPrivatePtr (CCSContext *context)
 {
-    CONTEXT_PRIV (context);
-
-    return (*cPrivate->interface->contextGetPrivatePtr) (context);
+    return (*(GET_INTERFACE (CCSContextInterface, context))->contextGetPrivatePtr) (context);
 }
 
 void
 ccsContextSetPrivatePtr (CCSContext *context, void *ptr)
 {
-    CONTEXT_PRIV (context);
-
-    return (*cPrivate->interface->contextSetPrivatePtr) (context, ptr);
+    (*(GET_INTERFACE (CCSContextInterface, context))->contextSetPrivatePtr) (context, ptr);
 }
 
 void *
@@ -573,7 +550,7 @@
 }
 
 CCSPlugin *
-ccsFindPlugin (CCSContext * context, const char *name)
+ccsFindPluginDefault (CCSContext * context, const char *name)
 {
     if (!name)
 	name = "";
@@ -592,6 +569,12 @@
     return NULL;
 }
 
+CCSPlugin *
+ccsFindPlugin (CCSContext *context, const char *name)
+{
+    return (*(GET_INTERFACE (CCSContextInterface, context))->contextFindPlugin) (context, name);
+}
+
 CCSSetting *
 ccsFindSetting (CCSPlugin * plugin, const char *name)
 {
@@ -620,7 +603,7 @@
 }
 
 Bool
-ccsPluginIsActive (CCSContext * context, char *name)
+ccsPluginIsActiveDefault (CCSContext * context, char *name)
 {
     CCSPlugin *plugin;
 
@@ -633,6 +616,12 @@
     return pPrivate->active;
 }
 
+Bool
+ccsPluginIsActive (CCSContext *context, char *name)
+{
+    return (*(GET_INTERFACE (CCSContextInterface, context))->contextPluginIsActive) (context, name);
+}
+
 
 static void
 subGroupAdd (CCSSetting * setting, CCSGroup * group)
@@ -720,9 +709,7 @@
 
     ccsPluginListFree (cPrivate->plugins, TRUE);
 
-    if (c->ccsPrivate)
-	free (c->ccsPrivate);
-
+    ccsObjectFinalize (c);
     free (c);
 }
 
@@ -971,15 +958,14 @@
 CCSREF (StrExtension, CCSStrExtension)
 
 #define CCSREF_OBJ(type,dtype) \
-    void ccs##type##Ref (dtype *d)  \
+    void ccs##type##Ref (dtype *d) \
     { \
-	((CCSObject *) d)->refcnt++; \
+	ccsObjectRef (d); \
     } \
+    \
     void ccs##type##Unref (dtype *d) \
     { \
-	((CCSObject *) d)->refcnt--; \
-	if (((CCSObject *) d)->refcnt == 0) \
-	    ccsFree##type (d); \
+	ccsObjectUnref (d, ccsFree##type); \
     } \
 
 static void *
@@ -1021,7 +1007,7 @@
 }
 
 Bool
-ccsSetBackend (CCSContext * context, char *name)
+ccsSetBackendDefault (CCSContext * context, char *name)
 {
     Bool fallbackMode = FALSE;
     CONTEXT_PRIV (context);
@@ -1086,6 +1072,11 @@
     return TRUE;
 }
 
+Bool
+ccsSetBackend (CCSContext *context, char *name)
+{
+    return (*(GET_INTERFACE (CCSContextInterface, context))->contextSetBackend) (context, name);
+}
 
 static Bool
 ccsCompareLists (CCSSettingValueList l1, CCSSettingValueList l2,
@@ -2044,7 +2035,7 @@
 }
 
 CCSPluginList
-ccsGetActivePluginList (CCSContext * context)
+ccsGetActivePluginListDefault (CCSContext * context)
 {
     CONTEXT_PRIV (context);
 
@@ -2065,6 +2056,12 @@
     return rv;
 }
 
+CCSPluginList
+ccsGetActivePluginList (CCSContext *context)
+{
+    return (*(GET_INTERFACE (CCSContextInterface, context))->contextGetActivePluginList) (context);
+}
+
 static CCSPlugin *
 findPluginInList (CCSPluginList list, char *name)
 {
@@ -2089,7 +2086,7 @@
 } PluginSortHelper;
 
 CCSStringList
-ccsGetSortedPluginStringList (CCSContext * context)
+ccsGetSortedPluginStringListDefault (CCSContext * context)
 {
     CCSPluginList ap = ccsGetActivePluginList (context);
     CCSPluginList list;
@@ -2249,8 +2246,14 @@
     return rv;
 }
 
+CCSStringList
+ccsGetSortedPluginStringList (CCSContext *context)
+{
+    return (*(GET_INTERFACE (CCSContextInterface, context))->contextGetSortedPluginStringList) (context);
+}
+
 char *
-ccsGetBackend (CCSContext * context)
+ccsGetBackendDefault (CCSContext * context)
 {
     if (!context)
 	return NULL;
@@ -2263,8 +2266,14 @@
     return cPrivate->backend->vTable->name;
 }
 
+char *
+ccsGetBackend (CCSContext *context)
+{
+    return (*(GET_INTERFACE (CCSContextInterface, context))->contextGetBackend) (context);
+}
+
 Bool
-ccsGetIntegrationEnabled (CCSContext * context)
+ccsGetIntegrationEnabledDefault (CCSContext * context)
 {
     if (!context)
 	return FALSE;
@@ -2274,8 +2283,17 @@
     return cPrivate->deIntegration;
 }
 
+Bool
+ccsGetIntegrationEnabled (CCSContext *context)
+{
+    if (!context)
+	return FALSE;
+
+    return (*(GET_INTERFACE (CCSContextInterface, context))->contextGetIntegrationEnabled) (context);
+}
+
 char *
-ccsGetProfile (CCSContext * context)
+ccsGetProfileDefault (CCSContext * context)
 {
     if (!context)
 	return NULL;
@@ -2285,8 +2303,17 @@
     return cPrivate->profile;
 }
 
+char *
+ccsGetProfile (CCSContext *context)
+{
+    if (!context)
+	return NULL;
+
+    return (*(GET_INTERFACE (CCSContextInterface, context))->contextGetProfile) (context);
+}
+
 Bool
-ccsGetPluginListAutoSort (CCSContext * context)
+ccsGetPluginListAutoSortDefault (CCSContext * context)
 {
     if (!context)
 	return FALSE;
@@ -2296,8 +2323,17 @@
     return cPrivate->pluginListAutoSort;
 }
 
+Bool
+ccsGetPluginListAutoSort (CCSContext *context)
+{
+    if (!context)
+	return FALSE;
+
+    return (*(GET_INTERFACE (CCSContextInterface, context))->contextGetPluginListAutoSort) (context);
+}
+
 void
-ccsSetIntegrationEnabled (CCSContext * context, Bool value)
+ccsSetIntegrationEnabledDefault (CCSContext * context, Bool value)
 {
     CONTEXT_PRIV (context);
 
@@ -2313,6 +2349,12 @@
     ccsEnableFileWatch (cPrivate->configWatchId);
 }
 
+void
+ccsSetIntegrationEnabled (CCSContext *context, Bool value)
+{
+    (*(GET_INTERFACE (CCSContextInterface, context))->contextSetIntegrationEnabled) (context, value);
+}
+
 static void
 ccsWriteAutoSortedPluginList (CCSContext *context)
 {
@@ -2340,7 +2382,7 @@
 }
 
 void
-ccsSetPluginListAutoSort (CCSContext * context, Bool value)
+ccsSetPluginListAutoSortDefault (CCSContext * context, Bool value)
 {
     CONTEXT_PRIV (context);
 
@@ -2360,7 +2402,13 @@
 }
 
 void
-ccsSetProfile (CCSContext * context, char *name)
+ccsSetPluginListAutoSort (CCSContext *context, Bool value)
+{
+    (*(GET_INTERFACE (CCSContextInterface, context))->contextSetPluginListAutoSort) (context, value);
+}
+
+void
+ccsSetProfileDefault (CCSContext * context, char *name)
 {
     if (!name)
 	name = "";
@@ -2382,7 +2430,13 @@
 }
 
 void
-ccsProcessEvents (CCSContext * context, unsigned int flags)
+ccsSetProfile (CCSContext *context, char *name)
+{
+    (*(GET_INTERFACE (CCSContextInterface, context))->contextSetProfile) (context, name);
+}
+
+void
+ccsProcessEventsDefault (CCSContext * context, unsigned int flags)
 {
     if (!context)
 	return;
@@ -2396,7 +2450,16 @@
 }
 
 void
-ccsReadSettings (CCSContext * context)
+ccsProcessEvents (CCSContext *context, unsigned int flags)
+{
+    if (!context)
+	return;
+
+    (*(GET_INTERFACE (CCSContextInterface, context))->contextProcessEvents) (context, flags);
+}
+
+void
+ccsReadSettingsDefault (CCSContext * context)
 {
     if (!context)
 	return;
@@ -2433,6 +2496,15 @@
 }
 
 void
+ccsReadSettings (CCSContext *context)
+{
+    if (!context)
+	return;
+
+    (*(GET_INTERFACE (CCSContextInterface, context))->contextReadSettings) (context);
+}
+
+void
 ccsReadPluginSettings (CCSPlugin * plugin)
 {
     if (!plugin || !plugin->context)
@@ -2464,7 +2536,7 @@
 }
 
 void
-ccsWriteSettings (CCSContext * context)
+ccsWriteSettingsDefault (CCSContext * context)
 {
     if (!context)
 	return;
@@ -2504,7 +2576,16 @@
 }
 
 void
-ccsWriteChangedSettings (CCSContext * context)
+ccsWriteSettings (CCSContext *context)
+{
+    if (!context)
+	return;
+
+    (*(GET_INTERFACE (CCSContextInterface, context))->contextWriteSettings) (context);
+}
+
+void
+ccsWriteChangedSettingsDefault (CCSContext * context)
 {
     if (!context)
 	return;
@@ -2539,6 +2620,15 @@
 	ccsSettingListFree (cPrivate->changedSettings, FALSE);
 }
 
+void
+ccsWriteChangedSettings (CCSContext *context)
+{
+    if (!context)
+	return;
+
+    (*(GET_INTERFACE (CCSContextInterface, context))->contextWriteChangedSettings) (context);
+}
+
 Bool
 ccsIsEqualColor (CCSSettingColorValue c1, CCSSettingColorValue c2)
 {
@@ -2591,7 +2681,7 @@
 }
 
 CCSPluginConflictList
-ccsCanEnablePlugin (CCSContext * context, CCSPlugin * plugin)
+ccsCanEnablePluginDefault (CCSContext * context, CCSPlugin * plugin)
 {
     CCSPluginConflictList list = NULL;
     CCSPluginList pl, pl2;
@@ -2809,7 +2899,13 @@
 }
 
 CCSPluginConflictList
-ccsCanDisablePlugin (CCSContext * context, CCSPlugin * plugin)
+ccsCanEnablePlugin (CCSContext *context, CCSPlugin *plugin)
+{
+    return (*(GET_INTERFACE (CCSContextInterface, context))->contextCanEnablePlugin) (context, plugin);
+}
+
+CCSPluginConflictList
+ccsCanDisablePluginDefault (CCSContext * context, CCSPlugin * plugin)
 {
     CCSPluginConflictList list = NULL;
     CCSPluginConflict *conflict = NULL;
@@ -2912,8 +3008,14 @@
     return list;
 }
 
+CCSPluginConflictList
+ccsCanDisablePlugin (CCSContext *context, CCSPlugin *plugin)
+{
+    return (*(GET_INTERFACE (CCSContextInterface, context))->contextCanDisablePlugin) (context, plugin);
+}
+
 CCSStringList
-ccsGetExistingProfiles (CCSContext * context)
+ccsGetExistingProfilesDefault (CCSContext * context)
 {
     if (!context)
 	return NULL;
@@ -2929,8 +3031,17 @@
     return NULL;
 }
 
+CCSStringList
+ccsGetExistingProfiles (CCSContext *context)
+{
+    if (!context)
+	return NULL;
+
+    return (*(GET_INTERFACE (CCSContextInterface, context))->contextGetExistingProfiles) (context);
+}
+
 void
-ccsDeleteProfile (CCSContext * context, char *name)
+ccsDeleteProfileDefault (CCSContext * context, char *name)
 {
     if (!context)
 	return;
@@ -2953,6 +3064,15 @@
 	(*cPrivate->backend->vTable->deleteProfile) (context, name);
 }
 
+void
+ccsDeleteProfile (CCSContext *context, char *name)
+{
+    if (!context)
+	return;
+
+    (*(GET_INTERFACE (CCSContextInterface, context))->contextDeleteProfile) (context, name);
+}
+
 static void
 addBackendInfo (CCSBackendInfoList * bl, char *file)
 {
@@ -3081,9 +3201,9 @@
 }
 
 Bool
-ccsExportToFile (CCSContext *context,
-		 const char *fileName,
-		 Bool       skipDefaults)
+ccsExportToFileDefault (CCSContext *context,
+			const char *fileName,
+			Bool       skipDefaults)
 {
     IniDictionary *exportFile;
     CCSPluginList p;
@@ -3176,6 +3296,15 @@
     return TRUE;
 }
 
+Bool
+ccsExportToFile (CCSContext *context, const char *fileName, Bool skipDefaults)
+{
+    if (!context)
+	return FALSE;
+
+    return (*(GET_INTERFACE (CCSContextInterface, 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 +
@@ -3803,7 +3932,7 @@
 }
 
 Bool
-ccsCheckForSettingsUpgrade (CCSContext *context)
+ccsCheckForSettingsUpgradeDefault (CCSContext *context)
 {
     struct dirent 	   **nameList;
     int 	  	   nFile, i;
@@ -3883,9 +4012,9 @@
 }
 
 Bool
-ccsImportFromFile (CCSContext *context,
-		   const char *fileName,
-		   Bool       overwriteNonDefault)
+ccsImportFromFileDefault (CCSContext *context,
+			  const char *fileName,
+			  Bool       overwriteNonDefault)
 {
     IniDictionary *importFile;
     CCSPluginList p;
@@ -4047,6 +4176,21 @@
     return TRUE;
 }
 
+Bool
+ccsCheckForSettingsUpgrade (CCSContext *context)
+{
+    return (*(GET_INTERFACE (CCSContextInterface, context))->contextCheckForSettingsUpgrade) (context);
+}
+
+Bool
+ccsImportFromFile (CCSContext *context, const char *fileName, Bool overwriteNonDefault)
+{
+    if (!context)
+	return FALSE;
+
+    return (*(GET_INTERFACE (CCSContextInterface, context))->contextImportFromFile) (context, fileName, overwriteNonDefault);
+}
+
 CCSSettingList ccsGetPluginSettings (CCSPlugin *plugin)
 
 {
@@ -4110,6 +4254,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