Merge lp:~smspillaz/compiz-libcompizconfig/compiz-libcompizconfig.plugin-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 indirects all of the plugin API behind an interface

Unmerged revisions

447. By Sam Spilsbury on 2012-04-28

Use CCSObjectFinalize

446. By Sam Spilsbury on 2012-04-28

Use the CCSObject constructs to do interfaces and private ptrs

445. By Sam Spilsbury on 2012-04-28

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

444. By Sam Spilsbury on 2012-04-28

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

443. By Sam Spilsbury on 2012-04-28

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

442. By Sam Spilsbury on 2012-04-28

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

441. By Sam Spilsbury on 2012-04-28

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

440. By Sam Spilsbury on 2012-04-28

Work with protocol buffers

439. By Sam Spilsbury on 2012-04-28

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

438. By Sam Spilsbury on 2012-04-28

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

=== modified file 'include/ccs.h'
--- include/ccs.h	2012-04-28 18:58:56 +0000
+++ include/ccs.h	2012-04-28 18:58:57 +0000
@@ -215,10 +215,12 @@
 
 typedef struct _CCSInterfaceTable CCSInterfaceTable;
 typedef struct _CCSContextInterface CCSContextInterface;
+typedef struct _CCSPluginInterface CCSPluginInterface;
 
 struct _CCSInterfaceTable
 {
     const CCSContextInterface *contextInterface;
+    const CCSPluginInterface *pluginInterface;
 };
 
 extern const CCSInterfaceTable ccsDefaultInterfaceTable;
@@ -332,6 +334,57 @@
     unsigned int refCount;   /* reference count */
 };
 
+/* CCSPluginInterface */
+typedef char * (*CCSPluginGetName) (CCSPlugin *plugin);
+typedef char * (*CCSPluginGetShortDesc) (CCSPlugin *plugin);
+typedef char * (*CCSPluginGetLongDesc) (CCSPlugin *plugin);
+typedef char * (*CCSPluginGetHints) (CCSPlugin *plugin);
+typedef char * (*CCSPluginGetCategory) (CCSPlugin *plugin);
+
+typedef CCSStringList (*CCSPluginGetLoadAfter) (CCSPlugin *plugin);
+typedef CCSStringList (*CCSPluginGetLoadBefore) (CCSPlugin *plugin);
+typedef CCSStringList (*CCSPluginGetRequiresPlugins) (CCSPlugin *plugin);
+typedef CCSStringList (*CCSPluginGetConflictPlugins) (CCSPlugin *plugin);
+typedef CCSStringList (*CCSPluginGetProvidesFeatures) (CCSPlugin *plugin);
+typedef CCSStringList (*CCSPluginGetRequiresFeatures) (CCSPlugin *plugin);
+
+typedef void * (*CCSPluginGetPrivatePtr) (CCSPlugin *plugin);
+typedef void (*CCSPluginSetPrivatePtr) (CCSPlugin *plugin, void *);
+
+typedef CCSContext * (*CCSPluginGetContext) (CCSPlugin *plugin);
+
+typedef CCSSetting * (*CCSPluginFindSetting) (CCSPlugin *plugin, const char *name);
+typedef CCSSettingList (*CCSPluginGetPluginSettings) (CCSPlugin *plugin);
+typedef CCSGroupList (*CCSPluginGetPluginGroups) (CCSPlugin *plugin);
+typedef void (*CCSPluginReadPluginSettings) (CCSPlugin *plugin);
+typedef CCSStrExtensionList (*CCSPluginGetPluginStrExtensions) (CCSPlugin *plugin);
+
+inline unsigned int ccsCCSPluginInterfaceGetType ();
+
+struct _CCSPluginInterface
+{
+    CCSPluginGetName pluginGetName;
+    CCSPluginGetShortDesc pluginGetShortDesc;
+    CCSPluginGetLongDesc pluginGetLongDesc;
+    CCSPluginGetHints pluginGetHints;
+    CCSPluginGetCategory pluginGetCategory;
+    CCSPluginGetLoadAfter pluginGetLoadAfter;
+    CCSPluginGetLoadBefore pluginGetLoadBefore;
+    CCSPluginGetRequiresPlugins pluginGetRequiresPlugins;
+    CCSPluginGetConflictPlugins pluginGetConflictPlugins;
+    CCSPluginGetProvidesFeatures pluginGetProvidesFeatures;
+    CCSPluginGetRequiresFeatures pluginGetRequiresFeatures;
+    CCSPluginGetPrivatePtr pluginGetPrivatePtr;
+    CCSPluginSetPrivatePtr pluginSetPrivatePtr;
+    CCSPluginGetContext pluginGetContext;
+    CCSPluginFindSetting pluginFindSetting;
+    CCSPluginGetPluginSettings pluginGetPluginSettings;
+    CCSPluginGetPluginGroups pluginGetPluginGroups;
+    CCSPluginReadPluginSettings pluginReadPluginSettings;
+    CCSPluginGetPluginStrExtensions pluginGetPluginStrExtensions;
+};
+
+/* CCSPlugin accessor functions */
 char * ccsPluginGetName (CCSPlugin *plugin);
 char * ccsPluginGetShortDesc (CCSPlugin *plugin);
 char * ccsPluginGetLongDesc (CCSPlugin *plugin);
@@ -354,11 +407,11 @@
 
 struct _CCSPlugin
 {
-    void *ccsPrivate;              /* private pointer for compizconfig
-				      internal usage */
-    unsigned int refCount;	   /* reference count */
+    CCSObject object;
 };
 
+#define CCS_PLUGIN_INTERFACE_TYPE GET_INTERFACE_TYPE(CCSPluginInterface)
+
 typedef enum _CCSSettingType
 {
     /* This needs to be in the same order as CompOptionType for consistency */
 
=== modified file 'src/ccs-private.h'
--- src/ccs-private.h	2012-04-28 18:58:56 +0000
+++ src/ccs-private.h	2012-04-28 18:58:57 +0000
@@ -28,7 +28,7 @@
 #define CONTEXT_PRIV(c) \
     CCSContextPrivate *cPrivate = (CCSContextPrivate *) ccsObjectGetPrivate ((CCSObject *) c);
 #define PLUGIN_PRIV(p) \
-    CCSPluginPrivate *pPrivate = (CCSPluginPrivate *) p->ccsPrivate;
+    CCSPluginPrivate *pPrivate = (CCSPluginPrivate *) ccsObjectGetPrivate ((CCSObject *) p);
 
 extern Bool basicMetadata;
 
 
=== modified file 'src/compiz.cpp'
--- src/compiz.cpp	2012-04-28 18:58:56 +0000
+++ src/compiz.cpp	2012-04-28 18:58:57 +0000
@@ -865,7 +865,7 @@
     if (!plugin)
 	return;
 
-    plugin->refCount = 1;
+    ccsPluginRef (plugin);
 
     pPrivate = (CCSPluginPrivate *) calloc (1, sizeof (CCSPluginPrivate));
     if (!pPrivate)
@@ -875,7 +875,8 @@
     }
     pPrivate->loaded = FALSE;
 
-    plugin->ccsPrivate = (void *) pPrivate;
+    ccsObjectSetPrivate ((CCSObject *) plugin, (CCSPrivate *) pPrivate);
+    ccsObjectAddInterface ((CCSObject *) plugin, (CCSInterface *) cPrivate->object_interfaces->pluginInterface, CCS_PLUGIN_INTERFACE_TYPE);
 
     if (file)
 	pPrivate->pbFilePath = strdup (file);
@@ -933,7 +934,7 @@
     if (!plugin)
 	return;
 
-    plugin->refCount = 1;
+    ccsPluginRef (plugin);
 
     pPrivate = (CCSPluginPrivate *) calloc (1, sizeof (CCSPluginPrivate));
     if (!pPrivate)
@@ -942,7 +943,8 @@
 	return;
     }
 
-    plugin->ccsPrivate = (void *) pPrivate;
+    ccsObjectSetPrivate ((CCSObject *) plugin, (CCSPrivate *) pPrivate);
+    ccsObjectAddInterface ((CCSObject *) plugin, (CCSInterface *) cPrivate->object_interfaces->pluginInterface, CCS_PLUGIN_INTERFACE_TYPE);
 
     if (file)
 	pPrivate->pbFilePath = strdup (file);
@@ -2510,7 +2512,7 @@
     if (!plugin)
 	return FALSE;
 
-    plugin->refCount = 1;
+    ccsPluginRef (plugin);
 
     pPrivate = (CCSPluginPrivate *) calloc (1, sizeof (CCSPluginPrivate));
     if (!pPrivate)
@@ -2519,7 +2521,8 @@
 	return FALSE;
     }
 
-    plugin->ccsPrivate = (void *) pPrivate;
+    ccsObjectSetPrivate ((CCSObject *) plugin, (CCSPrivate *) pPrivate);
+    ccsObjectAddInterface ((CCSObject *) plugin, (CCSInterface *) cPrivate->object_interfaces->pluginInterface, CCS_PLUGIN_INTERFACE_TYPE);
 
     if (file)
 	pPrivate->xmlFile = strdup (file);
@@ -2577,7 +2580,7 @@
     if (!plugin)
 	return FALSE;
 
-    plugin->refCount = 1;
+    ccsPluginRef (plugin);
 
     pPrivate = (CCSPluginPrivate *) calloc (1, sizeof (CCSPluginPrivate));
     if (!pPrivate)
@@ -2586,7 +2589,8 @@
 	return FALSE;
     }
 
-    plugin->ccsPrivate = (void *) pPrivate;
+    ccsObjectSetPrivate ((CCSObject *) plugin, (CCSPrivate *) pPrivate);
+    ccsObjectAddInterface ((CCSObject *) plugin, (CCSInterface *) cPrivate->object_interfaces->pluginInterface, CCS_PLUGIN_INTERFACE_TYPE);
 
     if (file)
 	pPrivate->xmlFile = strdup (file);
@@ -2924,7 +2928,7 @@
     if (!plugin)
 	return;
 
-    plugin->refCount = 1;
+    ccsPluginRef (plugin);
 
     pPrivate = (CCSPluginPrivate *) calloc (1, sizeof (CCSPluginPrivate));
     if (!pPrivate)
@@ -2933,7 +2937,8 @@
 	return;
     }
 
-    plugin->ccsPrivate = (void *) pPrivate;
+    ccsObjectSetPrivate ((CCSObject *) plugin, (CCSPrivate *) pPrivate);
+    ccsObjectAddInterface ((CCSObject *) plugin, (CCSInterface *) cPrivate->object_interfaces->pluginInterface, CCS_PLUGIN_INTERFACE_TYPE);
 
     pPrivate->context = context;
     pPrivate->name = strdup (name);
 
=== modified file 'src/main.c'
--- src/main.c	2012-04-28 18:58:56 +0000
+++ src/main.c	2012-04-28 18:58:57 +0000
@@ -168,6 +168,7 @@
 }
 
 INTERFACE_TYPE (CCSContextInterface)
+INTERFACE_TYPE (CCSPluginInterface)
 
 Bool basicMetadata = FALSE;
 
@@ -512,7 +513,7 @@
 }
 
 CCSSetting *
-ccsFindSetting (CCSPlugin * plugin, const char *name)
+ccsFindSettingDefault (CCSPlugin * plugin, const char *name)
 {
     if (!plugin)
 	return NULL;
@@ -538,6 +539,15 @@
     return NULL;
 }
 
+CCSSetting *
+ccsFindSetting (CCSPlugin *plugin, const char *name)
+{
+    if (!plugin)
+	return NULL;
+
+    return (*(GET_INTERFACE (CCSPluginInterface, CCS_PLUGIN_INTERFACE_TYPE, plugin))->pluginFindSetting) (plugin, name);
+}
+
 Bool
 ccsPluginIsActiveDefault (CCSContext * context, char *name)
 {
@@ -686,7 +696,7 @@
 	free (pPrivate->pbFilePath);
 #endif
 
-    free (pPrivate);
+    ccsObjectFinalize ((CCSObject *) p);
     free (p);
 }
 
@@ -881,7 +891,6 @@
 		ccsFree##type (d); \
 	} \
 
-CCSREF (Plugin, CCSPlugin)
 CCSREF (Setting, CCSSetting)
 CCSREF (String, CCSString)
 CCSREF (Group, CCSGroup)
@@ -905,6 +914,8 @@
 	    ccsFree##type (d); \
     } \
 
+CCSREF_OBJ (Plugin, CCSPlugin)
+
 static void *
 openBackend (char *backend)
 {
@@ -2442,7 +2453,7 @@
 }
 
 void
-ccsReadPluginSettings (CCSPlugin * plugin)
+ccsReadPluginSettingsDefault (CCSPlugin * plugin)
 {
     if (!plugin || !ccsPluginGetContext (plugin))
 	return;
@@ -2473,6 +2484,12 @@
 }
 
 void
+ccsReadPluginSettings (CCSPlugin *plugin)
+{
+    return (*(GET_INTERFACE (CCSPluginInterface, CCS_PLUGIN_INTERFACE_TYPE, plugin))->pluginReadPluginSettings) (plugin);
+}
+
+void
 ccsWriteSettingsDefault (CCSContext * context)
 {
     if (!context)
@@ -4129,70 +4146,70 @@
 }
 
 char *
-ccsPluginGetName (CCSPlugin *plugin)
+ccsPluginGetNameDefault (CCSPlugin *plugin)
 {
     PLUGIN_PRIV (plugin);
 
     return pPrivate->name;
 }
 
-char * ccsPluginGetShortDesc (CCSPlugin *plugin)
+char * ccsPluginGetShortDescDefault (CCSPlugin *plugin)
 {
     PLUGIN_PRIV (plugin);
 
     return pPrivate->shortDesc;
 }
 
-char * ccsPluginGetLongDesc (CCSPlugin *plugin)
+char * ccsPluginGetLongDescDefault (CCSPlugin *plugin)
 {
     PLUGIN_PRIV (plugin);
 
     return pPrivate->longDesc;
 }
 
-char * ccsPluginGetHints (CCSPlugin *plugin)
+char * ccsPluginGetHintsDefault (CCSPlugin *plugin)
 {
     PLUGIN_PRIV (plugin);
 
     return pPrivate->hints;
 }
 
-char * ccsPluginGetCategory (CCSPlugin *plugin)
+char * ccsPluginGetCategoryDefault (CCSPlugin *plugin)
 {
     PLUGIN_PRIV (plugin);
 
     return pPrivate->category;
 }
 
-CCSStringList ccsPluginGetLoadAfter (CCSPlugin *plugin)
+CCSStringList ccsPluginGetLoadAfterDefault (CCSPlugin *plugin)
 {
     PLUGIN_PRIV (plugin);
 
     return pPrivate->loadAfter;
 }
 
-CCSStringList ccsPluginGetLoadBefore (CCSPlugin *plugin)
+CCSStringList ccsPluginGetLoadBeforeDefault (CCSPlugin *plugin)
 {
     PLUGIN_PRIV (plugin);
 
     return pPrivate->loadBefore;
 }
 
-CCSStringList ccsPluginGetRequiresPlugins (CCSPlugin *plugin)
+CCSStringList ccsPluginGetRequiresPluginsDefault (CCSPlugin *plugin)
 {
     PLUGIN_PRIV (plugin);
 
     return pPrivate->requiresPlugin;
 }
 
-CCSStringList ccsPluginGetConflictPlugins (CCSPlugin *plugin)
+CCSStringList ccsPluginGetConflictPluginsDefault (CCSPlugin *plugin)
 {
     PLUGIN_PRIV (plugin);
 
     return pPrivate->conflictPlugin;
 }
 
-CCSStringList ccsPluginGetProvidesFeatures (CCSPlugin *plugin)
+CCSStringList ccsPluginGetProvidesFeaturesDefault (CCSPlugin *plugin)
 {
     PLUGIN_PRIV (plugin);
 
@@ -4204,53 +4221,133 @@
     return (void *) ccsPluginGetProvidesFeatures (plugin);
 }
 
+CCSStringList ccsPluginGetRequiresFeaturesDefault (CCSPlugin *plugin)
+{
+    PLUGIN_PRIV (plugin);
+
+    return pPrivate->requiresFeature;
+}
+
+void * ccsPluginGetPrivatePtrDefault (CCSPlugin *plugin)
+{
+    PLUGIN_PRIV (plugin);
+
+    return pPrivate->privatePtr;
+}
+
+void ccsPluginSetPrivatePtrDefault (CCSPlugin *plugin, void *ptr)
+{
+    PLUGIN_PRIV (plugin);
+
+    pPrivate->privatePtr = ptr;
+}
+
+CCSContext * ccsPluginGetContextDefault (CCSPlugin *plugin)
+{
+    PLUGIN_PRIV (plugin);
+
+    return pPrivate->context;
+}
+
+/* CCSPlugin accessor functions */
+char * ccsPluginGetName (CCSPlugin *plugin)
+{
+    return (*(GET_INTERFACE (CCSPluginInterface, CCS_PLUGIN_INTERFACE_TYPE, plugin))->pluginGetName) (plugin);
+}
+
+char * ccsPluginGetShortDesc (CCSPlugin *plugin)
+{
+    return (*(GET_INTERFACE (CCSPluginInterface, CCS_PLUGIN_INTERFACE_TYPE, plugin))->pluginGetShortDesc) (plugin);
+}
+
+char * ccsPluginGetLongDesc (CCSPlugin *plugin)
+{
+    return (*(GET_INTERFACE (CCSPluginInterface, CCS_PLUGIN_INTERFACE_TYPE, plugin))->pluginGetLongDesc) (plugin);
+}
+
+char * ccsPluginGetHints (CCSPlugin *plugin)
+{
+    return (*(GET_INTERFACE (CCSPluginInterface, CCS_PLUGIN_INTERFACE_TYPE, plugin))->pluginGetHints) (plugin);
+}
+
+char * ccsPluginGetCategory (CCSPlugin *plugin)
+{
+    return (*(GET_INTERFACE (CCSPluginInterface, CCS_PLUGIN_INTERFACE_TYPE, plugin))->pluginGetCategory) (plugin);
+}
+
+CCSStringList ccsPluginGetLoadAfter (CCSPlugin *plugin)
+{
+    return (*(GET_INTERFACE (CCSPluginInterface, CCS_PLUGIN_INTERFACE_TYPE, plugin))->pluginGetLoadAfter) (plugin);
+}
+
+CCSStringList ccsPluginGetLoadBefore (CCSPlugin *plugin)
+{
+    return (*(GET_INTERFACE (CCSPluginInterface, CCS_PLUGIN_INTERFACE_TYPE, plugin))->pluginGetLoadBefore) (plugin);
+}
+
+CCSStringList ccsPluginGetRequiresPlugins (CCSPlugin *plugin)
+{
+    return (*(GET_INTERFACE (CCSPluginInterface, CCS_PLUGIN_INTERFACE_TYPE, plugin))->pluginGetRequiresPlugins) (plugin);
+}
+
+CCSStringList ccsPluginGetConflictPlugins (CCSPlugin *plugin)
+{
+    return (*(GET_INTERFACE (CCSPluginInterface, CCS_PLUGIN_INTERFACE_TYPE, plugin))->pluginGetConflictPlugins) (plugin);
+}
+
+CCSStringList ccsPluginGetProvidesFeatures (CCSPlugin *plugin)
+{
+    return (*(GET_INTERFACE (CCSPluginInterface, CCS_PLUGIN_INTERFACE_TYPE, plugin))->pluginGetProvidesFeatures) (plugin);
+}
+
 CCSStringList ccsPluginGetRequiresFeatures (CCSPlugin *plugin)
 {
-    PLUGIN_PRIV (plugin);
-
-    return pPrivate->requiresFeature;
+    return (*(GET_INTERFACE (CCSPluginInterface, CCS_PLUGIN_INTERFACE_TYPE, plugin))->pluginGetRequiresFeatures) (plugin);
 }
 
 void * ccsPluginGetPrivatePtr (CCSPlugin *plugin)
 {
-    PLUGIN_PRIV (plugin);
-
-    return pPrivate->privatePtr;
+    return (*(GET_INTERFACE (CCSPluginInterface, CCS_PLUGIN_INTERFACE_TYPE, plugin))->pluginGetPrivatePtr) (plugin);
 }
 
 void ccsPluginSetPrivatePtr (CCSPlugin *plugin, void *ptr)
 {
-    PLUGIN_PRIV (plugin);
-
-    pPrivate->privatePtr = ptr;
+    (*(GET_INTERFACE (CCSPluginInterface, CCS_PLUGIN_INTERFACE_TYPE, plugin))->pluginSetPrivatePtr) (plugin, ptr);
 }
 
 CCSContext * ccsPluginGetContext (CCSPlugin *plugin)
 {
+    return (*(GET_INTERFACE (CCSPluginInterface, CCS_PLUGIN_INTERFACE_TYPE, plugin))->pluginGetContext) (plugin);
+}
+
+CCSSettingList ccsGetPluginSettingsDefault (CCSPlugin *plugin)
+{
     PLUGIN_PRIV (plugin);
 
-    return pPrivate->context;
+    if (!pPrivate->loaded)
+	ccsLoadPluginSettings (plugin);
+
+    return pPrivate->settings;
 }
 
 CCSSettingList ccsGetPluginSettings (CCSPlugin *plugin)
+{
+    return (*(GET_INTERFACE (CCSPluginInterface, CCS_PLUGIN_INTERFACE_TYPE, plugin))->pluginGetPluginSettings) (plugin);
+}
 
+CCSGroupList ccsGetPluginGroupsDefault (CCSPlugin *plugin)
 {
     PLUGIN_PRIV (plugin);
 
     if (!pPrivate->loaded)
 	ccsLoadPluginSettings (plugin);
 
-    return pPrivate->settings;
+    return pPrivate->groups;
 }
 
 CCSGroupList ccsGetPluginGroups (CCSPlugin *plugin)
 {
-    PLUGIN_PRIV (plugin);
-
-    if (!pPrivate->loaded)
-	ccsLoadPluginSettings (plugin);
-
-    return pPrivate->groups;
+    return (*(GET_INTERFACE (CCSPluginInterface, CCS_PLUGIN_INTERFACE_TYPE, plugin))->pluginGetPluginGroups) (plugin);
 }
 
 Bool ccsSettingIsIntegrated (CCSSetting *setting)
@@ -4285,16 +4382,44 @@
     return FALSE;
 }
 
+CCSStrExtensionList ccsGetPluginStrExtensionsDefault (CCSPlugin *plugin)
+{
+    PLUGIN_PRIV (plugin);
+
+    if (!pPrivate->loaded)
+	ccsLoadPluginSettings (plugin);
+
+    return pPrivate->stringExtensions;
+}
+
 CCSStrExtensionList ccsGetPluginStrExtensions (CCSPlugin *plugin)
 {
-    PLUGIN_PRIV (plugin);
-
-    if (!pPrivate->loaded)
-	ccsLoadPluginSettings (plugin);
-
-    return pPrivate->stringExtensions;
+    return (*(GET_INTERFACE (CCSPluginInterface, CCS_PLUGIN_INTERFACE_TYPE, plugin))->pluginGetPluginStrExtensions) (plugin);
 }
 
+static  const CCSPluginInterface ccsDefaultPluginInterface =
+{
+    ccsPluginGetNameDefault,
+    ccsPluginGetShortDescDefault,
+    ccsPluginGetLongDescDefault,
+    ccsPluginGetHintsDefault,
+    ccsPluginGetCategoryDefault,
+    ccsPluginGetLoadAfterDefault,
+    ccsPluginGetLoadBeforeDefault,
+    ccsPluginGetRequiresPluginsDefault,
+    ccsPluginGetConflictPluginsDefault,
+    ccsPluginGetProvidesFeaturesDefault,
+    ccsPluginGetRequiresFeaturesDefault,
+    ccsPluginGetPrivatePtrDefault,
+    ccsPluginSetPrivatePtrDefault,
+    ccsPluginGetContextDefault,
+    ccsFindSettingDefault,
+    ccsGetPluginSettingsDefault,
+    ccsGetPluginGroupsDefault,
+    ccsReadPluginSettingsDefault,
+    ccsGetPluginStrExtensionsDefault
+};
+
 static const CCSContextInterface ccsDefaultContextInterface =
 {
     ccsContextGetPluginsDefault,
@@ -4335,5 +4460,6 @@
 
 const CCSInterfaceTable ccsDefaultInterfaceTable =
 {
-    &ccsDefaultContextInterface
+    &ccsDefaultContextInterface,
+    &ccsDefaultPluginInterface
 };