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

Unmerged revisions

455. By Sam Spilsbury on 2012-04-28

Use CCSObjectFinalize

454. By Sam Spilsbury on 2012-04-28

Use CCSObject for CCSSetting

453. By Sam Spilsbury on 2012-04-28

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

452. By Sam Spilsbury on 2012-04-28

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

451. By Sam Spilsbury on 2012-04-28

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

450. By Sam Spilsbury on 2012-04-28

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

449. By Sam Spilsbury on 2012-04-28

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

448. By Sam Spilsbury on 2012-04-28

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

447. By Sam Spilsbury on 2012-04-28

Works with protocol buffers

446. By Sam Spilsbury on 2012-04-28

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

=== modified file 'include/ccs.h'
--- include/ccs.h	2012-04-28 18:59:44 +0000
+++ include/ccs.h	2012-04-28 18:59:45 +0000
@@ -216,11 +216,13 @@
 typedef struct _CCSInterfaceTable CCSInterfaceTable;
 typedef struct _CCSContextInterface CCSContextInterface;
 typedef struct _CCSPluginInterface CCSPluginInterface;
+typedef struct _CCSSettingInterface CCSSettingInterface;
 
 struct _CCSInterfaceTable
 {
     const CCSContextInterface *contextInterface;
     const CCSPluginInterface *pluginInterface;
+    const CCSSettingInterface *settingInterface;
 };
 
 extern const CCSInterfaceTable ccsDefaultInterfaceTable;
@@ -599,27 +601,190 @@
     unsigned int	 refCount;	   /* reference count */
 };
 
+/* Interface for CCSSetting */
+char * ccsSettingGetName (CCSSetting *setting);
+char * ccsSettingGetShortDesc (CCSSetting *setting);
+char * ccsSettingGetLongDesc (CCSSetting *setting);
+CCSSettingType ccsSettingGetType (CCSSetting *setting);
+CCSSettingInfo * ccsSettingGetInfo (CCSSetting *setting);
+char * ccsSettingGetGroup (CCSSetting *setting);
+char * ccsSettingGetSubGroup (CCSSetting *setting);
+char * ccsSettingGetHints (CCSSetting *setting);
+CCSSettingValue * ccsSettingGetDefaultValue (CCSSetting *setting);
+CCSSettingValue *ccsSettingGetValue (CCSSetting *setting);
+Bool ccsSettingGetIsDefault (CCSSetting *setting);
+CCSPlugin * ccsSettingGetParent (CCSSetting *setting);
+void * ccsSettingGetPrivatePtr (CCSSetting *setting);
+void ccsSettingSetPrivatePtr (CCSSetting *setting, void *ptr);
+
+/* Setting getters. Returns TRUE if the setting value was successfully
+   copied into <data>, FALSE otherwise. */
+Bool ccsGetInt (CCSSetting *setting,
+		int        *data);
+Bool ccsGetFloat (CCSSetting *setting,
+		  float      *data);
+Bool ccsGetBool (CCSSetting *setting,
+		 Bool       *data);
+Bool ccsGetString (CCSSetting *setting,
+		   char       **data);
+Bool ccsGetColor (CCSSetting           *setting,
+		  CCSSettingColorValue *data);
+Bool ccsGetMatch (CCSSetting *setting,
+		  char       **data);
+Bool ccsGetKey (CCSSetting         *setting,
+		CCSSettingKeyValue *data);
+Bool ccsGetButton (CCSSetting            *setting,
+		   CCSSettingButtonValue *data);
+Bool ccsGetEdge (CCSSetting  *setting,
+		 unsigned int *data);
+Bool ccsGetBell (CCSSetting *setting,
+		 Bool       *data);
+Bool ccsGetList (CCSSetting          *setting,
+		 CCSSettingValueList *data);
+
+/* Setting setters. Set <setting> to value <data>. Return TRUE if new value
+   matches data. If the new value doesn't match the old value, the setting
+   is added to the context's changedSettings list. */
+Bool ccsSetInt (CCSSetting *setting,
+		int        data,
+		Bool	   processChanged);
+Bool ccsSetFloat (CCSSetting *setting,
+		  float      data,
+		  Bool	     processChanged);
+Bool ccsSetBool (CCSSetting *setting,
+		 Bool       data,
+		 Bool	    processChanged);
+Bool ccsSetString (CCSSetting *setting,
+		   const char *data,
+		   Bool	      processChanged);
+Bool ccsSetColor (CCSSetting           *setting,
+		  CCSSettingColorValue data,
+		  Bool		       processChanged);
+Bool ccsSetMatch (CCSSetting *setting,
+		  const char *data,
+		  Bool	     processChanged);
+Bool ccsSetKey (CCSSetting         *setting,
+		CCSSettingKeyValue data,
+		Bool		   processChanged);
+Bool ccsSetButton (CCSSetting            *setting,
+		   CCSSettingButtonValue data,
+		   Bool			 processChanged);
+Bool ccsSetEdge (CCSSetting   *setting,
+		 unsigned int data,
+		 Bool	      processChanged);
+Bool ccsSetBell (CCSSetting *setting,
+		 Bool       data,
+		 Bool	    processChanged);
+Bool ccsSetList (CCSSetting          *setting,
+		 CCSSettingValueList data,
+		 Bool	 processChanged);
+Bool ccsSetValue (CCSSetting      *setting,
+		  CCSSettingValue *data,
+		  Bool		  processChanged);
+
+/* Reset all settings to defaults. Settings that were non-default
+   previously are added to the changedSettings list of the context. */
+void ccsResetToDefault (CCSSetting * setting, Bool processChanged);
+
+/* Checks if a given setting is integrated in the desktop environment. */
+Bool ccsSettingIsIntegrated (CCSSetting *setting);
+
+/* Checks if a given setting is read-only. */
+Bool ccsSettingIsReadOnly (CCSSetting *setting);
+
+typedef char * (*CCSSettingGetName) (CCSSetting *);
+typedef char * (*CCSSettingGetShortDesc) (CCSSetting *);
+typedef char * (*CCSSettingGetLongDesc) (CCSSetting *);
+typedef CCSSettingType (*CCSSettingGetType) (CCSSetting *);
+typedef CCSSettingInfo * (*CCSSettingGetInfo) (CCSSetting *);
+typedef char * (*CCSSettingGetGroup) (CCSSetting *);
+typedef char * (*CCSSettingGetSubGroup) (CCSSetting *);
+typedef char * (*CCSSettingGetHints) (CCSSetting *);
+typedef CCSSettingValue * (*CCSSettingGetDefaultValue) (CCSSetting *setting);
+typedef CCSSettingValue * (*CCSSettingGetValue) (CCSSetting *setting);
+typedef Bool (*CCSSettingGetIsDefault) (CCSSetting *);
+typedef CCSPlugin * (*CCSSettingGetParent) (CCSSetting *);
+typedef void * (*CCSSettingGetPrivatePtr) (CCSSetting *);
+typedef void (*CCSSettingSetPrivatePtr) (CCSSetting *, void *);
+typedef Bool (*CCSSettingSetInt) (CCSSetting *setting, int data, Bool processChanged);
+typedef Bool (*CCSSettingSetFloat) (CCSSetting *setting, float data, Bool processChanged);
+typedef Bool (*CCSSettingSetBool) (CCSSetting *setting, Bool data, Bool processChanged);
+typedef Bool (*CCSSettingSetString) (CCSSetting *setting, const char * data, Bool processChanged);
+typedef Bool (*CCSSettingSetColor) (CCSSetting *setting, CCSSettingColorValue data, Bool processChanged);
+typedef Bool (*CCSSettingSetMatch) (CCSSetting *setting, const char * data, Bool processChanged);
+typedef Bool (*CCSSettingSetKey) (CCSSetting *setting, CCSSettingKeyValue data, Bool processChanged);
+typedef Bool (*CCSSettingSetButton) (CCSSetting *setting, CCSSettingButtonValue data, Bool processChanged);
+typedef Bool (*CCSSettingSetEdge) (CCSSetting *setting, unsigned int data, Bool processChanged);
+typedef Bool (*CCSSettingSetBell) (CCSSetting *setting, Bool data, Bool processChanged);
+typedef Bool (*CCSSettingSetList) (CCSSetting *setting, CCSSettingValueList data, Bool processChanged);
+typedef Bool (*CCSSettingSetValue) (CCSSetting *setting, CCSSettingValue *data, Bool processChanged);
+typedef Bool (*CCSSettingGetInt) (CCSSetting *setting, int *data);
+typedef Bool (*CCSSettingGetFloat) (CCSSetting *setting, float *data);
+typedef Bool (*CCSSettingGetBool) (CCSSetting *setting, Bool *data);
+typedef Bool (*CCSSettingGetString) (CCSSetting *setting, char **data);
+typedef Bool (*CCSSettingGetColor) (CCSSetting *setting, CCSSettingColorValue *data);
+typedef Bool (*CCSSettingGetMatch) (CCSSetting *setting, char **data);
+typedef Bool (*CCSSettingGetKey) (CCSSetting *setting, CCSSettingKeyValue *data);
+typedef Bool (*CCSSettingGetButton) (CCSSetting *setting, CCSSettingButtonValue *data);
+typedef Bool (*CCSSettingGetEdge) (CCSSetting *setting, unsigned int *data);
+typedef Bool (*CCSSettingGetBell) (CCSSetting *setting, Bool *data);
+typedef Bool (*CCSSettingGetList) (CCSSetting *setting, CCSSettingValueList *data);
+typedef void (*CCSSettingResetToDefault) (CCSSetting *setting, Bool processChanged);
+typedef Bool (*CCSSettingIsIntegrated) (CCSSetting *setting);
+typedef Bool (*CCSSettingIsReadOnly) (CCSSetting *setting);
+
+inline unsigned int ccsCCSSettingInterfaceGetType ();
+
+struct _CCSSettingInterface
+{
+    CCSSettingGetName settingGetName;
+    CCSSettingGetShortDesc settingGetShortDesc;
+    CCSSettingGetLongDesc settingGetLongDesc;
+    CCSSettingGetType settingGetType;
+    CCSSettingGetInfo settingGetInfo;
+    CCSSettingGetGroup settingGetGroup;
+    CCSSettingGetSubGroup settingGetSubGroup;
+    CCSSettingGetHints settingGetHints;
+    CCSSettingGetDefaultValue settingGetDefaultValue;
+    CCSSettingGetValue settingGetValue;
+    CCSSettingGetIsDefault settingGetIsDefault;
+    CCSSettingGetParent settingGetParent;
+    CCSSettingGetPrivatePtr settingGetPrivatePtr;
+    CCSSettingSetPrivatePtr settingSetPrivatePtr;
+    CCSSettingSetInt settingSetInt;
+    CCSSettingSetFloat settingSetFloat;
+    CCSSettingSetBool settingSetBool;
+    CCSSettingSetString settingSetString;
+    CCSSettingSetColor settingSetColor;
+    CCSSettingSetMatch settingSetMatch;
+    CCSSettingSetKey settingSetKey;
+    CCSSettingSetButton settingSetButton;
+    CCSSettingSetEdge settingSetEdge;
+    CCSSettingSetBell settingSetBell;
+    CCSSettingSetList settingSetList;
+    CCSSettingSetValue settingSetValue;
+    CCSSettingGetInt settingGetInt;
+    CCSSettingGetFloat settingGetFloat;
+    CCSSettingGetBool settingGetBool;
+    CCSSettingGetString settingGetString;
+    CCSSettingGetColor settingGetColor;
+    CCSSettingGetMatch settingGetMatch;
+    CCSSettingGetKey settingGetKey;
+    CCSSettingGetButton settingGetButton;
+    CCSSettingGetEdge settingGetEdge;
+    CCSSettingGetBell settingGetBell;
+    CCSSettingGetList settingGetList;
+    CCSSettingResetToDefault settingResetToDefault;
+    CCSSettingIsIntegrated settingIsIntegrated;
+    CCSSettingIsReadOnly settingIsReadOnly;
+};
+
 struct _CCSSetting
 {
-    void	 *ccsPrivate;
-    unsigned int refCount;	   /* reference count */
+    CCSObject object;
 };
 
-/* Interface for CCSSetting */
-char * ccsSettingGetName (CCSSetting *);
-char * ccsSettingGetShortDesc (CCSSetting *);
-char * ccsSettingGetLongDesc (CCSSetting *);
-CCSSettingType ccsSettingGetType (CCSSetting *);
-CCSSettingInfo * ccsSettingGetInfo (CCSSetting *);
-char * ccsSettingGetGroup (CCSSetting *);
-char * ccsSettingGetSubGroup (CCSSetting *);
-char * ccsSettingGetHints (CCSSetting *);
-CCSSettingValue * ccsSettingGetDefaultValue (CCSSetting *);
-CCSSettingValue *ccsSettingGetValue (CCSSetting *);
-Bool ccsSettingGetIsDefault (CCSSetting *);
-CCSPlugin * ccsSettingGetParent (CCSSetting *);
-void * ccsSettingGetPrivatePtr (CCSSetting *);
-void ccsSettingSetPrivatePtr (CCSSetting *, void *);
+#define CCS_SETTING_INTERFACE_TYPE GET_INTERFACE_TYPE(CCSSettingInterface)
 
 struct _CCSPluginCategory
 {
@@ -680,45 +845,7 @@
 void ccsFreeStrExtension (CCSStrExtension *extension);
 void ccsFreeString (CCSString *str);
 
-/* Setting setters. Set <setting> to value <data>. Return TRUE if new value
-   matches data. If the new value doesn't match the old value, the setting
-   is added to the context's changedSettings list. */
-Bool ccsSetInt (CCSSetting *setting,
-		int        data,
-		Bool	   processChanged);
-Bool ccsSetFloat (CCSSetting *setting,
-		  float      data,
-		  Bool	     processChanged);
-Bool ccsSetBool (CCSSetting *setting,
-		 Bool       data,
-		 Bool	    processChanged);
-Bool ccsSetString (CCSSetting *setting,
-		   const char *data,
-		   Bool	      processChanged);
-Bool ccsSetColor (CCSSetting           *setting,
-		  CCSSettingColorValue data,
-		  Bool		       processChanged);
-Bool ccsSetMatch (CCSSetting *setting,
-		  const char *data,
-		  Bool	     processChanged);
-Bool ccsSetKey (CCSSetting         *setting,
-		CCSSettingKeyValue data,
-		Bool		   processChanged);
-Bool ccsSetButton (CCSSetting            *setting,
-		   CCSSettingButtonValue data,
-		   Bool			 processChanged);
-Bool ccsSetEdge (CCSSetting   *setting,
-		 unsigned int data,
-		 Bool	      processChanged);
-Bool ccsSetBell (CCSSetting *setting,
-		 Bool       data,
-		 Bool	    processChanged);
-Bool ccsSetList (CCSSetting          *setting,
-		 CCSSettingValueList data,
-		 Bool	 processChanged);
-Bool ccsSetValue (CCSSetting      *setting,
-		  CCSSettingValue *data,
-		  Bool		  processChanged);
+
 
 /* Compares two setting values. Returns TRUE if values match,
    FALSE otherwise. */
@@ -729,31 +856,6 @@
 Bool ccsIsEqualButton (CCSSettingButtonValue c1,
 		       CCSSettingButtonValue c2);
 
-/* Setting getters. Returns TRUE if the setting value was successfully
-   copied into <data>, FALSE otherwise. */
-Bool ccsGetInt (CCSSetting *setting,
-		int        *data);
-Bool ccsGetFloat (CCSSetting *setting,
-		  float      *data);
-Bool ccsGetBool (CCSSetting *setting,
-		 Bool       *data);
-Bool ccsGetString (CCSSetting *setting,
-		   char       **data);
-Bool ccsGetColor (CCSSetting           *setting,
-		  CCSSettingColorValue *data);
-Bool ccsGetMatch (CCSSetting *setting,
-		  char       **data);
-Bool ccsGetKey (CCSSetting         *setting,
-		CCSSettingKeyValue *data);
-Bool ccsGetButton (CCSSetting            *setting,
-		   CCSSettingButtonValue *data);
-Bool ccsGetEdge (CCSSetting  *setting,
-		 unsigned int *data);
-Bool ccsGetBell (CCSSetting *setting,
-		 Bool       *data);
-Bool ccsGetList (CCSSetting          *setting,
-		 CCSSettingValueList *data);
-
 /* Retrieves a list of settings in a plugin */
 CCSSettingList ccsGetPluginSettings (CCSPlugin *plugin);
 
@@ -905,10 +1007,6 @@
 /* Write changed settings to disk */
 void ccsWriteChangedSettings (CCSContext *context);
 
-/* Reset all settings to defaults. Settings that were non-default
-   previously are added to the changedSettings list of the context. */
-void ccsResetToDefault (CCSSetting * setting, Bool processChanged);
-
 /* Exports a profile to a file. If skipDefaults is TRUE, only exports
    non-default settings. Returns TRUE on successful export, FALSE otherwise. */
 Bool ccsExportToFile (CCSContext *context,
@@ -1098,12 +1196,6 @@
 /* Enumerates the available backends. */
 CCSBackendInfoList ccsGetExistingBackends (void);
 
-/* Checks if a given setting is integrated in the desktop environment. */
-Bool ccsSettingIsIntegrated (CCSSetting *setting);
-
-/* Checks if a given setting is read-only. */
-Bool ccsSettingIsReadOnly (CCSSetting *setting);
-
 CCSStrExtensionList ccsGetPluginStrExtensions (CCSPlugin *plugin);
 
 #ifdef __cplusplus

=== modified file 'src/ccs-private.h'
--- src/ccs-private.h	2012-04-28 18:59:44 +0000
+++ src/ccs-private.h	2012-04-28 18:59:45 +0000
@@ -30,7 +30,7 @@
 #define PLUGIN_PRIV(p) \
     CCSPluginPrivate *pPrivate = (CCSPluginPrivate *) ccsObjectGetPrivate ((CCSObject *) p);
 #define SETTING_PRIV(s) \
-    CCSSettingPrivate *sPrivate = (CCSSettingPrivate *) s->ccsPrivate;
+    CCSSettingPrivate *sPrivate = (CCSSettingPrivate *) ccsObjectGetPrivate ((CCSObject *) s);
 
 extern Bool basicMetadata;
 

=== modified file 'src/compiz.cpp'
--- src/compiz.cpp	2012-04-28 18:59:44 +0000
+++ src/compiz.cpp	2012-04-28 18:59:45 +0000
@@ -559,24 +559,29 @@
 	return;
     }
 
+    CONTEXT_PRIV (ccsPluginGetContext (plugin));
+
     setting = (CCSSetting *) calloc (1, sizeof (CCSSetting));
     if (!setting)
 	return;
 
-    setting->ccsPrivate = (CCSSettingPrivate *) calloc (1, sizeof (CCSSettingPrivate));
+    CCSSettingPrivate *ccsPrivate = (CCSSettingPrivate *) calloc (1, sizeof (CCSSettingPrivate));
 
-    if (!setting->ccsPrivate)
+    if (!ccsPrivate)
     {
 	free (setting);
 	return;
     }
 
+    ccsObjectSetPrivate ((CCSObject *) setting, (CCSPrivate *) ccsPrivate);
+    ccsObjectAddInterface ((CCSObject *) setting, (CCSInterface *) cPrivate->object_interfaces->settingInterface, CCS_SETTING_INTERFACE_TYPE);
+    ccsSettingRef (setting);
+
     SETTING_PRIV (setting);
 
     sPrivate->parent = plugin;
     sPrivate->isDefault = TRUE;
     sPrivate->name = strdup (name);
-    setting->refCount = 1;
 
     if (!basicMetadata)
     {
@@ -2003,24 +2008,29 @@
     if (getOptionType (type) == TypeNum)
 	return;
 
+    CONTEXT_PRIV (ccsPluginGetContext (plugin));
+
     setting = (CCSSetting *) calloc (1, sizeof (CCSSetting));
     if (!setting)
 	return;
 
-    setting->ccsPrivate = (void *) calloc (1, sizeof (CCSSettingPrivate));
+    CCSSettingPrivate *ccsPrivate = (CCSSettingPrivate *) calloc (1, sizeof (CCSSettingPrivate));
 
-    if (!setting->ccsPrivate)
+    if (!ccsPrivate)
     {
 	free (setting);
 	return;
     }
 
+    ccsObjectSetPrivate ((CCSObject *) setting, (CCSPrivate *) ccsPrivate);
+    ccsObjectAddInterface ((CCSObject *) setting, (CCSInterface *) cPrivate->object_interfaces->settingInterface, CCS_SETTING_INTERFACE_TYPE);
+    ccsSettingRef (setting);
+
     SETTING_PRIV (setting)
 
     sPrivate->parent = plugin;
     sPrivate->isDefault = TRUE;
     sPrivate->name = strdup (name);
-    setting->refCount = 1;
 
     if (!basicMetadata)
     {

=== modified file 'src/main.c'
--- src/main.c	2012-04-28 18:59:44 +0000
+++ src/main.c	2012-04-28 18:59:45 +0000
@@ -169,6 +169,7 @@
 
 INTERFACE_TYPE (CCSContextInterface)
 INTERFACE_TYPE (CCSPluginInterface)
+INTERFACE_TYPE (CCSSettingInterface)
 
 Bool basicMetadata = FALSE;
 
@@ -741,7 +742,7 @@
 
     ccsFreeSettingValue (&sPrivate->defaultValue);
 
-    free (sPrivate);
+    ccsObjectFinalize ((CCSObject *) s);
     free (s);
 }
 
@@ -895,7 +896,7 @@
 		ccsFree##type (d); \
 	} \
 
-CCSREF (Setting, CCSSetting)
+
 CCSREF (String, CCSString)
 CCSREF (Group, CCSGroup)
 CCSREF (SubGroup, CCSSubGroup)
@@ -919,6 +920,7 @@
     } \
 
 CCSREF_OBJ (Plugin, CCSPlugin)
+CCSREF_OBJ (Setting, CCSSetting)
 
 static void *
 openBackend (char *backend)
@@ -1228,10 +1230,12 @@
     memcpy (to, from, sizeof (CCSSetting));
 
     /* Allocate a new private ptr for the new setting */
-    to->ccsPrivate = calloc (1, sizeof (CCSSettingPrivate));
-
-    CCSSettingPrivate *fromPrivate = (CCSSettingPrivate *) from->ccsPrivate;
-    CCSSettingPrivate *toPrivate = (CCSSettingPrivate *) to->ccsPrivate;
+    CCSSettingPrivate *ccsPrivate = calloc (1, sizeof (CCSSettingPrivate));
+
+    ccsObjectSetPrivate ((CCSObject *) to, (CCSPrivate *) ccsPrivate);
+
+    CCSSettingPrivate *fromPrivate = (CCSSettingPrivate *) ccsObjectGetPrivate ((CCSObject *) from);
+    CCSSettingPrivate *toPrivate = (CCSSettingPrivate *) ccsObjectGetPrivate ((CCSObject *) to);
 
     if (fromPrivate->name)
 	toPrivate->name = strdup (fromPrivate->name);
@@ -1264,7 +1268,7 @@
     toPrivate->defaultValue.parent = to;
     toPrivate->privatePtr = NULL;
     
-    to->refCount = 1;
+    ((CCSObject *) to)->refcnt = 1;
 }
 
 static void
@@ -1293,7 +1297,7 @@
 }
 
 void
-ccsResetToDefault (CCSSetting * setting, Bool processChanged)
+ccsSettingResetToDefaultDefault (CCSSetting * setting, Bool processChanged)
 {
     SETTING_PRIV (setting)
 
@@ -1368,7 +1372,7 @@
  * maybe we need to switch to C++ here and use templates ... */
 
 Bool
-ccsSetInt (CCSSetting * setting, int data, Bool processChanged)
+ccsSettingSetIntDefault (CCSSetting * setting, int data, Bool processChanged)
 {
     SETTING_PRIV (setting)
 
@@ -1403,7 +1407,7 @@
 }
 
 Bool
-ccsSetFloat (CCSSetting * setting, float data, Bool processChanged)
+ccsSettingSetFloatDefault (CCSSetting * setting, float data, Bool processChanged)
 {
     SETTING_PRIV (setting);
 
@@ -1440,7 +1444,7 @@
 }
 
 Bool
-ccsSetBool (CCSSetting * setting, Bool data, Bool processChanged)
+ccsSettingSetBoolDefault (CCSSetting * setting, Bool data, Bool processChanged)
 {
     SETTING_PRIV (setting)
 
@@ -1476,7 +1480,7 @@
 }
 
 Bool
-ccsSetString (CCSSetting * setting, const char *data, Bool processChanged)
+ccsSettingSetStringDefault (CCSSetting * setting, const char *data, Bool processChanged)
 {
     SETTING_PRIV (setting);
 
@@ -1514,7 +1518,7 @@
 }
 
 Bool
-ccsSetColor (CCSSetting * setting, CCSSettingColorValue data, Bool processChanged)
+ccsSettingSetColorDefault (CCSSetting * setting, CCSSettingColorValue data, Bool processChanged)
 {
     SETTING_PRIV (setting)
 
@@ -1549,7 +1553,7 @@
 }
 
 Bool
-ccsSetMatch (CCSSetting * setting, const char *data, Bool processChanged)
+ccsSettingSetMatchDefault (CCSSetting * setting, const char *data, Bool processChanged)
 {
     SETTING_PRIV (setting);
 
@@ -1587,7 +1591,7 @@
 }
 
 Bool
-ccsSetKey (CCSSetting * setting, CCSSettingKeyValue data, Bool processChanged)
+ccsSettingSetKeyDefault (CCSSetting * setting, CCSSettingKeyValue data, Bool processChanged)
 {
     SETTING_PRIV (setting);
 
@@ -1623,7 +1627,7 @@
 }
 
 Bool
-ccsSetButton (CCSSetting * setting, CCSSettingButtonValue data, Bool processChanged)
+ccsSettingSetButtonDefault (CCSSetting * setting, CCSSettingButtonValue data, Bool processChanged)
 {
     SETTING_PRIV (setting);
 
@@ -1660,7 +1664,7 @@
 }
 
 Bool
-ccsSetEdge (CCSSetting * setting, unsigned int data, Bool processChanged)
+ccsSettingSetEdgeDefault (CCSSetting * setting, unsigned int data, Bool processChanged)
 {
     SETTING_PRIV (setting)
 
@@ -1693,7 +1697,7 @@
 }
 
 Bool
-ccsSetBell (CCSSetting * setting, Bool data, Bool processChanged)
+ccsSettingSetBellDefault (CCSSetting * setting, Bool data, Bool processChanged)
 {
     SETTING_PRIV (setting);
 
@@ -1792,7 +1796,7 @@
 }
 
 Bool
-ccsSetList (CCSSetting * setting, CCSSettingValueList data, Bool processChanged)
+ccsSettingSetListDefault (CCSSetting * setting, CCSSettingValueList data, Bool processChanged)
 {
     SETTING_PRIV (setting)
 
@@ -1850,7 +1854,7 @@
 }
 
 Bool
-ccsSetValue (CCSSetting * setting, CCSSettingValue * data, Bool processChanged)
+ccsSettingSetValueDefault (CCSSetting * setting, CCSSettingValue * data, Bool processChanged)
 {
     SETTING_PRIV (setting);
 
@@ -1896,7 +1900,7 @@
 }
 
 Bool
-ccsGetInt (CCSSetting * setting, int *data)
+ccsSettingGetIntDefault (CCSSetting * setting, int *data)
 {
     SETTING_PRIV (setting);
 
@@ -1908,7 +1912,7 @@
 }
 
 Bool
-ccsGetFloat (CCSSetting * setting, float *data)
+ccsSettingGetFloatDefault (CCSSetting * setting, float *data)
 {
     SETTING_PRIV (setting)
 
@@ -1920,7 +1924,7 @@
 }
 
 Bool
-ccsGetBool (CCSSetting * setting, Bool * data)
+ccsSettingGetBoolDefault (CCSSetting * setting, Bool * data)
 {
     SETTING_PRIV (setting)
 
@@ -1932,7 +1936,7 @@
 }
 
 Bool
-ccsGetString (CCSSetting * setting, char **data)
+ccsSettingGetStringDefault (CCSSetting * setting, char **data)
 {
     SETTING_PRIV (setting)
 
@@ -1944,7 +1948,7 @@
 }
 
 Bool
-ccsGetColor (CCSSetting * setting, CCSSettingColorValue * data)
+ccsSettingGetColorDefault (CCSSetting * setting, CCSSettingColorValue * data)
 {
     SETTING_PRIV (setting)
 
@@ -1956,7 +1960,7 @@
 }
 
 Bool
-ccsGetMatch (CCSSetting * setting, char **data)
+ccsSettingGetMatchDefault (CCSSetting * setting, char **data)
 {
     SETTING_PRIV (setting)
 
@@ -1968,7 +1972,7 @@
 }
 
 Bool
-ccsGetKey (CCSSetting * setting, CCSSettingKeyValue * data)
+ccsSettingGetKeyDefault (CCSSetting * setting, CCSSettingKeyValue * data)
 {
     SETTING_PRIV (setting)
 
@@ -1980,7 +1984,7 @@
 }
 
 Bool
-ccsGetButton (CCSSetting * setting, CCSSettingButtonValue * data)
+ccsSettingGetButtonDefault (CCSSetting * setting, CCSSettingButtonValue * data)
 {
     SETTING_PRIV (setting)
 
@@ -1992,7 +1996,7 @@
 }
 
 Bool
-ccsGetEdge (CCSSetting * setting, unsigned int * data)
+ccsSettingGetEdgeDefault (CCSSetting * setting, unsigned int * data)
 {
     SETTING_PRIV (setting)
 
@@ -2004,7 +2008,7 @@
 }
 
 Bool
-ccsGetBell (CCSSetting * setting, Bool * data)
+ccsSettingGetBellDefault (CCSSetting * setting, Bool * data)
 {
     SETTING_PRIV (setting)
 
@@ -2016,7 +2020,7 @@
 }
 
 Bool
-ccsGetList (CCSSetting * setting, CCSSettingValueList * data)
+ccsSettingGetListDefault (CCSSetting * setting, CCSSettingValueList * data)
 {
     SETTING_PRIV (setting)
 
@@ -2027,6 +2031,171 @@
     return TRUE;
 }
 
+Bool ccsGetInt (CCSSetting *setting,
+		int        *data)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, CCS_SETTING_INTERFACE_TYPE, setting))->settingGetInt) (setting, data);
+}
+
+Bool ccsGetFloat (CCSSetting *setting,
+		  float      *data)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, CCS_SETTING_INTERFACE_TYPE, setting))->settingGetFloat) (setting, data);
+}
+
+Bool ccsGetBool (CCSSetting *setting,
+		 Bool       *data)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, CCS_SETTING_INTERFACE_TYPE, setting))->settingGetBool) (setting, data);
+}
+
+Bool ccsGetString (CCSSetting *setting,
+		   char       **data)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, CCS_SETTING_INTERFACE_TYPE, setting))->settingGetString) (setting, data);
+}
+
+Bool ccsGetColor (CCSSetting           *setting,
+		  CCSSettingColorValue *data)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, CCS_SETTING_INTERFACE_TYPE, setting))->settingGetColor) (setting, data);
+}
+
+Bool ccsGetMatch (CCSSetting *setting,
+		  char       **data)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, CCS_SETTING_INTERFACE_TYPE, setting))->settingGetMatch) (setting, data);
+}
+
+Bool ccsGetKey (CCSSetting         *setting,
+		CCSSettingKeyValue *data)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, CCS_SETTING_INTERFACE_TYPE, setting))->settingGetKey) (setting, data);
+}
+
+Bool ccsGetButton (CCSSetting            *setting,
+		   CCSSettingButtonValue *data)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, CCS_SETTING_INTERFACE_TYPE, setting))->settingGetButton) (setting, data);
+}
+
+Bool ccsGetEdge (CCSSetting  *setting,
+		 unsigned int *data)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, CCS_SETTING_INTERFACE_TYPE, setting))->settingGetEdge) (setting, data);
+}
+
+Bool ccsGetBell (CCSSetting *setting,
+		 Bool       *data)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, CCS_SETTING_INTERFACE_TYPE, setting))->settingGetBell) (setting, data);
+}
+
+Bool ccsGetList (CCSSetting          *setting,
+		 CCSSettingValueList *data)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, CCS_SETTING_INTERFACE_TYPE, setting))->settingGetList) (setting, data);
+}
+
+Bool ccsSetInt (CCSSetting *setting,
+		int        data,
+		Bool	   processChanged)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, CCS_SETTING_INTERFACE_TYPE, setting))->settingSetInt) (setting, data, processChanged);
+}
+
+Bool ccsSetFloat (CCSSetting *setting,
+		  float      data,
+		  Bool	     processChanged)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, CCS_SETTING_INTERFACE_TYPE, setting))->settingSetFloat) (setting, data, processChanged);
+}
+
+Bool ccsSetBool (CCSSetting *setting,
+		 Bool       data,
+		 Bool	    processChanged)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, CCS_SETTING_INTERFACE_TYPE, setting))->settingSetBool) (setting, data, processChanged);
+}
+
+Bool ccsSetString (CCSSetting *setting,
+		   const char *data,
+		   Bool	      processChanged)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, CCS_SETTING_INTERFACE_TYPE, setting))->settingSetString) (setting, data, processChanged);
+}
+
+Bool ccsSetColor (CCSSetting           *setting,
+		  CCSSettingColorValue data,
+		  Bool		       processChanged)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, CCS_SETTING_INTERFACE_TYPE, setting))->settingSetColor) (setting, data, processChanged);
+}
+
+Bool ccsSetMatch (CCSSetting *setting,
+		  const char *data,
+		  Bool	     processChanged)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, CCS_SETTING_INTERFACE_TYPE, setting))->settingSetMatch) (setting, data, processChanged);
+}
+
+Bool ccsSetKey (CCSSetting         *setting,
+		CCSSettingKeyValue data,
+		Bool		   processChanged)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, CCS_SETTING_INTERFACE_TYPE, setting))->settingSetKey) (setting, data, processChanged);
+}
+
+Bool ccsSetButton (CCSSetting            *setting,
+		   CCSSettingButtonValue data,
+		   Bool			 processChanged)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, CCS_SETTING_INTERFACE_TYPE, setting))->settingSetButton) (setting, data, processChanged);
+}
+
+Bool ccsSetEdge (CCSSetting   *setting,
+		 unsigned int data,
+		 Bool	      processChanged)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, CCS_SETTING_INTERFACE_TYPE, setting))->settingSetEdge) (setting, data, processChanged);
+}
+
+Bool ccsSetBell (CCSSetting *setting,
+		 Bool       data,
+		 Bool	    processChanged)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, CCS_SETTING_INTERFACE_TYPE, setting))->settingSetBell) (setting, data, processChanged);
+}
+
+Bool ccsSetList (CCSSetting          *setting,
+		 CCSSettingValueList data,
+		 Bool	 processChanged)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, CCS_SETTING_INTERFACE_TYPE, setting))->settingSetList) (setting, data, processChanged);
+}
+
+Bool ccsSetValue (CCSSetting      *setting,
+		  CCSSettingValue *data,
+		  Bool		  processChanged)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, CCS_SETTING_INTERFACE_TYPE, setting))->settingSetValue) (setting, data, processChanged);
+}
+
+void ccsResetToDefault (CCSSetting * setting, Bool processChanged)
+{
+    (*(GET_INTERFACE (CCSSettingInterface, CCS_SETTING_INTERFACE_TYPE, setting))->settingResetToDefault) (setting, processChanged);
+}
+
+Bool ccsSettingIsIntegrated (CCSSetting *setting)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, CCS_SETTING_INTERFACE_TYPE, setting))->settingIsIntegrated) (setting);
+}
+
+Bool ccsSettingIsReadOnly (CCSSetting *setting)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, CCS_SETTING_INTERFACE_TYPE, setting))->settingIsReadOnly) (setting);
+}
+
 void
 ccsContextDestroy (CCSContext * context)
 {
@@ -4416,7 +4585,78 @@
     return (*(GET_INTERFACE (CCSPluginInterface, CCS_PLUGIN_INTERFACE_TYPE, plugin))->pluginGetPluginGroups) (plugin);
 }
 
-Bool ccsSettingIsIntegrated (CCSSetting *setting)
+char * ccsSettingGetName (CCSSetting *setting)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, CCS_SETTING_INTERFACE_TYPE, setting))->settingGetName) (setting);
+}
+
+char * ccsSettingGetShortDesc (CCSSetting *setting)
+
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, CCS_SETTING_INTERFACE_TYPE, setting))->settingGetShortDesc) (setting);
+}
+
+char * ccsSettingGetLongDesc (CCSSetting *setting)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, CCS_SETTING_INTERFACE_TYPE, setting))->settingGetLongDesc) (setting);
+}
+
+CCSSettingType ccsSettingGetType (CCSSetting *setting)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, CCS_SETTING_INTERFACE_TYPE, setting))->settingGetType) (setting);
+}
+
+CCSSettingInfo * ccsSettingGetInfo (CCSSetting *setting)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, CCS_SETTING_INTERFACE_TYPE, setting))->settingGetInfo) (setting);
+}
+
+char * ccsSettingGetGroup (CCSSetting *setting)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, CCS_SETTING_INTERFACE_TYPE, setting))->settingGetGroup) (setting);
+}
+
+char * ccsSettingGetSubGroup (CCSSetting *setting)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, CCS_SETTING_INTERFACE_TYPE, setting))->settingGetSubGroup) (setting);
+}
+
+char * ccsSettingGetHints (CCSSetting *setting)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, CCS_SETTING_INTERFACE_TYPE, setting))->settingGetHints) (setting);
+}
+
+CCSSettingValue * ccsSettingGetDefaultValue (CCSSetting *setting)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, CCS_SETTING_INTERFACE_TYPE, setting))->settingGetDefaultValue) (setting);
+}
+
+CCSSettingValue *ccsSettingGetValue (CCSSetting *setting)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, CCS_SETTING_INTERFACE_TYPE, setting))->settingGetValue) (setting);
+}
+
+Bool ccsSettingGetIsDefault (CCSSetting *setting)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, CCS_SETTING_INTERFACE_TYPE, setting))->settingGetIsDefault) (setting);
+}
+
+CCSPlugin * ccsSettingGetParent (CCSSetting *setting)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, CCS_SETTING_INTERFACE_TYPE, setting))->settingGetParent) (setting);
+}
+
+void * ccsSettingGetPrivatePtr (CCSSetting *setting)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, CCS_SETTING_INTERFACE_TYPE, setting))->settingGetPrivatePtr) (setting);
+}
+
+void ccsSettingSetPrivatePtr (CCSSetting *setting, void *ptr)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, CCS_SETTING_INTERFACE_TYPE, setting))->settingSetPrivatePtr) (setting, ptr);
+}
+
+Bool ccsSettingGetIsIntegratedDefault (CCSSetting *setting)
 {
     if (!setting)
 	return FALSE;
@@ -4432,7 +4672,7 @@
     return FALSE;
 }
 
-Bool ccsSettingIsReadOnly (CCSSetting *setting)
+Bool ccsSettingGetIsReadOnlyDefault (CCSSetting *setting)
 {
     if (!setting)
 	return FALSE;
@@ -4450,98 +4690,98 @@
 
 /* Interface for CCSSetting */
 char *
-ccsSettingGetName (CCSSetting *setting)
+ccsSettingGetNameDefault (CCSSetting *setting)
 {
     SETTING_PRIV (setting);
 
     return sPrivate->name;
 }
 
-char * ccsSettingGetShortDesc (CCSSetting *setting)
+char * ccsSettingGetShortDescDefault (CCSSetting *setting)
 {
     SETTING_PRIV (setting);
 
     return sPrivate->shortDesc;
 }
 
-char * ccsSettingGetLongDesc (CCSSetting *setting)
+char * ccsSettingGetLongDescDefault (CCSSetting *setting)
 {
     SETTING_PRIV (setting);
 
     return sPrivate->longDesc;
 }
 
-CCSSettingType ccsSettingGetType (CCSSetting *setting)
+CCSSettingType ccsSettingGetTypeDefault (CCSSetting *setting)
 {
     SETTING_PRIV (setting);
 
     return sPrivate->type;
 }
 
-CCSSettingInfo * ccsSettingGetInfo (CCSSetting *setting)
+CCSSettingInfo * ccsSettingGetInfoDefault (CCSSetting *setting)
 {
     SETTING_PRIV (setting);
 
     return &sPrivate->info;
 }
 
-char * ccsSettingGetGroup (CCSSetting *setting)
+char * ccsSettingGetGroupDefault (CCSSetting *setting)
 {
     SETTING_PRIV (setting);
 
     return sPrivate->group;
 }
 
-char * ccsSettingGetSubGroup (CCSSetting *setting)
+char * ccsSettingGetSubGroupDefault (CCSSetting *setting)
 {
     SETTING_PRIV (setting);
 
     return sPrivate->subGroup;
 }
 
-char * ccsSettingGetHints (CCSSetting *setting)
+char * ccsSettingGetHintsDefault (CCSSetting *setting)
 {
     SETTING_PRIV (setting);
 
     return sPrivate->hints;
 }
 
-CCSSettingValue * ccsSettingGetDefaultValue (CCSSetting *setting)
+CCSSettingValue * ccsSettingGetDefaultValueDefault (CCSSetting *setting)
 {
     SETTING_PRIV (setting);
 
     return &sPrivate->defaultValue;
 }
 
-CCSSettingValue * ccsSettingGetValue (CCSSetting *setting)
+CCSSettingValue * ccsSettingGetValueDefault (CCSSetting *setting)
 {
     SETTING_PRIV (setting);
 
     return sPrivate->value;
 }
 
-Bool ccsSettingGetIsDefault (CCSSetting *setting)
+Bool ccsSettingGetIsDefaultDefault (CCSSetting *setting)
 {
     SETTING_PRIV (setting);
 
     return sPrivate->isDefault;
 }
 
-CCSPlugin * ccsSettingGetParent (CCSSetting *setting)
+CCSPlugin * ccsSettingGetParentDefault (CCSSetting *setting)
 {
     SETTING_PRIV (setting);
 
     return sPrivate->parent;
 }
 
-void * ccsSettingGetPrivatePtr (CCSSetting *setting)
+void * ccsSettingGetPrivatePtrDefault (CCSSetting *setting)
 {
     SETTING_PRIV (setting);
 
     return sPrivate->privatePtr;
 }
 
-void ccsSettingSetPrivatePtr (CCSSetting *setting, void *ptr)
+void ccsSettingSetPrivatePtrDefault (CCSSetting *setting, void *ptr)
 {
     SETTING_PRIV (setting);
 
@@ -4624,8 +4864,53 @@
     ccsLoadPluginsDefault
 };
 
+static const CCSSettingInterface ccsDefaultSettingInterface =
+{
+    ccsSettingGetNameDefault,
+    ccsSettingGetShortDescDefault,
+    ccsSettingGetLongDescDefault,
+    ccsSettingGetTypeDefault,
+    ccsSettingGetInfoDefault,
+    ccsSettingGetGroupDefault,
+    ccsSettingGetSubGroupDefault,
+    ccsSettingGetHintsDefault,
+    ccsSettingGetDefaultValueDefault,
+    ccsSettingGetValueDefault,
+    ccsSettingGetIsDefaultDefault,
+    ccsSettingGetParentDefault,
+    ccsSettingGetPrivatePtrDefault,
+    ccsSettingSetPrivatePtrDefault,
+    ccsSettingSetIntDefault,
+    ccsSettingSetFloatDefault,
+    ccsSettingSetBoolDefault,
+    ccsSettingSetStringDefault,
+    ccsSettingSetColorDefault,
+    ccsSettingSetMatchDefault,
+    ccsSettingSetKeyDefault,
+    ccsSettingSetButtonDefault,
+    ccsSettingSetEdgeDefault,
+    ccsSettingSetBellDefault,
+    ccsSettingSetListDefault,
+    ccsSettingSetValueDefault,
+    ccsSettingGetIntDefault,
+    ccsSettingGetFloatDefault,
+    ccsSettingGetBoolDefault,
+    ccsSettingGetStringDefault,
+    ccsSettingGetColorDefault,
+    ccsSettingGetMatchDefault,
+    ccsSettingGetKeyDefault,
+    ccsSettingGetButtonDefault,
+    ccsSettingGetEdgeDefault,
+    ccsSettingGetBellDefault,
+    ccsSettingGetListDefault,
+    ccsSettingResetToDefaultDefault,
+    ccsSettingGetIsIntegratedDefault,
+    ccsSettingGetIsReadOnlyDefault
+};
+
 const CCSInterfaceTable ccsDefaultInterfaceTable =
 {
     &ccsDefaultContextInterface,
-    &ccsDefaultPluginInterface
+    &ccsDefaultPluginInterface,
+    &ccsDefaultSettingInterface
 };