Merge lp:~compiz-team/compiz/compiz.ccs_test_990690 into lp:compiz/0.9.8

[Sam Spilsbury]

    Do the initial work to get libcompizconfig under test. (LP: #990690)

    libcompizconfig underwent some fairly large refactorings so that we could
    get it under test. This includes moving all of the public data in the public
    API structs into private structs and creating accessor functions for all of
    that data. The accessor functions are wrappers around interface structures which
    can be replaced at runtime for testing purposes.

    A C based object system was added to make this possible:

    This branch introduces some preliminary work in a series of branches to get libcompizconfig under test. In order to test the objects properly, we need to abstract away their interfaces$

    This would be awkward to do correctly if we didn't have a suitable object system to handle interface implementation, referencing, private storage etc.

    As such, a new struct CCSObject is introduced. It is similar in design to GObject, but with a much smaller feature set centered mostly around the handling of interfaces and composition$

    Tests are included.

    Basic mock classes for all of the public API were added for testing.

    The gconf backend and compizconfig-python were adapted as necessary.

    Merge in the following branches manually:

    lp:~smspillaz/compiz-compizconfig-python/compiz-compizconfig-python.context-api ⇒ lp:compiz-compizconfig-python
    lp:~smspillaz/compiz-compizconfig-python/compiz-compizconfig-python.plugin-api ⇒ lp:compiz-compizconfig-python
    lp:~smspillaz/compiz-compizconfig-python/compiz-compizconfig-python.setting-api ⇒ lp:compiz-compizconfig-python
    lp:~smspillaz/compiz-compizconfig-gconf/compiz-compizconfig-gconf.adapt-to-new-interfaces ⇒ lp:compiz-compizconfig-gconf
    lp:~smspillaz/compiz-libcompizconfig/refactor-setting ⇒ lp:compiz-libcompizconfig
    lp:~smspillaz/compiz-libcompizconfig/setting-funcs-behind-interface ⇒ lp:compiz-libcompizconfig
    lp:~smspillaz/compiz-libcompizconfig/context-mock ⇒ lp:compiz-libcompizconfig
    lp:~smspillaz/compiz-libcompizconfig/plugin-mock ⇒ lp:compiz-libcompizconfig
    lp:~smspillaz/compiz-libcompizconfig/setting-mock ⇒ lp:compiz-libcompizconfig
    lp:~smspillaz/compiz-libcompizconfig/refactor-context ⇒ lp:compiz-libcompizconfig
    lp:~smspillaz/compiz-libcompizconfig/ccs-object ⇒ lp:compiz-libcompizconfig
    lp:~smspillaz/compiz-libcompizconfig/refactor-plugin ⇒ lp:compiz-libcompizconfig
    lp:~smspillaz/compiz-libcompizconfig/context-funcs-behind-interface ⇒ lp:compiz-libcompizconfig
    lp:~smspillaz/compiz-libcompizconfig/plugin-funcs-behind-interface ⇒ lp:compiz-libcompizconfig

All of the above branches have been reviewed by ~alan-griffiths, All of the libcompizconfig ones have been approved, asides from setting-mock and plugin-mock, and those two concerns have now been addressed.

[Daniel van Vugt (vanvugt)]

Changed status to Needs review. Since Sam asked me to review it now.

[Daniel van Vugt (vanvugt)]

CCSM segfaults on startup using this branch. object_interfaces is NULL at compizconfig/libcompizconfig/src/main.c:316

Using trunk, CCSM does not segfault on startup and is mostly usable. At least until you click on things and run into a crash caused by bug 1018730 (which has a fix).

Though, this might be my fault for using an old version of:
  /usr/lib/python2.7/dist-packages/compizconfig.so

(gdb) bt
#0 0x00007f09e45ab317 in ccsEmptyContextNew (screenNum=0,
    object_interfaces=0x0)
    at /home/dan/bzr/compiz/tmp.690/compizconfig/libcompizconfig/src/main.c:316
#1 0x00007f09e45abe6b in ccsContextNew (screenNum=<optimised out>,
    iface=<optimised out>)
    at /home/dan/bzr/compiz/tmp.690/compizconfig/libcompizconfig/src/main.c:521
#2 0x00007f09e47c7c2f in ?? ()
   from /usr/lib/python2.7/dist-packages/compizconfig.so
#3 0x00000000004c71c8 in ?? ()
#4 0x00000000004c7c76 in PyObject_Call ()
#5 0x000000000042aa4a in PyEval_EvalFrameEx ()
#6 0x00000000004317f2 in PyEval_EvalCodeEx ()
#7 0x000000000054b171 in PyRun_FileExFlags ()
#8 0x000000000054b7d8 in PyRun_SimpleFileExFlags ()
#9 0x000000000054c5d6 in Py_Main ()
#10 0x00007f09f001b76d in __libc_start_main (main=0x41b900 <main>, argc=2,
    ubp_av=0x7fff4b918878, init=<optimised out>, fini=<optimised out>,
    rtld_fini=<optimised out>, stack_end=0x7fff4b918868) at libc-start.c:226
#11 0x000000000041b931 in _start ()

[Daniel van Vugt (vanvugt)]

I will have to delve into re-compiling and testing compizconfig-python another day :(

[Sam Spilsbury (smspillaz)]

Right, there's a problem with the ccsm installation process. I'll propose the merge for that now, didn't get around to doing it yesterday.

[Sam Spilsbury (smspillaz)]

That's here: https://code.launchpad.net/~compiz-team/compiz/compiz.fix_1018916/+merge/112605

[Daniel van Vugt (vanvugt)]

Manual regression testing, including under valgrind, all seems OK.

However, I think it's a terrible idea to make an 8584 line proposal. There will almost certainly be regressions neither of us have found yet.

I also think it's a bad idea to rewrite a large chunk of (mature-ish) code from procedural to object-oriented, just to use Google Test/Mock. But I also won't block this proposal because I'm not about to invest the time to prototype a better alternative. And I don't have enough understanding of compizconfig to know where to begin.

review: Approve

[Sam Spilsbury (smspillaz)]

FYI, the merges in smaller chunks that alan and I worked on can be found here:

http://code.launchpad.net/~smspillaz/libcompizconfig/+activereviews

I have noticed that there's some weird feedback with gconf just on the hsize setting that causes it to get reset, so I'm going to tentatively mark this needs fixing and have a look into it.

review: Needs Fixing

=== modified file 'compizconfig/cmake/exec_setup_py_with_destdir.cmake'
--- compizconfig/cmake/exec_setup_py_with_destdir.cmake	2012-05-27 14:25:30 +0000
+++ compizconfig/cmake/exec_setup_py_with_destdir.cmake	2012-06-27 07:01:20 +0000
@@ -15,8 +15,6 @@
 
 cmake_policy (SET CMP0012 NEW)
 
-message (${BUILD_DEB})
-
 if (BUILD_DEB)
     message ("Installing Debian Format")
     set (EXTRAARGS "--install-layout=deb")

=== modified file 'compizconfig/compizconfig-python/src/compizconfig.pyx'
--- compizconfig/compizconfig-python/src/compizconfig.pyx	2012-05-23 06:44:28 +0000
+++ compizconfig/compizconfig-python/src/compizconfig.pyx	2012-06-27 07:01:20 +0000
@@ -25,6 +25,11 @@
 
 ctypedef unsigned int Bool
 
+cdef struct CCSInterfaceTable:
+    void *contextInterface
+
+cdef extern CCSInterfaceTable ccsDefaultInterfaceTable
+
 cdef enum CCSSettingType:
     TypeBool
     TypeInt
@@ -194,37 +199,11 @@
     char *          longDesc
     CCSStringList * plugins
 
-cdef struct CCSContext:
-    CCSPluginList *     plugins
-    CCSPluginCategory * categories
-
-    void * priv
-    void * ccsPrivate
-
-    CCSSettingList * changedSettings
-    unsigned int   screenNum
+cdef struct CCSContext
 
 cdef struct CCSPlugin
 
-cdef struct CCSSetting:
-    char * name
-    char * shortDesc
-    char * longDesc
-
-    CCSSettingType type
-
-    CCSSettingInfo info
-    char *         group
-    char *         subGroup
-    char *         hints
-
-    CCSSettingValue   defaultValue
-    CCSSettingValue * value
-    Bool              isDefault
-
-    CCSPlugin * parent
-    void *      priv
-    unsigned int refCount
+cdef struct CCSSetting
 
 cdef struct CCSStrExtension:
     char *                  basePlugin
@@ -233,22 +212,7 @@
     unsigned int            refCount
 
 cdef struct CCSPlugin:
-    char * name
-    char * shortDesc
-    char * longDesc
-    char * hints
-    char * category
-
-    CCSStringList * loadAfter
-    CCSStringList * loadBefore
-    CCSStringList * requiresPlugin
-    CCSStringList * conflictPlugin
-    CCSStringList * conflictFeature
-    CCSStringList * providesFeature
-    CCSStringList * requiresFeature
-
-    void *       priv
-    CCSContext * context
+
     void *       ccsPrivate
     unsigned int refCount
 
@@ -264,9 +228,22 @@
 
 '''Context functions'''
 cdef extern void ccsSetBasicMetadata (Bool value)
-cdef extern CCSContext * ccsContextNew (unsigned int screenNum)
-cdef extern CCSContext * ccsEmptyContextNew (unsigned int screenNum)
+cdef extern CCSContext * ccsContextNew (unsigned int screenNum, CCSInterfaceTable *)
+cdef extern CCSContext * ccsEmptyContextNew (unsigned int screenNum, CCSInterfaceTable *)
 cdef extern void ccsContextDestroy (CCSContext * context)
+cdef extern CCSPluginList ccsContextGetPlugins (CCSContext *context)
+cdef extern CCSPluginCategory * ccsContextGetCategories (CCSContext *context)
+cdef extern CCSSettingList ccsContextGetChangedSettings (CCSContext *context)
+cdef extern unsigned int ccsContextGetScreenNum (CCSContext *context)
+cdef extern Bool ccsContextAddChangedSetting (CCSContext *context, CCSSetting *setting)
+cdef extern Bool ccsContextClearChangedSettings (CCSContext *context)
+cdef extern CCSSettingList ccsContextStealChangedSettings (CCSContext *context)
+cdef extern void * ccsContextGetPrivatePtr (CCSContext *context)
+cdef extern void ccsContextSetPrivatePtr (CCSContext *context, void *)
+
+cdef extern void * ccsContextGetPluginsBindable (CCSContext *context)
+cdef extern void * ccsContextStealChangedSettingsBindable (CCSContext *context)
+cdef extern void * ccsContextGetChangedSettingsBindable (CCSContext *context)
 
 '''Plugin functions'''
 cdef extern Bool ccsLoadPlugin (CCSContext * context, char * name)
@@ -276,6 +253,26 @@
 cdef extern CCSSettingList * ccsGetPluginSettings (CCSPlugin * plugin)
 cdef extern CCSGroupList * ccsGetPluginGroups (CCSPlugin * plugin)
 
+cdef extern char * ccsPluginGetName (CCSPlugin *plugin)
+cdef extern char * ccsPluginGetShortDesc (CCSPlugin *plugin)
+cdef extern char * ccsPluginGetLongDesc (CCSPlugin *plugin)
+cdef extern char * ccsPluginGetHints (CCSPlugin *plugin)
+cdef extern char * ccsPluginGetCategory (CCSPlugin *plugin)
+
+cdef extern CCSStringList ccsPluginGetLoadAfter (CCSPlugin *plugin)
+cdef extern CCSStringList ccsPluginGetLoadBefore (CCSPlugin *plugin)
+cdef extern CCSStringList ccsPluginGetRequiresPlugins (CCSPlugin *plugin)
+cdef extern CCSStringList ccsPluginGetConflictPlugins (CCSPlugin *plugin)
+cdef extern CCSStringList ccsPluginGetProvidesFeatures (CCSPlugin *plugin)
+cdef extern CCSStringList ccsPluginGetRequiresFeatures (CCSPlugin *plugin)
+
+cdef extern void * ccsPluginGetProvidesFeaturesBindable (CCSPlugin *plugin)
+
+cdef extern void * ccsPluginGetPrivatePtr (CCSPlugin *plugin)
+cdef extern void ccsPluginSetPrivatePtr (CCSPlugin *plugin, void *ptr)
+
+cdef extern CCSContext * ccsPluginGetContext (CCSPlugin *plugin)
+
 '''Action => String'''
 cdef extern char * ccsModifiersToString (unsigned int modMask)
 cdef extern char * ccsEdgesToString (unsigned int edge)
@@ -349,6 +346,20 @@
 '''Misc. Plugin/Setting utils'''
 cdef extern Bool ccsSettingIsReadOnly (CCSSetting * setting)
 cdef extern Bool ccsSettingIsIntegrated (CCSSetting * setting)
+cdef extern char * ccsSettingGetName (CCSSetting *)
+cdef extern char * ccsSettingGetShortDesc (CCSSetting *)
+cdef extern char * ccsSettingGetLongDesc (CCSSetting *)
+cdef extern CCSSettingType ccsSettingGetType (CCSSetting *)
+cdef extern CCSSettingInfo * ccsSettingGetInfo (CCSSetting *)
+cdef extern char * ccsSettingGetGroup (CCSSetting *)
+cdef extern char * ccsSettingGetSubGroup (CCSSetting *)
+cdef extern char * ccsSettingGetHints (CCSSetting *)
+cdef extern CCSSettingValue * ccsSettingGetDefaultValue (CCSSetting *)
+cdef extern CCSSettingValue *ccsSettingGetValue (CCSSetting *)
+cdef extern Bool ccsSettingGetIsDefault (CCSSetting *)
+cdef extern CCSPlugin * ccsSettingGetParent (CCSSetting *)
+cdef extern void * ccsSettingGetPrivatePtr (CCSSetting *)
+cdef extern void ccsSettingSetPrivatePtr (CCSSetting *, void *)
 
 cdef extern void ccsPluginConflictListFree (CCSPluginConflictList * l,
                                             Bool                    freeObj)
@@ -368,9 +379,9 @@
 
 cdef CCSSettingType GetType (CCSSettingValue * value):
     if value.isListChild:
-        return (<CCSSetting *> value.parent).info.forList.listType
+        return ccsSettingGetInfo ((<CCSSetting *> value.parent)).forList.listType
     else:
-        return (<CCSSetting *> value.parent).type
+        return ccsSettingGetType ((<CCSSetting *> value.parent))
 
 cdef CCSStringList * ListToStringList (object list):
     if len (list) <= 0:
@@ -445,8 +456,8 @@
     while settingList:
         ccsSetting = <CCSSetting *> settingList.data
         setting = None
-        plugin = context.Plugins[ccsSetting.parent.name]
-        setting = plugin.Screen[ccsSetting.name]
+        plugin = context.Plugins[ccsPluginGetName (ccsSettingGetParent (ccsSetting))]
+        setting = plugin.Screen[ccsSettingGetName (ccsSetting)]
         list.append (setting)
         settingList = settingList.next
     
@@ -484,9 +495,9 @@
     bv.isListChild = isListChild
     bv.parent = setting
     if isListChild:
-        t = setting.info.forList.listType
+        t = ccsSettingGetInfo (setting).forList.listType
     else:
-        t = setting.type
+        t = ccsSettingGetType (setting)
     if t == TypeString:
         bv.value.asString = strdup (data)
     elif t == TypeMatch:
@@ -607,11 +618,11 @@
         self.extendedStrRestrictions = None
         self.baseStrRestrictions = None
         info = ()
-        t = self.ccsSetting.type
-        i = &self.ccsSetting.info
+        t = ccsSettingGetType (self.ccsSetting)
+        i = ccsSettingGetInfo (self.ccsSetting)
         if t == TypeList:
-            t = self.ccsSetting.info.forList.listType
-            i = <CCSSettingInfo *> self.ccsSetting.info.forList.listInfo
+            t = ccsSettingGetInfo (self.ccsSetting).forList.listType
+            i = <CCSSettingInfo *> ccsSettingGetInfo (self.ccsSetting).forList.listInfo
         if t == TypeInt:
             desc = IntDescListToDict (i.forInt.desc)
             info = (i.forInt.min, i.forInt.max, desc)
@@ -625,7 +636,7 @@
             self.extendedStrRestrictions = {}
         elif t in (TypeKey, TypeButton, TypeEdge, TypeBell):
             info = (bool (i.forAction.internal),)
-        if self.ccsSetting.type == TypeList:
+        if ccsSettingGetType (self.ccsSetting) == TypeList:
             info = (SettingTypeString[t], info)
         self.info = info
     
@@ -638,27 +649,27 @@
 
     property Name:
         def __get__ (self):
-            return self.ccsSetting.name
+            return ccsSettingGetName (self.ccsSetting)
 
     property ShortDesc:
         def __get__ (self):
-            return self.ccsSetting.shortDesc
+            return ccsSettingGetShortDesc (self.ccsSetting)
 
     property LongDesc:
         def __get__ (self):
-            return self.ccsSetting.longDesc
+            return ccsSettingGetLongDesc (self.ccsSetting)
 
     property Group:
         def __get__ (self):
-            return self.ccsSetting.group
+            return ccsSettingGetGroup (self.ccsSetting)
 
     property SubGroup:
         def __get__ (self):
-            return self.ccsSetting.subGroup
+            return ccsSettingGetSubGroup (self.ccsSetting)
 
     property Type:
         def __get__ (self):
-            return SettingTypeString[self.ccsSetting.type]
+            return SettingTypeString[ccsSettingGetType (self.ccsSetting)]
 
     property Info:
         def __get__ (self):
@@ -666,24 +677,24 @@
 
     property Hints:
         def __get__ (self):
-            if not self.ccsSetting.hints:
+            if not ccsSettingGetHints (self.ccsSetting):
                 return []
             else:
-                return str (self.ccsSetting.hints).split (";")[:-1]
+                return str (ccsSettingGetHints (self.ccsSetting)).split (";")[:-1]
 
     property IsDefault:
         def __get__ (self):
-            if self.ccsSetting.isDefault:
+            if ccsSettingGetIsDefault (self.ccsSetting):
                 return True
             return False
 
     property DefaultValue:
         def __get__ (self):
-            return DecodeValue (&self.ccsSetting.defaultValue)
+            return DecodeValue (ccsSettingGetDefaultValue (self.ccsSetting))
 
     property Value:
         def __get__ (self):
-            return DecodeValue (self.ccsSetting.value)
+            return DecodeValue (ccsSettingGetValue (self.ccsSetting))
         def __set__ (self, value):
             cdef CCSSettingValue * sv
             sv = EncodeValue (value, self.ccsSetting, 0)
@@ -760,22 +771,22 @@
         while setlist != NULL:
             sett = <CCSSetting *> setlist.data
 
-            subgroup = self.groups[sett.group][1][sett.subGroup][1]
-
-            setting = Setting (self, sett.name)
-            self.screen[sett.name] = setting
-            subgroup.Screen[sett.name] = setting
-
-            t = sett.type
-            i = &sett.info
+            subgroup = self.groups[ccsSettingGetGroup (sett)][1][ccsSettingGetSubGroup (sett)][1]
+
+            setting = Setting (self, ccsSettingGetName (sett))
+            self.screen[ccsSettingGetName (sett)] = setting
+            subgroup.Screen[ccsSettingGetName (sett)] = setting
+
+            t = ccsSettingGetType (sett)
+            i = ccsSettingGetInfo (sett)
             if t == TypeList:
                 t = i.forList.listType
                 i = <CCSSettingInfo *> i.forList.listInfo
             if t == TypeString and i.forString.extensible:
                 self.hasExtendedString = True
 
-            if not self.ranking.has_key (sett.name):
-                self.ranking[sett.name] = rank
+            if not self.ranking.has_key (ccsSettingGetName (sett)):
+                self.ranking[ccsSettingGetName (sett)] = rank
                 rank = rank + 1
             
             setlist = setlist.next
@@ -793,8 +804,8 @@
         cdef CCSSettingType t
         cdef CCSSettingInfo * i
 
-        t = setting.ccsSetting.type
-        i = &setting.ccsSetting.info
+        t = ccsSettingGetType (setting.ccsSetting)
+        i = ccsSettingGetInfo (setting.ccsSetting)
         if t == TypeList:
             t = i.forList.listType
             i = <CCSSettingInfo *> i.forList.listInfo
@@ -834,7 +845,7 @@
             itemsByValue[value] = (name, index)
 
         # Insert itemsByName and sortedItems into setting.info
-        if setting.ccsSetting.type == TypeList:
+        if ccsSettingGetType (setting.ccsSetting) == TypeList:
             setting.info = (setting.info[0], (itemsByName,
                                               itemsByValue,
                                               sortedItems))
@@ -875,8 +886,8 @@
 
                 for settingItem in settings:
                     setting = settingItem
-                    t = setting.ccsSetting.type
-                    i = &setting.ccsSetting.info
+                    t = ccsSettingGetType (setting.ccsSetting)
+                    i = ccsSettingGetInfo (setting.ccsSetting)
                     if t == TypeList:
                         t = i.forList.listType
                         i = <CCSSettingInfo *> i.forList.listInfo
@@ -939,23 +950,23 @@
 
     property Name:
         def __get__ (self):
-            return self.ccsPlugin.name
+            return ccsPluginGetName (self.ccsPlugin)
 
     property ShortDesc:
         def __get__ (self):
-            return self.ccsPlugin.shortDesc
+            return ccsPluginGetShortDesc (self.ccsPlugin)
 
     property LongDesc:
         def __get__ (self):
-            return self.ccsPlugin.longDesc
+            return ccsPluginGetLongDesc (self.ccsPlugin)
 
     property Category:
         def __get__ (self):
-            return self.ccsPlugin.category
+            return ccsPluginGetCategory (self.ccsPlugin)
 
     property Features:
         def __get__ (self):
-            features = StringListToList (self.ccsPlugin.providesFeature)
+            features = StringListToList (<CCSList *> ccsPluginGetProvidesFeaturesBindable (self.ccsPlugin))
             return features
 
     property Initialized:
@@ -965,7 +976,7 @@
     property Enabled:
         def __get__ (self):
             return bool (ccsPluginIsActive (self.context.ccsContext,
-                                            self.ccsPlugin.name))
+                                            ccsPluginGetName (self.ccsPlugin)))
         def __set__ (self, val):
             if val:
                 if len (self.EnableConflicts):
@@ -996,7 +1007,7 @@
                 ppl = pc.plugins
                 while ppl != NULL:
                     plg = <CCSPlugin *> ppl.data
-                    rpl.append (self.context.Plugins[plg.name])
+                    rpl.append (self.context.Plugins[ccsPluginGetName (plg)])
                     ppl = ppl.next
                 ret.append ((ConflictTypeString[pc.type], pc.value, rpl))
                 pls = pls.next
@@ -1024,7 +1035,7 @@
                 ppl = pc.plugins
                 while ppl != NULL:
                     plg = <CCSPlugin *> ppl.data
-                    rpl.append (self.context.Plugins[plg.name])
+                    rpl.append (self.context.Plugins[ccsPluginGetName (plg)])
                     ppl = ppl.next
                 ret.append ((ConflictTypeString[pc.type], pc.value, rpl))
                 pls = pls.next
@@ -1108,26 +1119,26 @@
             ccsSetBasicMetadata (True)
         self.plugins = {}
         if not len (plugins):
-            self.ccsContext = ccsContextNew (screenNum)
+            self.ccsContext = ccsContextNew (screenNum, &ccsDefaultInterfaceTable)
         else:
-            self.ccsContext = ccsEmptyContextNew (screenNum)
+            self.ccsContext = ccsEmptyContextNew (screenNum, &ccsDefaultInterfaceTable)
 
         for plugin in plugins:
             self.LoadPlugin (plugin)
 
         ccsReadSettings (self.ccsContext)
-        pll = self.ccsContext.plugins
+        pll = <CCSList *> ccsContextGetPluginsBindable (self.ccsContext)
         self.categories = {}
         while pll != NULL:
             pl = <CCSPlugin *> pll.data
-            self.plugins[pl.name] = Plugin (self, pl.name)
-            if pl.category == NULL:
+            self.plugins[ccsPluginGetName (pl)] = Plugin (self, ccsPluginGetName (pl))
+            if ccsPluginGetCategory (pl) == NULL:
                 cat = ''
             else:
-                cat = pl.category
+                cat = ccsPluginGetCategory (pl)
             if not self.categories.has_key (cat):
                 self.categories[cat] = []
-            self.categories[cat].append (self.plugins[pl.name])
+            self.categories[cat].append (self.plugins[ccsPluginGetName (pl)])
             pll = pll.next
 
         self.integration = ccsGetIntegrationEnabled (self.ccsContext)
@@ -1252,15 +1263,24 @@
 
     property ChangedSettings:
         def __get__ (self):
-            return SettingListToList (self, self.ccsContext.changedSettings)
+            return SettingListToList (self, <CCSList *> ccsContextGetChangedSettingsBindable (self.ccsContext))
         def __set__ (self, value):
             cdef CCSSettingList * settingList
-            if self.ccsContext.changedSettings != NULL:
-                self.ccsContext.changedSettings = \
-                    ccsSettingListFree (self.ccsContext.changedSettings, False)
+            cdef CCSSettingList * l
+            cdef CCSSetting     * setting
+
+            ccsContextClearChangedSettings (self.ccsContext)
             if value != None and len (value) != 0:
                 settingList = ListToSettingList (value)
-                self.ccsContext.changedSettings = settingList
+
+                l = settingList
+
+                while l:
+                    setting = <CCSSetting *> l.data
+                    ccsContextAddChangedSetting (self.ccsContext, setting)
+                    l = l.next
+
+                ccsSettingListFree (settingList, False)
                 
     property AutoSort:
         def __get__ (self):

=== modified file 'compizconfig/gconf/src/gconf.c'
--- compizconfig/gconf/src/gconf.c	2012-05-21 15:30:41 +0000
+++ compizconfig/gconf/src/gconf.c	2012-06-27 07:01:20 +0000
@@ -63,15 +63,15 @@
                     snprintf (keyName, BUFSIZE, "screen%i", sn);
 
 #define PATHNAME    char pathName[BUFSIZE]; \
-                    if (!setting->parent->name || \
-			strcmp (setting->parent->name, "core") == 0) \
+		    if (!ccsPluginGetName (ccsSettingGetParent (setting)) || \
+			strcmp (ccsPluginGetName (ccsSettingGetParent (setting)), "core") == 0) \
                         snprintf (pathName, BUFSIZE, \
 				 "%s/general/%s/options/%s", COMPIZ, \
-				 keyName, setting->name); \
+				 keyName, ccsSettingGetName (setting)); \
                     else \
 			snprintf(pathName, BUFSIZE, \
 				 "%s/plugins/%s/%s/options/%s", COMPIZ, \
-				 setting->parent->name, keyName, setting->name);
+				 ccsPluginGetName (ccsSettingGetParent (setting)), keyName, ccsSettingGetName (setting));
 
 static const char* watchedGnomeDirectories[] = {
     METACITY,
@@ -408,14 +408,14 @@
     {
 	const SpecialOption *opt = &specialOptions[i];
 
-	if (strcmp (setting->name, opt->settingName) != 0)
+	if (strcmp (ccsSettingGetName (setting), opt->settingName) != 0)
 	    continue;
 
-	if (setting->parent->name)
+	if (ccsPluginGetName (ccsSettingGetParent (setting)))
 	{
 	    if (!opt->pluginName)
 		continue;
-	    if (strcmp (setting->parent->name, opt->pluginName) != 0)
+	    if (strcmp (ccsPluginGetName (ccsSettingGetParent (setting)), opt->pluginName) != 0)
 		continue;
 	}
 	else
@@ -788,7 +788,7 @@
     CCSSettingValueList list = NULL;
     GSList              *valueList = NULL;
 
-    switch (setting->info.forList.listType)
+    switch (ccsSettingGetInfo (setting)->forList.listType)
     {
     case TypeString:
     case TypeMatch:
@@ -824,7 +824,7 @@
 
     nItems = g_slist_length (valueList);
 
-    switch (setting->info.forList.listType)
+    switch (ccsSettingGetInfo (setting)->forList.listType)
     {
     case TypeBool:
 	{
@@ -947,10 +947,10 @@
     if (!s)
 	return 0;
 
-    if (s->type != TypeButton)
+    if (ccsSettingGetType (s) != TypeButton)
 	return 0;
 
-    return s->value->value.asButton.button;
+    return ccsSettingGetValue (s)->value.asButton.button;
 }
 
 
@@ -1138,7 +1138,7 @@
     Bool       ret = FALSE;
     Bool       valid = TRUE;
 
-    KEYNAME(setting->parent->context->screenNum);
+    KEYNAME (ccsContextGetScreenNum (ccsPluginGetContext (ccsSettingGetParent (setting))));
     PATHNAME;
 
     /* first check if the key is set */
@@ -1153,7 +1153,7 @@
 	return FALSE;
 
     /* setting type sanity check */
-    switch (setting->type)
+    switch (ccsSettingGetType (setting))
     {
     case TypeString:
     case TypeMatch:
@@ -1188,7 +1188,7 @@
 	return FALSE;
     }
 
-    switch (setting->type)
+    switch (ccsSettingGetType (setting))
     {
     case TypeString:
 	{
@@ -1306,7 +1306,7 @@
 	break;
     default:
 	printf("GConf backend: attempt to read unsupported setting type %d from path %s!\n",
-	       setting->type, pathName);
+	       ccsSettingGetType (setting), pathName);
 	break;
     }
 
@@ -1329,7 +1329,7 @@
     if (!ccsGetList (setting, &list))
 	return;
 
-    switch (setting->info.forList.listType)
+    switch (ccsSettingGetInfo (setting)->forList.listType)
     {
     case TypeBool:
 	{
@@ -1407,7 +1407,7 @@
 	break;
     default:
 	printf("GConf backend: attempt to write unsupported list type %d at path %s!\n",
-	       setting->info.forList.listType, pathName);
+	       ccsSettingGetInfo (setting)->forList.listType, pathName);
 	valueType = GCONF_VALUE_INVALID;
 	break;
     }
@@ -1475,10 +1475,10 @@
     if (!s)
 	return;
 
-    if (s->type != TypeButton)
+    if (ccsSettingGetType (s) != TypeButton)
 	return;
 
-    value = s->value->value.asButton;
+    value = ccsSettingGetValue (s)->value.asButton;
 
     if ((value.button != button) || (value.buttonModMask != buttonModMask))
     {
@@ -1561,7 +1561,7 @@
 	    char  *newValue;
 	    gchar *currentValue;
 
-	    newValue = ccsKeyBindingToString (&setting->value->value.asKey);
+	    newValue = ccsKeyBindingToString (&ccsSettingGetValue (setting)->value.asKey);
 	    if (newValue)
     	    {
 		if (strcmp (newValue, "Disabled") == 0)
@@ -1668,7 +1668,7 @@
 					   resizeWithRightButton, NULL);
 		}
 
-		modMask = setting->value->value.asButton.buttonModMask;
+		modMask = ccsSettingGetValue (setting)->value.asButton.buttonModMask;
 		if (setGnomeMouseButtonModifier (modMask))
 		{
 		    setButtonBindingForSetting (context, "move",
@@ -1694,7 +1694,7 @@
 static void
 resetOptionToDefault (CCSSetting * setting)
 {
-    KEYNAME (setting->parent->context->screenNum);
+    KEYNAME (ccsContextGetScreenNum (ccsPluginGetContext (ccsSettingGetParent (setting))));
     PATHNAME;
 
     gconf_client_recursive_unset (client, pathName, 0, NULL);
@@ -1704,10 +1704,10 @@
 static void
 writeOption (CCSSetting * setting)
 {
-    KEYNAME (setting->parent->context->screenNum);
+    KEYNAME (ccsContextGetScreenNum (ccsPluginGetContext (ccsSettingGetParent (setting))));
     PATHNAME;
 
-    switch (setting->type)
+    switch (ccsSettingGetType (setting))
     {
     case TypeString:
 	{
@@ -1819,7 +1819,7 @@
 	break;
     default:
 	printf("GConf backend: attempt to write unsupported setting type %d\n",
-	       setting->type);
+	       ccsSettingGetType (setting));
 	break;
     }
 }
@@ -2021,7 +2021,7 @@
     {
 	writeIntegratedOption (context, setting, index);
     }
-    else if (setting->isDefault)
+    else if (ccsSettingGetIsDefault (setting))
     {
 	resetOptionToDefault (setting);
     }
@@ -2033,7 +2033,7 @@
 static Bool
 getSettingIsIntegrated (CCSSetting * setting)
 {
-    if (!ccsGetIntegrationEnabled (setting->parent->context))
+    if (!ccsGetIntegrationEnabled (ccsPluginGetContext (ccsSettingGetParent (setting))))
 	return FALSE;
 
     if (!isIntegratedOption (setting, NULL))

=== modified file 'compizconfig/gsettings/src/gconf-integration.c'
--- compizconfig/gsettings/src/gconf-integration.c	2011-07-29 15:41:46 +0000
+++ compizconfig/gsettings/src/gconf-integration.c	2012-06-27 07:01:20 +0000
@@ -339,14 +339,14 @@
     {
 	const SpecialOptionGConf *opt = &specialOptions[i];
 
-	if (strcmp (setting->name, opt->settingName) != 0)
+	if (strcmp (ccsSettingGetName (setting), opt->settingName) != 0)
 	    continue;
 
-	if (setting->parent->name)
+	if (ccsPluginGetName (ccsSettingGetParent (setting)))
 	{
 	    if (!opt->pluginName)
 		continue;
-	    if (strcmp (setting->parent->name, opt->pluginName) != 0)
+	    if (strcmp (ccsPluginGetName (ccsSettingGetParent (setting)), opt->pluginName) != 0)
 		continue;
 	}
 	else
@@ -530,10 +530,10 @@
     if (!s)
 	return 0;
 
-    if (s->type != TypeButton)
+    if (ccsSettingGetType (s) != TypeButton)
 	return 0;
 
-    return s->value->value.asButton.button;
+    return ccsSettingGetValue (s)->value.asButton.button;
 }
 
 Bool
@@ -750,10 +750,10 @@
     if (!s)
 	return;
 
-    if (s->type != TypeButton)
+    if (ccsSettingGetType (s) != TypeButton)
 	return;
 
-    value = s->value->value.asButton;
+    value = ccsSettingGetValue (s)->value.asButton;
 
     if ((value.button != button) || (value.buttonModMask != buttonModMask))
     {
@@ -822,7 +822,7 @@
 	    char  *newValue;
 	    gchar *currentValue;
 
-	    newValue = ccsKeyBindingToString (&setting->value->value.asKey);
+	    newValue = ccsKeyBindingToString (&(ccsSettingGetValue (setting)->value.asKey));
 	    if (newValue)
     	    {
 		if (strcmp (newValue, "Disabled") == 0)
@@ -929,7 +929,7 @@
 					   resizeWithRightButton, NULL);
 		}
 
-		modMask = setting->value->value.asButton.buttonModMask;
+		modMask = ccsSettingGetValue (setting)->value.asButton.buttonModMask;
 		if (setGnomeMouseButtonModifier (modMask))
 		{
 		    setButtonBindingForSetting (context, "move",

=== modified file 'compizconfig/gsettings/src/gsettings.c'
--- compizconfig/gsettings/src/gsettings.c	2012-05-21 15:37:47 +0000
+++ compizconfig/gsettings/src/gsettings.c	2012-06-27 07:01:20 +0000
@@ -190,10 +190,12 @@
 static GSettings *
 getSettingsObjectForCCSSetting (CCSSetting *setting)
 {
-    KEYNAME(setting->parent->context->screenNum);
-    PATHNAME (setting->parent->name, keyName);
+    KEYNAME (ccsContextGetScreenNum (ccsPluginGetContext (ccsSettingGetParent (setting))));
+    PATHNAME (ccsPluginGetName (ccsSettingGetParent (setting)), keyName);
 
-    return getSettingsObjectForPluginWithPath (setting->parent->name, pathName, setting->parent->context);
+    return getSettingsObjectForPluginWithPath (ccsPluginGetName (ccsSettingGetParent (setting)),
+					       pathName,
+					       ccsPluginGetContext (ccsSettingGetParent (setting)));
 }
 
 static Bool
@@ -283,9 +285,9 @@
     GVariant		*value;
     GVariantIter	*iter;
 
-    char *cleanSettingName = translateKeyForGSettings (setting->name);
+    char *cleanSettingName = translateKeyForGSettings (ccsSettingGetName (setting));
     
-    switch (setting->info.forList.listType)
+    switch (ccsSettingGetInfo (setting)->forList.listType)
     {
     case TypeString:
     case TypeMatch:
@@ -319,7 +321,7 @@
     iter = g_variant_iter_new (value);
     nItems = g_variant_iter_n_children (iter);
 
-    switch (setting->info.forList.listType)
+    switch (ccsSettingGetInfo (setting)->forList.listType)
     {
     case TypeBool:
 	{
@@ -455,20 +457,20 @@
      * just return FALSE since compizconfig doesn't expect us
      * to read them anyways */
 
-    if (setting->type == TypeAction ||
+    if (ccsSettingGetType (setting) == TypeAction ||
 	ccsSettingIsReadOnly (setting))
     {
 	return FALSE;
     }
 
-    char *cleanSettingName = translateKeyForGSettings (setting->name);
-    KEYNAME(setting->parent->context->screenNum);
-    PATHNAME (setting->parent->name, keyName);
+    char *cleanSettingName = translateKeyForGSettings (ccsSettingGetName (setting));
+    KEYNAME(ccsContextGetScreenNum (ccsPluginGetContext (ccsSettingGetParent (setting))));
+    PATHNAME (ccsPluginGetName (ccsSettingGetParent (setting)), keyName);
 
     /* first check if the key is set */
     gsettingsValue = g_settings_get_value (settings, cleanSettingName);
 
-    switch (setting->type)
+    switch (ccsSettingGetType (setting))
     {
     case TypeString:
     case TypeMatch:
@@ -506,7 +508,7 @@
 	return FALSE;
     }
 
-    switch (setting->type)
+    switch (ccsSettingGetType (setting))
     {
     case TypeString:
 	{
@@ -624,7 +626,7 @@
 	break;
     default:
 	printf("GSettings backend: attempt to read unsupported setting type %d!\n",
-	       setting->type);
+	       ccsSettingGetType (setting));
 	break;
     }
 
@@ -643,12 +645,12 @@
     gchar		*variantType = NULL;
     CCSSettingValueList list;
 
-    char *cleanSettingName = translateKeyForGSettings (setting->name);
+    char *cleanSettingName = translateKeyForGSettings (ccsSettingGetName (setting));
     
     if (!ccsGetList (setting, &list))
 	return;
 
-    switch (setting->info.forList.listType)
+    switch (ccsSettingGetInfo (setting)->forList.listType)
     {
     case TypeBool:
 	{
@@ -732,7 +734,7 @@
 	break;
     default:
 	printf("GSettings backend: attempt to write unsupported list type %d!\n",
-	       setting->info.forList.listType);
+	       ccsSettingGetInfo (setting)->forList.listType);
 	variantType = NULL;
 	break;
     }
@@ -763,9 +765,9 @@
 {
     GSettings  *settings = getSettingsObjectForCCSSetting (setting);
   
-    char *cleanSettingName = translateKeyForGSettings (setting->name);
-    KEYNAME (setting->parent->context->screenNum);
-    PATHNAME (setting->parent->name, keyName);
+    char *cleanSettingName = translateKeyForGSettings (ccsSettingGetName (setting));
+    KEYNAME(ccsContextGetScreenNum (ccsPluginGetContext (ccsSettingGetParent (setting))));
+    PATHNAME (ccsPluginGetName (ccsSettingGetParent (setting)), keyName);
 
     g_settings_reset (settings, cleanSettingName);
 
@@ -776,11 +778,11 @@
 writeOption (CCSSetting * setting)
 {
     GSettings  *settings = getSettingsObjectForCCSSetting (setting);
-    char *cleanSettingName = translateKeyForGSettings (setting->name);
-    KEYNAME (setting->parent->context->screenNum);
-    PATHNAME (setting->parent->name, keyName);
+    char *cleanSettingName = translateKeyForGSettings (ccsSettingGetName (setting));
+    KEYNAME(ccsContextGetScreenNum (ccsPluginGetContext (ccsSettingGetParent (setting))));
+    PATHNAME (ccsPluginGetName (ccsSettingGetParent (setting)), keyName);
 
-    switch (setting->type)
+    switch (ccsSettingGetType (setting))
     {
     case TypeString:
 	{
@@ -904,7 +906,7 @@
 	break;
     default:
 	printf("GSettings backend: attempt to write unsupported setting type %d\n",
-	       setting->type);
+	       ccsSettingGetType (setting));
 	break;
     }
 
@@ -1095,7 +1097,7 @@
     {
 	writeIntegratedOption (context, setting, index);
     }
-    else if (setting->isDefault)
+    else if (ccsSettingGetIsDefault (setting))
     {
 	resetOptionToDefault (setting);
     }
@@ -1107,7 +1109,7 @@
 static Bool
 getSettingIsIntegrated (CCSSetting * setting)
 {
-    if (!ccsGetIntegrationEnabled (setting->parent->context))
+    if (!ccsGetIntegrationEnabled (ccsPluginGetContext (ccsSettingGetParent (setting))))
 	return FALSE;
 
     if (!isIntegratedOption (setting, NULL))
@@ -1168,7 +1170,7 @@
     {
 	GSettings *settings;
 
-	KEYNAME (context->screenNum);
+	KEYNAME (ccsContextGetScreenNum (context));
 	PATHNAME (plugin, keyName);
 
 	settings = getSettingsObjectForPluginWithPath (plugin, pathName, context);

=== modified file 'compizconfig/libcompizconfig/CMakeLists.txt'
--- compizconfig/libcompizconfig/CMakeLists.txt	2012-05-24 06:30:07 +0000
+++ compizconfig/libcompizconfig/CMakeLists.txt	2012-06-27 07:01:20 +0000
@@ -149,3 +149,4 @@
 add_subdirectory (src)
 add_subdirectory (include)
 add_subdirectory (cmake)
+add_subdirectory (tests)

=== modified file 'compizconfig/libcompizconfig/backend/src/ini.c'
--- compizconfig/libcompizconfig/backend/src/ini.c	2012-05-21 09:36:37 +0000
+++ compizconfig/libcompizconfig/backend/src/ini.c	2012-06-27 07:01:20 +0000
@@ -269,16 +269,16 @@
     if (!data)
 	return;
 
-    if (asprintf (&keyName, "s%d_%s", context->screenNum, setting->name) == -1)
+    if (asprintf (&keyName, "s%d_%s", ccsContextGetScreenNum (context), ccsSettingGetName (setting)) == -1)
 	return;
 
-    switch (setting->type)
+    switch (ccsSettingGetType (setting))
     {
     case TypeString:
 	{
 	    char *value;
-	    if (ccsIniGetString (data->iniFile, setting->parent->name,
-				 keyName, &value))
+	    if (ccsIniGetString (data->iniFile, ccsPluginGetName (ccsSettingGetParent (setting)),
+ 				 keyName, &value))
 	    {
 		ccsSetString (setting, value, TRUE);
 		free (value);
@@ -289,7 +289,7 @@
     case TypeMatch:
 	{
 	    char *value;
-	    if (ccsIniGetString (data->iniFile, setting->parent->name,
+	    if (ccsIniGetString (data->iniFile, ccsPluginGetName (ccsSettingGetParent (setting)),
 				 keyName, &value))
 	    {
 		ccsSetMatch (setting, value, TRUE);
@@ -301,7 +301,7 @@
     case TypeInt:
 	{
 	    int value;
-	    if (ccsIniGetInt (data->iniFile, setting->parent->name,
+	    if (ccsIniGetInt (data->iniFile, ccsPluginGetName (ccsSettingGetParent (setting)),
 			      keyName, &value))
 	    {
 		ccsSetInt (setting, value, TRUE);
@@ -312,7 +312,7 @@
     case TypeBool:
 	{
 	    Bool value;
-	    if (ccsIniGetBool (data->iniFile, setting->parent->name,
+	    if (ccsIniGetBool (data->iniFile, ccsPluginGetName (ccsSettingGetParent (setting)),
 			       keyName, &value))
 	    {
 		ccsSetBool (setting, (value != 0), TRUE);
@@ -323,7 +323,7 @@
     case TypeFloat:
 	{
 	    float value;
-	    if (ccsIniGetFloat (data->iniFile, setting->parent->name,
+	    if (ccsIniGetFloat (data->iniFile, ccsPluginGetName (ccsSettingGetParent (setting)),
 				keyName, &value))
 	    {
 		ccsSetFloat (setting, value, TRUE);
@@ -335,7 +335,7 @@
 	{
 	    CCSSettingColorValue color;
 
-	    if (ccsIniGetColor (data->iniFile, setting->parent->name,
+	    if (ccsIniGetColor (data->iniFile, ccsPluginGetName (ccsSettingGetParent (setting)),
 				keyName, &color))
 	    {
 		ccsSetColor (setting, color, TRUE);
@@ -346,7 +346,7 @@
     case TypeKey:
 	{
 	    CCSSettingKeyValue key;
-	    if (ccsIniGetKey (data->iniFile, setting->parent->name,
+	    if (ccsIniGetKey (data->iniFile, ccsPluginGetName (ccsSettingGetParent (setting)),
 			      keyName, &key))
 	    {
 		ccsSetKey (setting, key, TRUE);
@@ -357,7 +357,7 @@
     case TypeButton:
 	{
 	    CCSSettingButtonValue button;
-	    if (ccsIniGetButton (data->iniFile, setting->parent->name,
+	    if (ccsIniGetButton (data->iniFile, ccsPluginGetName (ccsSettingGetParent (setting)),
 				 keyName, &button))
 	    {
 		ccsSetButton (setting, button, TRUE);
@@ -368,7 +368,7 @@
     case TypeEdge:
 	{
 	    unsigned int edges;
-	    if (ccsIniGetEdge (data->iniFile, setting->parent->name,
+	    if (ccsIniGetEdge (data->iniFile, ccsPluginGetName (ccsSettingGetParent (setting)),
 				 keyName, &edges))
 	    {
 		ccsSetEdge (setting, edges, TRUE);
@@ -379,7 +379,7 @@
     case TypeBell:
 	{
 	    Bool bell;
-	    if (ccsIniGetBell (data->iniFile, setting->parent->name,
+	    if (ccsIniGetBell (data->iniFile, ccsPluginGetName (ccsSettingGetParent (setting)),
 			       keyName, &bell))
 	    {
 		ccsSetBell (setting, bell, TRUE);
@@ -390,7 +390,7 @@
     case TypeList:
 	{
 	    CCSSettingValueList value;
-	    if (ccsIniGetList (data->iniFile, setting->parent->name,
+	    if (ccsIniGetList (data->iniFile, ccsPluginGetName (ccsSettingGetParent (setting)),
 			       keyName, &value, setting))
 	    {
 		ccsSetList (setting, value, TRUE);
@@ -460,31 +460,31 @@
     if (!data)
 	return;
 
-    if (asprintf (&keyName, "s%d_%s", context->screenNum, setting->name) == -1)
+    if (asprintf (&keyName, "s%d_%s", ccsContextGetScreenNum (context), ccsSettingGetName (setting)) == -1)
 	return;
 
-    if (setting->isDefault)
+    if (ccsSettingGetIsDefault (setting))
     {
-	ccsIniRemoveEntry (data->iniFile, setting->parent->name, keyName);
+	ccsIniRemoveEntry (data->iniFile, ccsPluginGetName (ccsSettingGetParent (setting)), keyName);
 	free (keyName);
 	return;
     }
 
-    switch (setting->type)
+    switch (ccsSettingGetType (setting))
     {
     case TypeString:
 	{
 	    char *value;
 	    if (ccsGetString (setting, &value))
-		ccsIniSetString (data->iniFile, setting->parent->name,
-				 keyName, value);
+		ccsIniSetString (data->iniFile, ccsPluginGetName (ccsSettingGetParent (setting)),
+ 				 keyName, value);
 	}
 	break;
     case TypeMatch:
 	{
 	    char *value;
 	    if (ccsGetMatch (setting, &value))
-		ccsIniSetString (data->iniFile, setting->parent->name,
+		ccsIniSetString (data->iniFile, ccsPluginGetName (ccsSettingGetParent (setting)),
 				 keyName, value);
 	}
 	break;
@@ -492,7 +492,7 @@
 	{
 	    int value;
 	    if (ccsGetInt (setting, &value))
-		ccsIniSetInt (data->iniFile, setting->parent->name,
+		ccsIniSetInt (data->iniFile, ccsPluginGetName (ccsSettingGetParent (setting)),
 			      keyName, value);
 	}
 	break;
@@ -500,7 +500,7 @@
 	{
 	    float value;
 	    if (ccsGetFloat (setting, &value))
-		ccsIniSetFloat (data->iniFile, setting->parent->name,
+		ccsIniSetFloat (data->iniFile, ccsPluginGetName (ccsSettingGetParent (setting)),
 				keyName, value);
 	}
 	break;
@@ -508,7 +508,7 @@
 	{
 	    Bool value;
 	    if (ccsGetBool (setting, &value))
-		ccsIniSetBool (data->iniFile, setting->parent->name,
+		ccsIniSetBool (data->iniFile, ccsPluginGetName (ccsSettingGetParent (setting)),
 			       keyName, value);
 	}
 	break;
@@ -516,7 +516,7 @@
 	{
 	    CCSSettingColorValue value;
 	    if (ccsGetColor (setting, &value))
-		ccsIniSetColor (data->iniFile, setting->parent->name,
+		ccsIniSetColor (data->iniFile, ccsPluginGetName (ccsSettingGetParent (setting)),
 				keyName, value);
 	}
 	break;
@@ -524,7 +524,7 @@
 	{
 	    CCSSettingKeyValue value;
 	    if (ccsGetKey (setting, &value))
-		ccsIniSetKey (data->iniFile, setting->parent->name,
+		ccsIniSetKey (data->iniFile, ccsPluginGetName (ccsSettingGetParent (setting)),
 			      keyName, value);
 	}
 	break;
@@ -532,7 +532,7 @@
 	{
 	    CCSSettingButtonValue value;
 	    if (ccsGetButton (setting, &value))
-		ccsIniSetButton (data->iniFile, setting->parent->name,
+		ccsIniSetButton (data->iniFile, ccsPluginGetName (ccsSettingGetParent (setting)),
 				 keyName, value);
 	}
 	break;
@@ -540,7 +540,7 @@
 	{
 	    unsigned int value;
 	    if (ccsGetEdge (setting, &value))
-		ccsIniSetEdge (data->iniFile, setting->parent->name,
+		ccsIniSetEdge (data->iniFile, ccsPluginGetName (ccsSettingGetParent (setting)),
 			       keyName, value);
 	}
 	break;
@@ -548,7 +548,7 @@
 	{
 	    Bool value;
 	    if (ccsGetBell (setting, &value))
-		ccsIniSetBell (data->iniFile, setting->parent->name,
+		ccsIniSetBell (data->iniFile, ccsPluginGetName (ccsSettingGetParent (setting)),
 			       keyName, value);
 	}
 	break;
@@ -556,8 +556,8 @@
 	{
 	    CCSSettingValueList value;
 	    if (ccsGetList (setting, &value))
-		ccsIniSetList (data->iniFile, setting->parent->name,
-			       keyName, value, setting->info.forList.listType);
+		ccsIniSetList (data->iniFile, ccsPluginGetName (ccsSettingGetParent (setting)),
+			       keyName, value, ccsSettingGetInfo (setting)->forList.listType);
 	}
 	break;
     default:

=== modified file 'compizconfig/libcompizconfig/include/ccs.h'
--- compizconfig/libcompizconfig/include/ccs.h	2011-08-20 19:03:37 +0000
+++ compizconfig/libcompizconfig/include/ccs.h	2012-06-27 07:01:20 +0000
@@ -19,10 +19,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-
 #ifndef _CSS_H
 #define _CSS_H
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 #define D_NONE   0
 #define D_NORMAL 1
 #define D_FULL   2
@@ -124,6 +128,103 @@
 CCSLIST_HDR (StrRestriction, CCSStrRestriction)
 CCSLIST_HDR (StrExtension, CCSStrExtension)
 
+typedef struct _CCSInterface CCSInterface; /* Dummy typedef */
+typedef struct _CCSPrivate CCSPrivate; /* Dummy typedef */
+typedef struct _CCSObject CCSObject;
+
+typedef void * (*reallocObjectProc) (void *, void *, size_t);
+typedef void * (*mallocObjectProc) (void *, size_t);
+typedef void * (*callocObjectProc) (void *, size_t, size_t);
+typedef void (*freeObjectProc) (void *, void *);
+
+typedef struct _CCSObjectAllocationInterface
+{
+    reallocObjectProc realloc_;
+    mallocObjectProc  malloc_;
+    callocObjectProc  calloc_;
+    freeObjectProc    free_;
+    void              *allocator;
+} CCSObjectAllocationInterface;
+
+extern CCSObjectAllocationInterface ccsDefaultObjectAllocator;
+
+struct _CCSObject
+{
+    CCSPrivate *priv; /* Private pointer for object storage */
+
+    const CCSInterface **interfaces; /* An array of interfaces that this object implements */
+    int          *interface_types; /* An array of interface types */
+    unsigned int n_interfaces;
+    unsigned int n_allocated_interfaces;
+
+    CCSObjectAllocationInterface *object_allocation;
+
+    unsigned int refcnt; /* Reference count of this object */
+};
+
+Bool
+ccsObjectInit_ (CCSObject *object, CCSObjectAllocationInterface *interface);
+
+#define ccsObjectInit(o, interface) (ccsObjectInit_) (&(o)->object, interface)
+
+Bool
+ccsObjectAddInterface_ (CCSObject *object, const CCSInterface *interface, int interface_type);
+
+#define ccsObjectAddInterface(o, interface, type) (ccsObjectAddInterface_) (&(o)->object, interface, type);
+
+Bool
+ccsObjectRemoveInterface_ (CCSObject *object, int interface_type);
+
+#define ccsObjectRemoveInterface(o, interface_type) (ccsObjectRemoveInterface_) (&(o)->object, interface_type);
+
+const CCSInterface * ccsObjectGetInterface_ (CCSObject *object, int interface_type);
+
+#define ccsObjectGetInterface(o, interface_type) (ccsObjectGetInterface_) (&(o)->object, interface_type)
+
+#define ccsObjectRef(o) \
+    do { ((o)->object).refcnt++; } while (FALSE)
+
+#define ccsObjectUnref(o, freeFunc) \
+    do \
+    { \
+	((o)->object).refcnt--; \
+	if (!((o)->object).refcnt) \
+	    freeFunc (o); \
+    } while (FALSE)
+
+CCSPrivate *
+ccsObjectGetPrivate_ (CCSObject *object);
+
+#define ccsObjectGetPrivate(o) (ccsObjectGetPrivate_) (&(o)->object)
+
+void
+ccsObjectSetPrivate_ (CCSObject *object, CCSPrivate *priv);
+
+#define ccsObjectSetPrivate(o, priv) (ccsObjectSetPrivate_) (&(o)->object, priv)
+
+void
+ccsObjectFinalize_ (CCSObject *object);
+
+#define ccsObjectFinalize(o) (ccsObjectFinalize_) (&(o)->object)
+
+unsigned int
+ccsAllocateType ();
+
+#define GET_INTERFACE_TYPE(Interface) \
+    ccs##Interface##GetType ()
+
+#define INTERFACE_TYPE(Interface) \
+    unsigned int ccs##Interface##GetType () \
+    { \
+	static unsigned int   type_id = 0; \
+	if (!type_id) \
+	    type_id = ccsAllocateType (); \
+	 \
+	return type_id; \
+    }
+
+#define GET_INTERFACE(CType, o) (CType *) ccsObjectGetInterface (o, GET_INTERFACE_TYPE(CType))
+
 /**
  * reference counting
  * 
@@ -154,20 +255,115 @@
 CCSREF_HDR (StrRestriction, CCSStrRestriction)
 CCSREF_HDR (StrExtension, CCSStrExtension)
 
+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;
+
+/* CCSContext interface */
+typedef CCSPluginList (*CCSContextGetPluginsProc) (CCSContext *context);
+typedef CCSPluginCategory * (*CCSContextGetCategories) (CCSContext *context);
+typedef CCSSettingList (*CCSContextGetChangedSettings) (CCSContext *context);
+typedef unsigned int (*CCSContextGetScreenNum) (CCSContext *context);
+typedef Bool (*CCSContextAddChangedSetting) (CCSContext *context, CCSSetting *setting);
+typedef Bool (*CCSContextClearChangedSettings) (CCSContext *context);
+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
+{
+    CCSContextGetPluginsProc contextGetPlugins;
+    CCSContextGetCategories contextGetCategories;
+    CCSContextGetChangedSettings contextGetChangedSettings;
+    CCSContextGetScreenNum contextGetScreenNum;
+    CCSContextAddChangedSetting contextAddChangedSetting;
+    CCSContextClearChangedSettings contextClearChangedSettings;
+    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;
+};
+
+unsigned int ccsCCSContextInterfaceGetType ();
+
+/* CCSContext accessor functions */
+CCSPluginList ccsContextGetPlugins (CCSContext *);
+CCSPluginCategory * ccsContextGetCategories (CCSContext *);
+CCSSettingList ccsContextGetChangedSettings (CCSContext *);
+unsigned int ccsContextGetScreenNum (CCSContext *);
+Bool ccsContextAddChangedSetting (CCSContext *context, CCSSetting *setting);
+Bool ccsContextClearChangedSettings (CCSContext *context);
+CCSSettingList ccsContextStealChangedSettings (CCSContext *context);
+void * ccsContextGetPrivatePtr (CCSContext *context);
+void ccsContextSetPrivatePtr (CCSContext *context, void *ptr);
+
+/* only for bindings */
+void * ccsContextGetPluginsBindable (CCSContext *context);
+void * ccsContextStealChangedSettingsBindable (CCSContext *context);
+void * ccsContextGetChangedSettingsBindable (CCSContext *context);
+
 struct _CCSContext
 {
-    CCSPluginList     plugins;         /* list of plugins settings
-					  were loaded for */
-    CCSPluginCategory *categories;     /* list of plugin categories */
-    void              *privatePtr;     /* private pointer that can be used
-					  by the caller */
-    void              *ccsPrivate;     /* private pointer for compizconfig
-					  internal usage */
-
-    CCSSettingList    changedSettings; /* list of settings changed since last
-					  settings write */
-
-    unsigned int screenNum; /* screen number this context is assigned to */
+    CCSObject object;
 };
 
 struct _CCSBackendInfo
@@ -180,36 +376,80 @@
     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);
+
+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);
+char * ccsPluginGetHints (CCSPlugin *plugin);
+char * ccsPluginGetCategory (CCSPlugin *plugin);
+
+CCSStringList ccsPluginGetLoadAfter (CCSPlugin *plugin);
+CCSStringList ccsPluginGetLoadBefore (CCSPlugin *plugin);
+CCSStringList ccsPluginGetRequiresPlugins (CCSPlugin *plugin);
+CCSStringList ccsPluginGetConflictPlugins (CCSPlugin *plugin);
+CCSStringList ccsPluginGetProvidesFeatures (CCSPlugin *plugin);
+CCSStringList ccsPluginGetRequiresFeatures (CCSPlugin *plugin);
+
+void * ccsPluginGetPrivatePtr (CCSPlugin *plugin);
+void ccsPluginSetPrivatePtr (CCSPlugin *plugin, void *ptr);
+
+CCSContext * ccsPluginGetContext (CCSPlugin *plugin);
+
+void * ccsPluginGetProvidesFeaturesBindable (CCSPlugin *plugin);
+
 struct _CCSPlugin
 {
-    char *name;                    /* plugin name */
-    char *shortDesc;		   /* plugin short description */
-    char *longDesc;		   /* plugin long description */
-    char *hints;                   /* currently unused */
-    char *category;		   /* plugin category name */
-
-    CCSStringList loadAfter;       /* list of plugin names this plugin needs to
-				      be loaded after */
-    CCSStringList loadBefore;      /* list of plugin names this plugin needs to
-				      be loaded before */
-    CCSStringList requiresPlugin;  /* list of plugin names this plugin
-				      requires */
-    CCSStringList conflictPlugin;  /* list of plugin names this plugin
-				      conflicts with */
-    CCSStringList conflictFeature; /* list of feature names this plugin
-				      conflicts with */
-    CCSStringList providesFeature; /* list of feature names this plugin
-				      provides */
-    CCSStringList requiresFeature; /* list of feature names this plugin
-				      requires */
-
-    void       *privatePtr;        /* private pointer that can be used
-				      by the caller */
-    CCSContext *context;           /* context this plugin belongs to */
-
-    void *ccsPrivate;              /* private pointer for compizconfig
-				      internal usage */
-    unsigned int refCount;	   /* reference count */
+    CCSObject object;
 };
 
 typedef enum _CCSSettingType
@@ -399,30 +639,187 @@
     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);
+
+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
 {
-    char *name;             /* setting name */
-    char *shortDesc;        /* setting short description in current locale */
-    char *longDesc;         /* setting long description in current locale */
-
-    CCSSettingType type;    /* setting type */
-
-    CCSSettingInfo info;    /* information assigned to this setting,
-			       valid if the setting is an int, float, string
-			       or list setting */
-
-    char *group;	    /* group name in current locale */
-    char *subGroup;	    /* sub group name in current locale */
-    char *hints;	    /* hints in current locale */
-
-    CCSSettingValue defaultValue; /* default value of this setting */
-    CCSSettingValue *value;       /* actual value of this setting */
-    Bool	    isDefault;    /* does the actual value match the default
-				     value? */
-
-    CCSPlugin *parent;            /* plugin this setting belongs to */
-    void      *privatePtr;        /* private pointer for usage by the caller */
-    unsigned int refCount;	   /* reference count */
+    CCSObject object;
 };
 
 struct _CCSPluginCategory
@@ -441,11 +838,11 @@
 
 /* Creates a new context for the given screen.
    All plugin settings are automatically enumerated. */
-CCSContext* ccsContextNew (unsigned int screenNum);
+CCSContext* ccsContextNew (unsigned int screenNum, const CCSInterfaceTable *);
 
 /* Creates a new context without auto-enumerating any plugin or setting.
    Behaves otherwise exactly like ccsContextNew. */
-CCSContext* ccsEmptyContextNew (unsigned int screenNum);
+CCSContext* ccsEmptyContextNew (unsigned int screenNum, const CCSInterfaceTable *);
 
 /* Destroys the allocated context. */
 void ccsContextDestroy (CCSContext * context);
@@ -484,45 +881,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. */
@@ -533,31 +892,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);
 
@@ -709,10 +1043,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,
@@ -902,15 +1232,10 @@
 /* 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);
 
-/* Checks if settings need to be constrained */
-Bool ccsContextNeedsConstraining (CCSContext *context);
+#ifdef __cplusplus
+}
+#endif
 
 #endif

=== modified file 'compizconfig/libcompizconfig/src/CMakeLists.txt'
--- compizconfig/libcompizconfig/src/CMakeLists.txt	2012-05-27 14:28:20 +0000
+++ compizconfig/libcompizconfig/src/CMakeLists.txt	2012-06-27 07:01:20 +0000
@@ -35,6 +35,9 @@
 	 ${LIBCOMPIZCONFIG_FILES}
 	 ${CMAKE_CURRENT_BINARY_DIR}/compizconfig.pb.cc
 	)
+    set (LIBCOMPIZCONFIG_LIBRARIES
+	 ${LIBCOMPIZCONFIG_LIBRARIES}
+	 protobuf)
     add_definitions (
 	    -DUSE_PROTOBUF
     )

=== modified file 'compizconfig/libcompizconfig/src/ccs-private.h'
--- compizconfig/libcompizconfig/src/ccs-private.h	2011-08-20 19:03:37 +0000
+++ compizconfig/libcompizconfig/src/ccs-private.h	2012-06-27 07:01:20 +0000
@@ -26,25 +26,62 @@
 #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;
+    CCSPluginPrivate *pPrivate = (CCSPluginPrivate *) ccsObjectGetPrivate (p);
+#define SETTING_PRIV(s) \
+    CCSSettingPrivate *sPrivate = (CCSSettingPrivate *) ccsObjectGetPrivate (s);
 
 extern Bool basicMetadata;
 
 typedef struct _CCSContextPrivate
 {
     CCSBackend        *backend;
-
+    CCSPluginList     plugins;         /* list of plugins settings
+                                          were loaded for */
+    CCSPluginCategory *categories;     /* list of plugin categories */
+    void              *privatePtr;     /* private pointer that can be used
+					  by the caller */
     char              *profile;
     Bool	      deIntegration;
     Bool              pluginListAutoSort;
 
     unsigned int      configWatchId;
+
+    CCSSettingList    changedSettings; /* list of settings changed since last
+                                          settings write */
+
+    unsigned int screenNum; /* screen number this context is assigned to */
+    const CCSInterfaceTable *object_interfaces;
 } CCSContextPrivate;
 
 typedef struct _CCSPluginPrivate
 {
+    char *name;                    /* plugin name */
+    char *shortDesc;		   /* plugin short description */
+    char *longDesc;		   /* plugin long description */
+    char *hints;                   /* currently unused */
+    char *category;		   /* plugin category name */
+
+    CCSStringList loadAfter;       /* list of plugin names this plugin needs to
+				      be loaded after */
+    CCSStringList loadBefore;      /* list of plugin names this plugin needs to
+				      be loaded before */
+    CCSStringList requiresPlugin;  /* list of plugin names this plugin
+				      requires */
+    CCSStringList conflictPlugin;  /* list of plugin names this plugin
+				      conflicts with */
+    CCSStringList conflictFeature; /* list of feature names this plugin
+				      conflicts with */
+    CCSStringList providesFeature; /* list of feature names this plugin
+				      provides */
+    CCSStringList requiresFeature; /* list of feature names this plugin
+				      requires */
+
+    void       *privatePtr;        /* private pointer that can be used
+				      by the caller */
+    CCSContext *context;           /* context this plugin belongs to */
+
     CCSSettingList settings;
     CCSGroupList   groups;
     Bool 	   loaded;
@@ -58,6 +95,31 @@
     CCSStrExtensionList stringExtensions;
 } CCSPluginPrivate;
 
+typedef struct _CCSSettingPrivate
+{
+    char *name;             /* setting name */
+    char *shortDesc;        /* setting short description in current locale */
+    char *longDesc;         /* setting long description in current locale */
+
+    CCSSettingType type;    /* setting type */
+
+    CCSSettingInfo info;    /* information assigned to this setting,
+			       valid if the setting is an int, float, string
+			       or list setting */
+
+    char *group;	    /* group name in current locale */
+    char *subGroup;	    /* sub group name in current locale */
+    char *hints;	    /* hints in current locale */
+
+    CCSSettingValue defaultValue; /* default value of this setting */
+    CCSSettingValue *value;       /* actual value of this setting */
+    Bool	    isDefault;    /* does the actual value match the default
+				     value? */
+
+    CCSPlugin *parent;            /* plugin this setting belongs to */
+    void      *privatePtr;        /* private pointer for usage by the caller */
+} CCSSettingPrivate;
+
 typedef struct _CCSSettingsUpgrade
 {
     char	   *profile;
@@ -78,6 +140,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 'compizconfig/libcompizconfig/src/compiz.cpp'
--- compizconfig/libcompizconfig/src/compiz.cpp	2012-05-23 10:07:03 +0000
+++ compizconfig/libcompizconfig/src/compiz.cpp	2012-06-27 07:01:20 +0000
@@ -562,69 +562,87 @@
 	return;
     }
 
+    CONTEXT_PRIV (ccsPluginGetContext (plugin));
+
     setting = (CCSSetting *) calloc (1, sizeof (CCSSetting));
+
     if (!setting)
 	return;
 
-    setting->parent = plugin;
-    setting->isDefault = TRUE;
-    setting->name = strdup (name);
-    setting->refCount = 1;
+    ccsObjectInit (setting, &ccsDefaultObjectAllocator);
+
+    CCSSettingPrivate *ccsPrivate = (CCSSettingPrivate *) calloc (1, sizeof (CCSSettingPrivate));
+
+    if (!ccsPrivate)
+    {
+	free (setting);
+	return;
+    }
+
+    ccsObjectSetPrivate (setting, (CCSPrivate *) ccsPrivate);
+    ccsObjectAddInterface (setting, (CCSInterface *) cPrivate->object_interfaces->settingInterface, GET_INTERFACE_TYPE (CCSSettingInterface));
+    ccsSettingRef (setting);
+
+    SETTING_PRIV (setting);
+
+    sPrivate->parent = plugin;
+    sPrivate->isDefault = TRUE;
+    sPrivate->name = strdup (name);
 
     if (!basicMetadata)
     {
-	setting->shortDesc =
+	sPrivate->shortDesc =
 	    strdup (option.has_short_desc () ?
 		    option.short_desc ().c_str () :
 		    name);
-	setting->longDesc =
+	sPrivate->longDesc =
 	    strdup (option.has_long_desc () ?
 		    option.long_desc ().c_str () :
 		    name);
-	setting->hints = strdup (option.has_hints () ?
+	sPrivate->hints = strdup (option.has_hints () ?
 				 option.hints ().c_str () :
 				 name);
-	setting->group =
+	sPrivate->group =
 	    strdup (option.group_id () >= 0 ?
 		    groups.Get (option.group_id ()).c_str () :
 		    "");
-	setting->subGroup =
+	sPrivate->subGroup =
 	    strdup (option.subgroup_id () >= 0 ?
 		    subgroups.Get (option.subgroup_id ()).c_str () :
 		    "");
     }
     else
     {
-	setting->shortDesc = strdup (name);
-	setting->longDesc  = strdup ("");
-	setting->hints     = strdup ("");
-	setting->group     = strdup ("");
-	setting->subGroup  = strdup ("");
+	sPrivate->shortDesc = strdup (name);
+	sPrivate->longDesc  = strdup ("");
+	sPrivate->hints     = strdup ("");
+	sPrivate->group     = strdup ("");
+	sPrivate->subGroup  = strdup ("");
     }
 
-    setting->type = (CCSSettingType) option.type ();
-    setting->value = &setting->defaultValue;
-    setting->defaultValue.parent = setting;
+    sPrivate->type = (CCSSettingType) option.type ();
+    sPrivate->value = &sPrivate->defaultValue;
+    sPrivate->defaultValue.parent = setting;
 
-    switch (setting->type)
+    switch (sPrivate->type)
     {
     case TypeInt:
-	initIntInfoPB (&setting->info, option);
+	initIntInfoPB (&sPrivate->info, option);
 	break;
     case TypeFloat:
-	initFloatInfoPB (&setting->info, option);
+	initFloatInfoPB (&sPrivate->info, option);
 	break;
     case TypeString:
-	initStringInfoPB (&setting->info, option);
+	initStringInfoPB (&sPrivate->info, option);
 	break;
     case TypeList:
-	initListInfoPB (&setting->info, option);
+	initListInfoPB (&sPrivate->info, option);
 	break;
     case TypeKey:
     case TypeButton:
     case TypeEdge:
     case TypeBell:
-	initActionInfoPB (&setting->info, option);
+	initActionInfoPB (&sPrivate->info, option);
 	break;
     case TypeAction: // do nothing and fall through
     default:
@@ -633,48 +651,48 @@
 
     if (option.default_value_size () > 0)
     {
-	switch (setting->type)
+	switch (sPrivate->type)
 	{
 	case TypeInt:
-	    initIntValuePB (&setting->defaultValue, &setting->info,
+	    initIntValuePB (&sPrivate->defaultValue, &sPrivate->info,
 			    option.default_value (0));
 	    break;
 	case TypeBool:
-	    initBoolValuePB (&setting->defaultValue, option.default_value (0));
+	    initBoolValuePB (&sPrivate->defaultValue, option.default_value (0));
 	    break;
 	case TypeFloat:
-	    initFloatValuePB (&setting->defaultValue, &setting->info,
+	    initFloatValuePB (&sPrivate->defaultValue, &sPrivate->info,
 			      option.default_value (0));
 	    break;
 	case TypeString:
-	    initStringValuePB (&setting->defaultValue, &setting->info,
+	    initStringValuePB (&sPrivate->defaultValue, &sPrivate->info,
 			       option.default_value (0));
 	    break;
 	case TypeColor:
-	    initColorValuePB (&setting->defaultValue, option.default_value (0));
+	    initColorValuePB (&sPrivate->defaultValue, option.default_value (0));
 	    break;
 	case TypeKey:
-	    initKeyValuePB (&setting->defaultValue, &setting->info,
+	    initKeyValuePB (&sPrivate->defaultValue, &sPrivate->info,
 			    option.default_value (0));
 	    break;
 	case TypeButton:
-	    initButtonValuePB (&setting->defaultValue, &setting->info,
+	    initButtonValuePB (&sPrivate->defaultValue, &sPrivate->info,
 			       option.default_value (0));
 	    break;
 	case TypeEdge:
-	    initEdgeValuePB (&setting->defaultValue, &setting->info,
+	    initEdgeValuePB (&sPrivate->defaultValue, &sPrivate->info,
 			     option.default_value (0));
 	    break;
 	case TypeBell:
-	    initBellValuePB (&setting->defaultValue, &setting->info,
+	    initBellValuePB (&sPrivate->defaultValue, &sPrivate->info,
 			     option.default_value (0));
 	    break;
 	case TypeMatch:
-	    initMatchValuePB (&setting->defaultValue,
+	    initMatchValuePB (&sPrivate->defaultValue,
 			      option.default_value (0));
 	    break;
 	case TypeList:
-	    initListValuePB (&setting->defaultValue, &setting->info,
+	    initListValuePB (&sPrivate->defaultValue, &sPrivate->info,
 			     option);
 	    break;
 	case TypeAction: // do nothing and fall through
@@ -686,13 +704,13 @@
     {
 	/* if we have no set defaults, we have at least to set
 	   the string defaults to empty strings */
-	switch (setting->type)
+	switch (sPrivate->type)
 	{
 	case TypeString:
-	    setting->defaultValue.value.asString = strdup ("");
+	    sPrivate->defaultValue.value.asString = strdup ("");
 	    break;
 	case TypeMatch:
-	    setting->defaultValue.value.asMatch = strdup ("");
+	    sPrivate->defaultValue.value.asMatch = strdup ("");
 	    break;
 	default:
 	    break;
@@ -823,19 +841,21 @@
 static void
 initRulesFromPB (CCSPlugin * plugin, const PluginInfoMetadata & pluginInfoPB)
 {
-    addStringsFromPB (&plugin->providesFeature, pluginInfoPB.feature ());
+    PLUGIN_PRIV (plugin)
+
+    addStringsFromPB (&pPrivate->providesFeature, pluginInfoPB.feature ());
 
     if (!pluginInfoPB.has_deps ())
 	return;
 
     const DependenciesMetadata & deps = pluginInfoPB.deps ();
 
-    addStringsFromPB (&plugin->loadAfter, deps.after_plugin ());
-    addStringsFromPB (&plugin->loadBefore, deps.before_plugin ());
-    addStringsFromPB (&plugin->requiresPlugin, deps.require_plugin ());
-    addStringsFromPB (&plugin->requiresFeature, deps.require_feature ());
-    addStringsFromPB (&plugin->conflictPlugin, deps.conflict_plugin ());
-    addStringsFromPB (&plugin->conflictFeature, deps.conflict_feature ());
+    addStringsFromPB (&pPrivate->loadAfter, deps.after_plugin ());
+    addStringsFromPB (&pPrivate->loadBefore, deps.before_plugin ());
+    addStringsFromPB (&pPrivate->requiresPlugin, deps.require_plugin ());
+    addStringsFromPB (&pPrivate->requiresFeature, deps.require_feature ());
+    addStringsFromPB (&pPrivate->conflictPlugin, deps.conflict_plugin ());
+    addStringsFromPB (&pPrivate->conflictFeature, deps.conflict_feature ());
 }
 
 static void
@@ -848,6 +868,8 @@
     CCSPlugin *plugin;
     CCSPluginPrivate *pPrivate;
 
+    CONTEXT_PRIV (context);
+
     name = pluginInfoPB.name ().c_str ();
 
     if (!strlen (name))
@@ -861,10 +883,12 @@
 	return;
 
     plugin = (CCSPlugin *) calloc (1, sizeof (CCSPlugin));
+
     if (!plugin)
 	return;
 
-    plugin->refCount = 1;
+    ccsObjectInit (plugin, &ccsDefaultObjectAllocator);
+    ccsPluginRef (plugin);
 
     pPrivate = (CCSPluginPrivate *) calloc (1, sizeof (CCSPluginPrivate));
     if (!pPrivate)
@@ -874,7 +898,8 @@
     }
     pPrivate->loaded = FALSE;
 
-    plugin->ccsPrivate = (void *) pPrivate;
+    ccsObjectSetPrivate (plugin, (CCSPrivate *) pPrivate);
+    ccsObjectAddInterface (plugin, (CCSInterface *) cPrivate->object_interfaces->pluginInterface, GET_INTERFACE_TYPE (CCSPluginInterface));
 
     if (file)
 	pPrivate->pbFilePath = strdup (file);
@@ -886,33 +911,33 @@
 	    pPrivate->xmlPath = NULL;
     }
 
-    plugin->context = context;
-    plugin->name = strdup (name);
+    pPrivate->context = context;
+    pPrivate->name = strdup (name);
 
     if (!basicMetadata)
     {
-	plugin->shortDesc =
+	pPrivate->shortDesc =
 	    strdup (pluginInfoPB.has_short_desc () ?
 		    pluginInfoPB.short_desc ().c_str () :
 		    name);
-	plugin->longDesc =
+	pPrivate->longDesc =
 	    strdup (pluginInfoPB.has_long_desc () ?
 		    pluginInfoPB.long_desc ().c_str () :
 		    name);
-	plugin->category = strdup (pluginInfoPB.has_category () ?
+	pPrivate->category = strdup (pluginInfoPB.has_category () ?
 				   pluginInfoPB.category ().c_str () :
 				   "");
     }
     else
     {
-	plugin->shortDesc = strdup (name);
-	plugin->longDesc  = strdup (name);
-	plugin->category  = strdup ("");
+	pPrivate->shortDesc = strdup (name);
+	pPrivate->longDesc  = strdup (name);
+	pPrivate->category  = strdup ("");
     }
 
     initRulesFromPB (plugin, pluginInfoPB);
 
-    context->plugins = ccsPluginListAppend (context->plugins, plugin);
+    cPrivate->plugins = ccsPluginListAppend (cPrivate->plugins, plugin);
 }
 
 static void
@@ -927,11 +952,15 @@
     if (ccsFindPlugin (context, "core"))
 	return;
 
+    CONTEXT_PRIV (context);
+
     plugin = (CCSPlugin*) calloc (1, sizeof (CCSPlugin));
+
     if (!plugin)
 	return;
 
-    plugin->refCount = 1;
+    ccsObjectInit (plugin, &ccsDefaultObjectAllocator);
+    ccsPluginRef (plugin);
 
     pPrivate = (CCSPluginPrivate *) calloc (1, sizeof (CCSPluginPrivate));
     if (!pPrivate)
@@ -940,7 +969,8 @@
 	return;
     }
 
-    plugin->ccsPrivate = (void *) pPrivate;
+    ccsObjectSetPrivate (plugin, (CCSPrivate *) pPrivate);
+    ccsObjectAddInterface (plugin, (CCSInterface *) cPrivate->object_interfaces->pluginInterface, GET_INTERFACE_TYPE (CCSPluginInterface));
 
     if (file)
 	pPrivate->pbFilePath = strdup (file);
@@ -951,30 +981,30 @@
 	pPrivate->xmlPath = strdup ("/compiz/core");
     }
 
-    plugin->context = context;
-    plugin->name = strdup ("core");
-    plugin->category = strdup ("General");
+    pPrivate->context = context;
+    pPrivate->name = strdup ("core");
+    pPrivate->category = strdup ("General");
 
     if (!basicMetadata)
     {
-	plugin->shortDesc =
+	pPrivate->shortDesc =
 	    strdup (pluginInfoPB.has_short_desc () ?
 		    pluginInfoPB.short_desc ().c_str () :
 		    "General Options");
 
-	    plugin->longDesc =
+	    pPrivate->longDesc =
 	    strdup (pluginInfoPB.has_long_desc () ?
 		    pluginInfoPB.long_desc ().c_str () :
 		    "General Compiz Options");
     }
     else
     {
-	plugin->shortDesc = strdup ("General Options");
-	plugin->longDesc  = strdup ("General Compiz Options");
+	pPrivate->shortDesc = strdup ("General Options");
+	pPrivate->longDesc  = strdup ("General Compiz Options");
     }
 
     initRulesFromPB (plugin, pluginInfoPB);
-    context->plugins = ccsPluginListAppend (context->plugins, plugin);
+    cPrivate->plugins = ccsPluginListAppend (cPrivate->plugins, plugin);
 }
 
 #endif
@@ -1991,39 +2021,57 @@
     if (getOptionType (type) == TypeNum)
 	return;
 
+    CONTEXT_PRIV (ccsPluginGetContext (plugin));
+
     setting = (CCSSetting *) calloc (1, sizeof (CCSSetting));
+
     if (!setting)
 	return;
 
-    setting->parent = plugin;
-    setting->isDefault = TRUE;
-    setting->name = strdup (name);
-    setting->refCount = 1;
+    ccsObjectInit (setting, &ccsDefaultObjectAllocator);
+
+    CCSSettingPrivate *ccsPrivate = (CCSSettingPrivate *) calloc (1, sizeof (CCSSettingPrivate));
+
+    if (!ccsPrivate)
+    {
+	free (setting);
+	return;
+    }
+
+    ccsObjectSetPrivate (setting, (CCSPrivate *) ccsPrivate);
+    ccsObjectAddInterface (setting, (CCSInterface *) cPrivate->object_interfaces->settingInterface, GET_INTERFACE_TYPE (CCSSettingInterface));
+    ccsSettingRef (setting);
+
+    SETTING_PRIV (setting)
+
+    sPrivate->parent = plugin;
+    sPrivate->isDefault = TRUE;
+    sPrivate->name = strdup (name);
 
     if (!basicMetadata)
     {
-	setting->shortDesc =
+	sPrivate->shortDesc =
 	    stringFromNodeDefTrans (node, "short/child::text()", name);
-	setting->longDesc =
+	sPrivate->longDesc =
 	    stringFromNodeDefTrans (node, "long/child::text()", "");
-	setting->hints = stringFromNodeDef (node, "hints/child::text()", "");
-	setting->group =
+	sPrivate->hints = stringFromNodeDef (node, "hints/child::text()", "");
+	sPrivate->group =
 	    stringFromNodeDefTrans (node, "ancestor::group/short/child::text()",
 				    "");
-	setting->subGroup =
+	sPrivate->subGroup =
 	    stringFromNodeDefTrans (node,
 				    "ancestor::subgroup/short/child::text()",
 				    "");
     }
     else
     {
-	setting->shortDesc = strdup (name);
-	setting->longDesc  = strdup ("");
-	setting->hints     = strdup ("");
-	setting->group     = strdup ("");
-	setting->subGroup  = strdup ("");
+	sPrivate->shortDesc = strdup (name);
+	sPrivate->longDesc  = strdup ("");
+	sPrivate->hints     = strdup ("");
+	sPrivate->group     = strdup ("");
+	sPrivate->subGroup  = strdup ("");
     }
-    setting->type = getOptionType (type);
+    sPrivate->type = getOptionType (type);
 
 #ifdef USE_PROTOBUF
     OptionMetadata *optPB = NULL;
@@ -2033,46 +2081,46 @@
 	optPB = (OptionMetadata *) optionPBv;
 
 	optPB->set_name (name);
-	optPB->set_type ((OptionMetadata::Type) setting->type);
+	optPB->set_type ((OptionMetadata::Type) sPrivate->type);
 	if (isReadonly)
 	    optPB->set_read_only (isReadonly);
 
-	optPB->set_short_desc (setting->shortDesc);
-	optPB->set_long_desc (setting->longDesc);
-
-	if (strlen (setting->hints) > 0)
-	    optPB->set_hints (setting->hints);
-
-	if (groupListPBv && strlen (setting->group) > 0)
+	optPB->set_short_desc (sPrivate->shortDesc);
+	optPB->set_long_desc (sPrivate->longDesc);
+
+	if (strlen (sPrivate->hints) > 0)
+	    optPB->set_hints (sPrivate->hints);
+
+	if (groupListPBv && strlen (sPrivate->group) > 0)
 	    checkAddGroupSubgroup (optPB, (StringList *) groupListPBv,
-				   setting->group, TRUE);
-	if (subgroupListPBv && strlen (setting->subGroup) > 0)
+				   sPrivate->group, TRUE);
+	if (subgroupListPBv && strlen (sPrivate->subGroup) > 0)
 	    checkAddGroupSubgroup (optPB, (StringList *) subgroupListPBv,
-				   setting->subGroup, FALSE);
+				   sPrivate->subGroup, FALSE);
     }
 #endif
-    setting->value = &setting->defaultValue;
-    setting->defaultValue.parent = setting;
+    sPrivate->value = &sPrivate->defaultValue;
+    sPrivate->defaultValue.parent = setting;
 
-    switch (setting->type)
+    switch (sPrivate->type)
     {
     case TypeInt:
-	initIntInfo (&setting->info, node, optionPBv);
+	initIntInfo (&sPrivate->info, node, optionPBv);
 	break;
     case TypeFloat:
-	initFloatInfo (&setting->info, node, optionPBv);
+	initFloatInfo (&sPrivate->info, node, optionPBv);
 	break;
     case TypeString:
-	initStringInfo (&setting->info, node, optionPBv);
+	initStringInfo (&sPrivate->info, node, optionPBv);
 	break;
     case TypeList:
-	initListInfo (&setting->info, node, optionPBv);
+	initListInfo (&sPrivate->info, node, optionPBv);
 	break;
     case TypeKey:
     case TypeButton:
     case TypeEdge:
     case TypeBell:
-	initActionInfo (&setting->info, node, optionPBv);
+	initActionInfo (&sPrivate->info, node, optionPBv);
 	break;
     default:
 	break;
@@ -2083,52 +2131,52 @@
     {
 	void * valuePBv = NULL;
 #ifdef USE_PROTOBUF
-	if (optPB && setting->type != TypeList)
+	if (optPB && sPrivate->type != TypeList)
 	    valuePBv = optPB->add_default_value ();
 #endif
-	switch (setting->type)
+	switch (sPrivate->type)
 	{
 	case TypeInt:
-	    initIntValue (&setting->defaultValue, &setting->info, nodes[0],
+	    initIntValue (&sPrivate->defaultValue, &sPrivate->info, nodes[0],
 			  valuePBv);
 	    break;
 	case TypeBool:
-	    initBoolValue (&setting->defaultValue, nodes[0],
+	    initBoolValue (&sPrivate->defaultValue, nodes[0],
 			   valuePBv);
 	    break;
 	case TypeFloat:
-	    initFloatValue (&setting->defaultValue, &setting->info, nodes[0],
+	    initFloatValue (&sPrivate->defaultValue, &sPrivate->info, nodes[0],
 			    valuePBv);
 	    break;
 	case TypeString:
-	    initStringValue (&setting->defaultValue, &setting->info, nodes[0],
+	    initStringValue (&sPrivate->defaultValue, &sPrivate->info, nodes[0],
 			     valuePBv);
 	    break;
 	case TypeColor:
-	    initColorValue (&setting->defaultValue, nodes[0], valuePBv);
+	    initColorValue (&sPrivate->defaultValue, nodes[0], valuePBv);
 	    break;
 	case TypeKey:
-	    initKeyValue (&setting->defaultValue, &setting->info, nodes[0],
+	    initKeyValue (&sPrivate->defaultValue, &sPrivate->info, nodes[0],
 			  valuePBv);
 	    break;
 	case TypeButton:
-	    initButtonValue (&setting->defaultValue, &setting->info, nodes[0],
+	    initButtonValue (&sPrivate->defaultValue, &sPrivate->info, nodes[0],
 			     valuePBv);
 	    break;
 	case TypeEdge:
-	    initEdgeValue (&setting->defaultValue, &setting->info, nodes[0],
+	    initEdgeValue (&sPrivate->defaultValue, &sPrivate->info, nodes[0],
 			   valuePBv);
 	    break;
 	case TypeBell:
-	    initBellValue (&setting->defaultValue, &setting->info, nodes[0],
+	    initBellValue (&sPrivate->defaultValue, &sPrivate->info, nodes[0],
 			   valuePBv);
 	    break;
 	case TypeMatch:
-	    initMatchValue (&setting->defaultValue, nodes[0],
+	    initMatchValue (&sPrivate->defaultValue, nodes[0],
 			    valuePBv);
 	    break;
 	case TypeList:
-	    initListValue (&setting->defaultValue, &setting->info, nodes[0],
+	    initListValue (&sPrivate->defaultValue, &sPrivate->info, nodes[0],
 			   optionPBv);
 	    break;
 	default:
@@ -2139,13 +2187,13 @@
     {
 	/* if we have no set defaults, we have at least to set
 	   the string defaults to empty strings */
-	switch (setting->type)
+	switch (sPrivate->type)
 	{
 	case TypeString:
-	    setting->defaultValue.value.asString = strdup ("");
+	    sPrivate->defaultValue.value.asString = strdup ("");
 	    break;
 	case TypeMatch:
-	    setting->defaultValue.value.asMatch = strdup ("");
+	    sPrivate->defaultValue.value.asMatch = strdup ("");
 	    break;
 	default:
 	    break;
@@ -2433,22 +2481,24 @@
     }
 #endif
 
-    addStringsFromPath (&plugin->providesFeature, "feature", node,
+    PLUGIN_PRIV (plugin);
+
+    addStringsFromPath (&pPrivate->providesFeature, "feature", node,
 			featureListPBv);
 
-    addStringsFromPath (&plugin->loadAfter,
+    addStringsFromPath (&pPrivate->loadAfter,
 			"deps/relation[@type = 'after']/plugin", node,
 			pluginAfterListPBv);
-    addStringsFromPath (&plugin->loadBefore,
+    addStringsFromPath (&pPrivate->loadBefore,
 			"deps/relation[@type = 'before']/plugin", node,
 			pluginBeforeListPBv);
-    addStringsFromPath (&plugin->requiresPlugin,
+    addStringsFromPath (&pPrivate->requiresPlugin,
 			"deps/requirement/plugin", node, requirePluginListPBv);
-    addStringsFromPath (&plugin->requiresFeature,
+    addStringsFromPath (&pPrivate->requiresFeature,
 			"deps/requirement/feature", node, requireFeatureListPBv);
-    addStringsFromPath (&plugin->conflictPlugin,
+    addStringsFromPath (&pPrivate->conflictPlugin,
 			"deps/conflict/plugin", node, conflictPluginListPBv);
-    addStringsFromPath (&plugin->conflictFeature,
+    addStringsFromPath (&pPrivate->conflictFeature,
 			"deps/conflict/feature", node, conflictFeatureListPBv);
 }
 
@@ -2459,10 +2509,10 @@
     if (!pluginInfoPB)
 	return;
 
-    pluginInfoPB->set_name (plugin->name);
-    pluginInfoPB->set_short_desc (plugin->shortDesc);
-    pluginInfoPB->set_long_desc (plugin->longDesc);
-    pluginInfoPB->set_category (plugin->category);
+    pluginInfoPB->set_name (ccsPluginGetName (plugin));
+    pluginInfoPB->set_short_desc (ccsPluginGetShortDesc (plugin));
+    pluginInfoPB->set_long_desc (ccsPluginGetLongDesc (plugin));
+    pluginInfoPB->set_category (ccsPluginGetCategory (plugin));
 }
 #endif
 
@@ -2477,6 +2527,8 @@
     CCSPlugin *plugin;
     CCSPluginPrivate *pPrivate;
 
+    CONTEXT_PRIV (context);
+
     if (!node)
 	return FALSE;
 
@@ -2503,10 +2555,12 @@
     }
 
     plugin = (CCSPlugin *) calloc (1, sizeof (CCSPlugin));
+
     if (!plugin)
 	return FALSE;
 
-    plugin->refCount = 1;
+    ccsObjectInit (plugin, &ccsDefaultObjectAllocator);
+    ccsPluginRef (plugin);
 
     pPrivate = (CCSPluginPrivate *) calloc (1, sizeof (CCSPluginPrivate));
     if (!pPrivate)
@@ -2515,7 +2569,8 @@
 	return FALSE;
     }
 
-    plugin->ccsPrivate = (void *) pPrivate;
+    ccsObjectSetPrivate (plugin, (CCSPrivate *) pPrivate);
+    ccsObjectAddInterface (plugin, (CCSInterface *) cPrivate->object_interfaces->pluginInterface, GET_INTERFACE_TYPE (CCSPluginInterface));
 
     if (file)
 	pPrivate->xmlFile = strdup (file);
@@ -2523,23 +2578,23 @@
     if (asprintf (&pPrivate->xmlPath, "/compiz/plugin[@name = '%s']", name) == -1)
 	pPrivate->xmlPath = NULL;
 
-    plugin->context = context;
-    plugin->name = strdup (name);
+    pPrivate->context = context;
+    pPrivate->name = strdup (name);
 
     if (!basicMetadata)
     {
-	plugin->shortDesc =
+	pPrivate->shortDesc =
 	    stringFromNodeDefTrans (node, "short/child::text()", name);
-	plugin->longDesc =
+	pPrivate->longDesc =
 	    stringFromNodeDefTrans (node, "long/child::text()",	name);
-	plugin->category =
+	pPrivate->category =
 	    stringFromNodeDef (node, "category/child::text()", "");
     }
     else
     {
-	plugin->shortDesc = strdup (name);
-	plugin->longDesc  = strdup (name);
-	plugin->category  = strdup ("");
+	pPrivate->shortDesc = strdup (name);
+	pPrivate->longDesc  = strdup (name);
+	pPrivate->category  = strdup ("");
     }
 #ifdef USE_PROTOBUF
     fillBasicInfoIntoPB (plugin, (PluginInfoMetadata *) pluginInfoPBv);
@@ -2547,7 +2602,7 @@
 
     initRulesFromRootNode (plugin, node, pluginInfoPBv);
 
-    context->plugins = ccsPluginListAppend (context->plugins, plugin);
+    cPrivate->plugins = ccsPluginListAppend (cPrivate->plugins, plugin);
     free (name);
 
     return TRUE;
@@ -2563,6 +2618,8 @@
     CCSPlugin *plugin;
     CCSPluginPrivate *pPrivate;
 
+    CONTEXT_PRIV (context);
+
     if (!node)
 	return FALSE;
 
@@ -2570,10 +2627,12 @@
 	return FALSE;
 
     plugin = (CCSPlugin *) calloc (1, sizeof (CCSPlugin));
+
     if (!plugin)
 	return FALSE;
 
-    plugin->refCount = 1;
+    ccsObjectInit (plugin, &ccsDefaultObjectAllocator);
+    ccsPluginRef (plugin);
 
     pPrivate = (CCSPluginPrivate *) calloc (1, sizeof (CCSPluginPrivate));
     if (!pPrivate)
@@ -2582,36 +2641,37 @@
 	return FALSE;
     }
 
-    plugin->ccsPrivate = (void *) pPrivate;
+    ccsObjectSetPrivate (plugin, (CCSPrivate *) pPrivate);
+    ccsObjectAddInterface (plugin, (CCSInterface *) cPrivate->object_interfaces->pluginInterface, GET_INTERFACE_TYPE (CCSPluginInterface));
 
     if (file)
 	pPrivate->xmlFile = strdup (file);
 
     pPrivate->xmlPath = strdup ("/compiz/plugin[@name='core']");
-    plugin->context = context;
-    plugin->name = strdup ("core");
-    plugin->category = strdup ("General");
+    pPrivate->context = context;
+    pPrivate->name = strdup ("core");
+    pPrivate->category = strdup ("General");
 
     if (!basicMetadata)
     {
-	plugin->shortDesc =
+	pPrivate->shortDesc =
 	    stringFromNodeDefTrans (node, "short/child::text()",
 				    "General Options");
-	plugin->longDesc =
+	pPrivate->longDesc =
 	    stringFromNodeDefTrans (node, "long/child::text()",
 				    "General Compiz Options");
     }
     else
     {
-	plugin->shortDesc = strdup ("General Options");
-	plugin->longDesc  = strdup ("General Compiz Options");
+	pPrivate->shortDesc = strdup ("General Options");
+	pPrivate->longDesc  = strdup ("General Compiz Options");
     }
 #ifdef USE_PROTOBUF
     fillBasicInfoIntoPB (plugin, (PluginInfoMetadata *) pluginInfoPBv);
 #endif
 
     initRulesFromRootNode (plugin, node, pluginInfoPBv);
-    context->plugins = ccsPluginListAppend (context->plugins, plugin);
+    cPrivate->plugins = ccsPluginListAppend (cPrivate->plugins, plugin);
 
     return TRUE;
 }
@@ -2916,6 +2976,8 @@
     CCSPlugin *plugin;
     CCSPluginPrivate *pPrivate;
 
+    CONTEXT_PRIV (context);
+
     if (ccsFindPlugin (context, name))
 	return;
 
@@ -2924,10 +2986,12 @@
 	return;
 
     plugin = (CCSPlugin *) calloc (1, sizeof (CCSPlugin));
+
     if (!plugin)
 	return;
 
-    plugin->refCount = 1;
+    ccsObjectInit (plugin, &ccsDefaultObjectAllocator);
+    ccsPluginRef (plugin);
 
     pPrivate = (CCSPluginPrivate *) calloc (1, sizeof (CCSPluginPrivate));
     if (!pPrivate)
@@ -2936,21 +3000,22 @@
 	return;
     }
 
-    plugin->ccsPrivate = (void *) pPrivate;
-
-    plugin->context = context;
-    plugin->name = strdup (name);
-
-    if (!plugin->shortDesc)
-	plugin->shortDesc = strdup (name);
-    if (!plugin->longDesc)
-	plugin->longDesc = strdup (name);
-    if (!plugin->category)
-	plugin->category = strdup ("");
+    ccsObjectSetPrivate (plugin, (CCSPrivate *) pPrivate);
+    ccsObjectAddInterface (plugin, (CCSInterface *) cPrivate->object_interfaces->pluginInterface, GET_INTERFACE_TYPE (CCSPluginInterface));
+
+    pPrivate->context = context;
+    pPrivate->name = strdup (name);
+
+    if (!pPrivate->shortDesc)
+	pPrivate->shortDesc = strdup (name);
+    if (!pPrivate->longDesc)
+	pPrivate->longDesc = strdup (name);
+    if (!pPrivate->category)
+	pPrivate->category = strdup ("");
 
     pPrivate->loaded = TRUE;
     collateGroups (pPrivate);
-    context->plugins = ccsPluginListAppend (context->plugins, plugin);
+    cPrivate->plugins = ccsPluginListAppend (cPrivate->plugins, plugin);
 }
 
 static void
@@ -2998,7 +3063,7 @@
 #endif
 
 Bool
-ccsLoadPlugin (CCSContext * context, char *name)
+ccsLoadPluginDefault (CCSContext * context, char *name)
 {
 #ifdef USE_PROTOBUF
     initPBLoading ();
@@ -3031,8 +3096,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");
 
@@ -3085,6 +3156,12 @@
     loadPluginsFromName (context, (char *)PLUGINDIR);
 }
 
+void
+ccsLoadPlugins (CCSContext *context)
+{
+    (*(GET_INTERFACE (CCSContextInterface, context))->contextLoadPlugins) (context);
+}
+
 static void
 loadOptionsStringExtensionsFromXML (CCSPlugin * plugin,
 				    void * pluginPBv,
@@ -3135,7 +3212,7 @@
 	return;
 
     pPrivate->loaded = TRUE;
-    D (D_FULL, "Initializing %s options...", plugin->name);
+    D (D_FULL, "Initializing %s options...", pPrivate->name);
 
 #ifdef USE_PROTOBUF
     if (usingProtobuf && pPrivate->pbFilePath)

=== modified file 'compizconfig/libcompizconfig/src/ini.c'
--- compizconfig/libcompizconfig/src/ini.c	2012-05-21 09:36:37 +0000
+++ compizconfig/libcompizconfig/src/ini.c	2012-06-27 07:01:20 +0000
@@ -382,7 +382,7 @@
     }
 
     token = strsep (&valueString, ";");
-    switch (parent->info.forList.listType)
+    switch (ccsSettingGetInfo (parent)->forList.listType)
     {
     case TypeString:
     case TypeMatch:

=== modified file 'compizconfig/libcompizconfig/src/main.c'
--- compizconfig/libcompizconfig/src/main.c	2012-05-23 08:15:54 +0000
+++ compizconfig/libcompizconfig/src/main.c	2012-06-27 07:01:20 +0000
@@ -39,6 +39,199 @@
 #include "ccs-private.h"
 #include "iniparser.h"
 
+static void * wrapRealloc (void *o, void *a , size_t b)
+{
+    return realloc (a, b);
+}
+
+static void * wrapMalloc (void *o, size_t a)
+{
+    return malloc (a);
+}
+
+static void * wrapCalloc (void *o, size_t a, size_t b)
+{
+    return calloc (a, b);
+}
+
+static void wrapFree (void *o, void *a)
+{
+    free (a);
+}
+
+CCSObjectAllocationInterface ccsDefaultObjectAllocator =
+{
+    wrapRealloc,
+    wrapMalloc,
+    wrapCalloc,
+    wrapFree,
+    NULL
+};
+
+/* CCSObject stuff */
+Bool
+ccsObjectInit_(CCSObject *object, CCSObjectAllocationInterface *object_allocation)
+{
+    object->priv = NULL;
+    object->n_interfaces = 0;
+    object->n_allocated_interfaces = 0;
+    object->interfaces = NULL;
+    object->interface_types = NULL;
+    object->object_allocation = object_allocation;
+    object->refcnt = 0;
+
+    return TRUE;
+}
+
+Bool
+ccsObjectAddInterface_(CCSObject *object, const CCSInterface *interface, int interface_type)
+{
+    object->n_interfaces++;
+
+    if (object->n_allocated_interfaces < object->n_interfaces)
+    {
+	unsigned int old_allocated_interfaces = object->n_allocated_interfaces;
+	object->n_allocated_interfaces = object->n_interfaces;
+	CCSInterface **ifaces = (*object->object_allocation->realloc_) (object->object_allocation->allocator, object->interfaces, object->n_allocated_interfaces * sizeof (CCSInterface *));
+	int          *iface_types = (*object->object_allocation->realloc_) (object->object_allocation->allocator, object->interface_types, object->n_allocated_interfaces * sizeof (int));
+
+	if (!ifaces || !iface_types)
+	{
+	    if (ifaces)
+		(*object->object_allocation->free_) (object->object_allocation->allocator, ifaces);
+
+	    if (iface_types)
+		(*object->object_allocation->free_) (object->object_allocation->allocator, iface_types);
+
+	    object->n_interfaces--;
+	    object->n_allocated_interfaces = old_allocated_interfaces;
+	    return FALSE;
+	}
+	else
+	{
+	    object->interfaces = (const CCSInterface **) ifaces;
+	    object->interface_types = iface_types;
+	}
+    }
+
+    object->interfaces[object->n_interfaces - 1] = interface;
+    object->interface_types[object->n_interfaces - 1] = interface_type;
+
+    return TRUE;
+}
+
+Bool
+ccsObjectRemoveInterface_(CCSObject *object, int interface_type)
+{
+    unsigned int i = 0;
+
+    if (!object->n_interfaces)
+	return FALSE;
+
+    const CCSInterface **o = object->interfaces;
+    int        *type = object->interface_types;
+
+    for (; i < object->n_interfaces; i++, o++, type++)
+    {
+	if (object->interface_types[i] == interface_type)
+	    break;
+    }
+
+    if (i >= object->n_interfaces)
+	return FALSE;
+
+    /* Now clear this section and move everything back */
+    object->interfaces[i] = NULL;
+
+    i++;
+
+    const CCSInterface **oLast = o;
+    int *typeLast = type;
+
+    o++;
+    type++;
+
+    memmove ((void *) oLast, (void *)o, (object->n_interfaces - i) * sizeof (CCSInterface *));
+    memmove ((void *) typeLast, (void *) type, (object->n_interfaces - i) * sizeof (int));
+
+    object->n_interfaces--;
+
+    if (!object->n_interfaces)
+    {
+	free (object->interfaces);
+	free (object->interface_types);
+	object->interfaces = NULL;
+	object->interface_types = NULL;
+	object->n_allocated_interfaces = 0;
+    }
+
+    return TRUE;
+}
+
+const CCSInterface *
+ccsObjectGetInterface_(CCSObject *object, int interface_type)
+{
+    unsigned int i = 0;
+
+    for (; i < object->n_interfaces; i++)
+    {
+	if (object->interface_types[i] == interface_type)
+	    return object->interfaces[i];
+    }
+
+    return NULL;
+}
+
+CCSPrivate *
+ccsObjectGetPrivate_(CCSObject *object)
+{
+    return object->priv;
+}
+
+void
+ccsObjectSetPrivate_(CCSObject *object, CCSPrivate *priv)
+{
+    object->priv = priv;
+}
+
+void
+ccsObjectFinalize_(CCSObject *object)
+{
+    if (object->priv)
+    {
+	(*object->object_allocation->free_) (object->object_allocation->allocator, object->priv);
+	object->priv = NULL;
+    }
+
+    if (object->interfaces)
+    {
+	(*object->object_allocation->free_) (object->object_allocation->allocator, object->interfaces);
+	object->interfaces = NULL;
+    }
+
+    if (object->interface_types)
+    {
+	(*object->object_allocation->free_) (object->object_allocation->allocator, object->interface_types);
+	object->interface_types = NULL;
+    }
+
+    object->n_interfaces = 0;
+}
+
+unsigned int
+ccsAllocateType ()
+{
+    static unsigned int start = 0;
+
+    start++;
+
+    return start;
+}
+
+INTERFACE_TYPE (CCSContextInterface)
+INTERFACE_TYPE (CCSPluginInterface)
+INTERFACE_TYPE (CCSSettingInterface)
+
 Bool basicMetadata = FALSE;
 
 void
@@ -95,24 +288,32 @@
 }
 
 CCSContext *
-ccsEmptyContextNew (unsigned int screenNum)
+ccsEmptyContextNew (unsigned int screenNum, const CCSInterfaceTable *object_interfaces)
 {
     CCSContext *context;
 
     context = calloc (1, sizeof (CCSContext));
+
     if (!context)
 	return NULL;
 
-    context->ccsPrivate = calloc (1, sizeof (CCSContextPrivate));
-    if (!context->ccsPrivate)
+    ccsObjectInit (context, &ccsDefaultObjectAllocator);
+
+    CCSContextPrivate *ccsPrivate = calloc (1, sizeof (CCSContextPrivate));
+    if (!ccsPrivate)
     {
 	free (context);
 	return NULL;
     }
 
+    ccsObjectSetPrivate (context, (CCSPrivate *) ccsPrivate);
+
     CONTEXT_PRIV (context);
 
-    context->screenNum = screenNum;
+    cPrivate->object_interfaces = object_interfaces;
+    cPrivate->screenNum = screenNum;
+
+    ccsObjectAddInterface (context, (CCSInterface *) object_interfaces->contextInterface, GET_INTERFACE_TYPE (CCSContextInterface));
 
     initGeneralOptions (context);
     cPrivate->configWatchId = ccsAddConfigWatch (context, configChangeNotify);
@@ -127,13 +328,167 @@
     return context;
 }
 
+static void *
+ccsContextGetPrivatePtrDefault (CCSContext *context)
+{
+    CONTEXT_PRIV (context);
+
+    return cPrivate->privatePtr;
+}
+
+static void
+ccsContextSetPrivatePtrDefault (CCSContext *context, void *ptr)
+{
+    CONTEXT_PRIV (context);
+
+    cPrivate->privatePtr = ptr;
+}
+
+static CCSPluginList
+ccsContextGetPluginsDefault (CCSContext *context)
+{
+    CONTEXT_PRIV (context);
+
+    return cPrivate->plugins;
+}
+
+static CCSPluginCategory *
+ccsContextGetCategoriesDefault (CCSContext *context)
+{
+    CONTEXT_PRIV (context);
+
+    return cPrivate->categories;
+}
+
+static CCSSettingList
+ccsContextGetChangedSettingsDefault (CCSContext *context)
+{
+    CONTEXT_PRIV (context);
+
+    return cPrivate->changedSettings;
+}
+
+static unsigned int
+ccsContextGetScreenNumDefault (CCSContext *context)
+{
+    CONTEXT_PRIV (context);
+
+    return cPrivate->screenNum;
+}
+
+static Bool
+ccsContextAddChangedSettingDefault (CCSContext *context, CCSSetting *setting)
+{
+    CONTEXT_PRIV (context);
+
+    cPrivate->changedSettings = ccsSettingListAppend (cPrivate->changedSettings, setting);
+
+    return TRUE;
+}
+
+static Bool
+ccsContextClearChangedSettingsDefault (CCSContext *context)
+{
+    CONTEXT_PRIV (context);
+
+    cPrivate->changedSettings = ccsSettingListFree (cPrivate->changedSettings, FALSE);
+
+    return TRUE;
+}
+
+static CCSSettingList
+ccsContextStealChangedSettingsDefault (CCSContext *context)
+{
+    CONTEXT_PRIV (context);
+
+    CCSSettingList l = cPrivate->changedSettings;
+
+    cPrivate->changedSettings = NULL;
+    return l;
+}
+
+CCSPluginList
+ccsContextGetPlugins (CCSContext *context)
+{
+    return (*(GET_INTERFACE (CCSContextInterface, context))->contextGetPlugins) (context);
+}
+
+CCSPluginCategory *
+ccsContextGetCategories (CCSContext *context)
+{
+    return (*(GET_INTERFACE (CCSContextInterface, context))->contextGetCategories) (context);
+}
+
+CCSSettingList
+ccsContextGetChangedSettings (CCSContext *context)
+{
+    return (*(GET_INTERFACE (CCSContextInterface, context))->contextGetChangedSettings) (context);
+}
+
+unsigned int
+ccsContextGetScreenNum (CCSContext *context)
+{
+    return (*(GET_INTERFACE (CCSContextInterface, context))->contextGetScreenNum) (context);
+}
+
+Bool
+ccsContextAddChangedSetting (CCSContext *context, CCSSetting *setting)
+{
+    return (*(GET_INTERFACE (CCSContextInterface, context))->contextAddChangedSetting) (context, setting);
+}
+
+Bool
+ccsContextClearChangedSettings (CCSContext *context)
+{
+    return (*(GET_INTERFACE (CCSContextInterface, context))->contextClearChangedSettings) (context);
+}
+
+CCSSettingList
+ccsContextStealChangedSettings (CCSContext *context)
+{
+    return (*(GET_INTERFACE (CCSContextInterface, context))->contextStealChangedSettings) (context);
+}
+
+void *
+ccsContextGetPrivatePtr (CCSContext *context)
+{
+    return (*(GET_INTERFACE (CCSContextInterface, context))->contextGetPrivatePtr) (context);
+}
+
+void
+ccsContextSetPrivatePtr (CCSContext *context, void *ptr)
+{
+    (*(GET_INTERFACE (CCSContextInterface, context))->contextSetPrivatePtr) (context, ptr);
+}
+
+void *
+ccsContextGetPluginsBindable (CCSContext *context)
+{
+    return (void *) ccsContextGetPlugins (context);
+}
+
+void *
+ccsContextStealChangedSettingsBindable (CCSContext *context)
+{
+    return (void *) ccsContextStealChangedSettings (context);
+}
+
+void *
+ccsContextGetChangedSettingsBindable (CCSContext *context)
+{
+    return (void *) ccsContextGetChangedSettings (context);
+}
+
+
 static void
 ccsSetActivePluginList (CCSContext * context, CCSStringList list)
 {
     CCSPluginList l;
     CCSPlugin     *plugin;
 
-    for (l = context->plugins; l; l = l->next)
+    CONTEXT_PRIV (context);
+
+    for (l = cPrivate->plugins; l; l = l->next)
     {
 	PLUGIN_PRIV (l->data);
 	pPrivate->active = FALSE;
@@ -160,10 +515,10 @@
 }
 
 CCSContext *
-ccsContextNew (unsigned int screenNum)
+ccsContextNew (unsigned int screenNum, const CCSInterfaceTable *iface)
 {
     CCSPlugin  *p;
-    CCSContext *context = ccsEmptyContextNew (screenNum);
+    CCSContext *context = ccsEmptyContextNew (screenNum, iface);
     if (!context)
 	return NULL;
 
@@ -197,15 +552,17 @@
 }
 
 CCSPlugin *
-ccsFindPlugin (CCSContext * context, const char *name)
+ccsFindPluginDefault (CCSContext * context, const char *name)
 {
     if (!name)
 	name = "";
 
-    CCSPluginList l = context->plugins;
+    CONTEXT_PRIV (context);
+
+    CCSPluginList l = cPrivate->plugins;
     while (l)
     {
-	if (!strcmp (l->data->name, name))
+	if (!strcmp (ccsPluginGetName (l->data), name))
 	    return l->data;
 
 	l = l->next;
@@ -214,8 +571,14 @@
     return NULL;
 }
 
+CCSPlugin *
+ccsFindPlugin (CCSContext *context, const char *name)
+{
+    return (*(GET_INTERFACE (CCSContextInterface, context))->contextFindPlugin) (context, name);
+}
+
 CCSSetting *
-ccsFindSetting (CCSPlugin * plugin, const char *name)
+ccsFindSettingDefault (CCSPlugin * plugin, const char *name)
 {
     if (!plugin)
 	return NULL;
@@ -232,7 +595,7 @@
 
     while (l)
     {
-	if (!strcmp (l->data->name, name))
+	if (!strcmp (ccsSettingGetName (l->data), name))
 	    return l->data;
 
 	l = l->next;
@@ -241,8 +604,17 @@
     return NULL;
 }
 
+CCSSetting *
+ccsFindSetting (CCSPlugin *plugin, const char *name)
+{
+    if (!plugin)
+	return NULL;
+
+    return (*(GET_INTERFACE (CCSPluginInterface, plugin))->pluginFindSetting) (plugin, name);
+}
+
 Bool
-ccsPluginIsActive (CCSContext * context, char *name)
+ccsPluginIsActiveDefault (CCSContext * context, char *name)
 {
     CCSPlugin *plugin;
 
@@ -255,6 +627,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)
@@ -264,7 +642,7 @@
 
     while (l)
     {
-	if (!strcmp (l->data->name, setting->subGroup))
+	if (!strcmp (l->data->name, ccsSettingGetSubGroup (setting)))
 	{
 	    l->data->settings = ccsSettingListAppend (l->data->settings,
 						      setting);
@@ -279,7 +657,7 @@
     if (subGroup)
     {
 	group->subGroups = ccsSubGroupListAppend (group->subGroups, subGroup);
-	subGroup->name = strdup (setting->subGroup);
+	subGroup->name = strdup (ccsSettingGetSubGroup (setting));
 	subGroup->settings = ccsSettingListAppend (subGroup->settings, setting);
     }
 }
@@ -292,7 +670,7 @@
 
     while (l)
     {
-	if (!strcmp (l->data->name, setting->group))
+	if (!strcmp (l->data->name, ccsSettingGetGroup (setting)))
 	{
 	    subGroupAdd (setting, l->data);
 	    return;
@@ -306,7 +684,7 @@
     {
 	group->refCount = 1;
     	p->groups = ccsGroupListAppend (p->groups, group);
-	group->name = strdup (setting->group);
+	group->name = strdup (ccsSettingGetGroup (setting));
 	subGroupAdd (setting, group);
     }
 }
@@ -337,14 +715,12 @@
     if (cPrivate->configWatchId)
 	ccsRemoveFileWatch (cPrivate->configWatchId);
 
-    if (c->changedSettings)
-	ccsSettingListFree (c->changedSettings, FALSE);
-
-    if (c->ccsPrivate)
-	free (c->ccsPrivate);
-
-    ccsPluginListFree (c->plugins, TRUE);
-
+    if (cPrivate->changedSettings)
+	cPrivate->changedSettings = ccsSettingListFree (cPrivate->changedSettings, FALSE);
+
+    ccsPluginListFree (cPrivate->plugins, TRUE);
+
+    ccsObjectFinalize (c);
     free (c);
 }
 
@@ -354,22 +730,22 @@
     if (!p)
 	return;
 
-    free (p->name);
-    free (p->shortDesc);
-    free (p->longDesc);
-    free (p->hints);
-    free (p->category);
-
-    ccsStringListFree (p->loadAfter, TRUE);
-    ccsStringListFree (p->loadBefore, TRUE);
-    ccsStringListFree (p->requiresPlugin, TRUE);
-    ccsStringListFree (p->conflictPlugin, TRUE);
-    ccsStringListFree (p->conflictFeature, TRUE);
-    ccsStringListFree (p->providesFeature, TRUE);
-    ccsStringListFree (p->requiresFeature, TRUE);
-
     PLUGIN_PRIV (p);
 
+    free (pPrivate->name);
+    free (pPrivate->shortDesc);
+    free (pPrivate->longDesc);
+    free (pPrivate->hints);
+    free (pPrivate->category);
+
+    ccsStringListFree (pPrivate->loadAfter, TRUE);
+    ccsStringListFree (pPrivate->loadBefore, TRUE);
+    ccsStringListFree (pPrivate->requiresPlugin, TRUE);
+    ccsStringListFree (pPrivate->conflictPlugin, TRUE);
+    ccsStringListFree (pPrivate->conflictFeature, TRUE);
+    ccsStringListFree (pPrivate->providesFeature, TRUE);
+    ccsStringListFree (pPrivate->requiresFeature, TRUE);
+
     ccsSettingListFree (pPrivate->settings, TRUE);
     ccsGroupListFree (pPrivate->groups, TRUE);
     ccsStrExtensionListFree (pPrivate->stringExtensions, TRUE);
@@ -385,7 +761,7 @@
 	free (pPrivate->pbFilePath);
 #endif
 
-    free (pPrivate);
+    ccsObjectFinalize (p);
     free (p);
 }
 
@@ -395,38 +771,42 @@
     if (!s)
 	return;
 
-    free (s->name);
-    free (s->shortDesc);
-    free (s->longDesc);
-    free (s->group);
-    free (s->subGroup);
-    free (s->hints);
-
-    switch (s->type)
+    SETTING_PRIV (s);
+
+    free (sPrivate->name);
+    free (sPrivate->shortDesc);
+    free (sPrivate->longDesc);
+    free (sPrivate->group);
+    free (sPrivate->subGroup);
+    free (sPrivate->hints);
+
+    switch (sPrivate->type)
     {
     case TypeInt:
-	ccsIntDescListFree (s->info.forInt.desc, TRUE);
+	ccsIntDescListFree (sPrivate->info.forInt.desc, TRUE);
 	break;
     case TypeString:
-	ccsStrRestrictionListFree (s->info.forString.restriction, TRUE);
+	ccsStrRestrictionListFree (sPrivate->info.forString.restriction, TRUE);
 	break;
     case TypeList:
-	if (s->info.forList.listType == TypeInt)
-	    ccsIntDescListFree (s->info.forList.listInfo->
+	if (sPrivate->info.forList.listType == TypeInt)
+	    ccsIntDescListFree (sPrivate->info.forList.listInfo->
 				forInt.desc, TRUE);
-	free (s->info.forList.listInfo);
-	//ccsSettingValueListFree (s->value->value.asList, TRUE);
+	free (sPrivate->info.forList.listInfo);
+	//ccsSettingValueListFree (sPrivate->value->value.asList, TRUE);
 	break;
     default:
 	break;
     }
 
-    if (&s->defaultValue != s->value)
+    if (&sPrivate->defaultValue != sPrivate->value)
     {
-	ccsFreeSettingValue (s->value);
+	ccsFreeSettingValue (sPrivate->value);
     }
 
-    ccsFreeSettingValue (&s->defaultValue);
+    ccsFreeSettingValue (&sPrivate->defaultValue);
+
+    ccsObjectFinalize (s);
     free (s);
 }
 
@@ -461,10 +841,10 @@
     if (!v->parent)
 	return;
 
-    CCSSettingType type = v->parent->type;
+    CCSSettingType type = ccsSettingGetType (v->parent);
 
     if (v->isListChild)
-	type = v->parent->info.forList.listType;
+	type = ccsSettingGetInfo (v->parent)->forList.listType;
 
     switch (type)
     {
@@ -482,7 +862,7 @@
 	break;
     }
 
-    if (v != &v->parent->defaultValue)
+    if (v != ccsSettingGetDefaultValue (v->parent))
 	free (v);
 }
 
@@ -580,8 +960,7 @@
 		ccsFree##type (d); \
 	} \
 
-CCSREF (Plugin, CCSPlugin)
-CCSREF (Setting, CCSSetting)
+
 CCSREF (String, CCSString)
 CCSREF (Group, CCSGroup)
 CCSREF (SubGroup, CCSSubGroup)
@@ -592,6 +971,20 @@
 CCSREF (StrRestriction, CCSStrRestriction)
 CCSREF (StrExtension, CCSStrExtension)
 
+#define CCSREF_OBJ(type,dtype) \
+    void ccs##type##Ref (dtype *d) \
+    { \
+	ccsObjectRef (d); \
+    } \
+    \
+    void ccs##type##Unref (dtype *d) \
+    { \
+	ccsObjectUnref (d, ccsFree##type); \
+    } \
+
+CCSREF_OBJ (Plugin, CCSPlugin)
+CCSREF_OBJ (Setting, CCSSetting)
+
 static void *
 openBackend (char *backend)
 {
@@ -646,7 +1039,7 @@
 }
 
 Bool
-ccsSetBackend (CCSContext * context, char *name)
+ccsSetBackendDefault (CCSContext * context, char *name)
 {
     Bool fallbackMode = FALSE;
     CONTEXT_PRIV (context);
@@ -711,6 +1104,11 @@
     return TRUE;
 }
 
+Bool
+ccsSetBackend (CCSContext *context, char *name)
+{
+    return (*(GET_INTERFACE (CCSContextInterface, context))->contextSetBackend) (context, name);
+}
 
 static Bool
 ccsCompareLists (CCSSettingValueList l1, CCSSettingValueList l2,
@@ -869,10 +1267,10 @@
 copyValue (CCSSettingValue * from, CCSSettingValue * to)
 {
     memcpy (to, from, sizeof (CCSSettingValue));
-    CCSSettingType type = from->parent->type;
+    CCSSettingType type = ccsSettingGetType (from->parent);
 
     if (from->isListChild)
-	type = from->parent->info.forList.listType;
+	type = ccsSettingGetInfo (from->parent)->forList.listType;
 
     switch (type)
     {
@@ -903,43 +1301,54 @@
     }
 }
 
+/* TODO: CCSSetting is not meant to be copyable ... remove */
 static void
 copySetting (CCSSetting *from, CCSSetting *to)
-{    
+{
     memcpy (to, from, sizeof (CCSSetting));
 
-    if (from->name)
-	to->name = strdup (from->name);
-    if (from->shortDesc)
-	to->shortDesc = strdup (from->shortDesc);
-    if (from->longDesc)
-	to->longDesc = strdup (from->longDesc);
-    if (from->group)
-	to->group = strdup (from->group);
-    if (from->subGroup)
-	to->subGroup = strdup (from->subGroup);
-    if (from->hints)
-	to->hints = strdup (from->hints);
-    if (from->value)
+    ccsObjectInit (from, &ccsDefaultObjectAllocator);
+
+    /* Allocate a new private ptr for the new setting */
+    CCSSettingPrivate *ccsPrivate = calloc (1, sizeof (CCSSettingPrivate));
+
+    ccsObjectSetPrivate (to, (CCSPrivate *) ccsPrivate);
+
+    CCSSettingPrivate *fromPrivate = (CCSSettingPrivate *) ccsObjectGetPrivate (from);
+    CCSSettingPrivate *toPrivate = (CCSSettingPrivate *) ccsObjectGetPrivate (to);
+
+    if (fromPrivate->name)
+	toPrivate->name = strdup (fromPrivate->name);
+    if (fromPrivate->shortDesc)
+	toPrivate->shortDesc = strdup (fromPrivate->shortDesc);
+    if (fromPrivate->longDesc)
+	toPrivate->longDesc = strdup (fromPrivate->longDesc);
+    if (fromPrivate->group)
+	toPrivate->group = strdup (fromPrivate->group);
+    if (fromPrivate->subGroup)
+	toPrivate->subGroup = strdup (fromPrivate->subGroup);
+    if (fromPrivate->hints)
+	toPrivate->hints = strdup (fromPrivate->hints);
+    if (fromPrivate->value)
     {
-	to->value = malloc (sizeof (CCSSettingValue));
+	toPrivate->value = malloc (sizeof (CCSSettingValue));
 	
-	if (!from->value)
+	if (!fromPrivate->value)
 	    return;
 
-	copyValue (from->value, to->value);
+	copyValue (fromPrivate->value, toPrivate->value);
 
-	to->value->refCount = 1;	
-	to->value->parent = to;
+	toPrivate->value->refCount = 1;
+	toPrivate->value->parent = to;
     }
 
-    copyValue (&from->defaultValue, &to->defaultValue);
-    copyInfo (&from->info, &to->info, from->type);
+    copyValue (&fromPrivate->defaultValue, &toPrivate->defaultValue);
+    copyInfo (&fromPrivate->info, &toPrivate->info, fromPrivate->type);
 
-    to->defaultValue.parent = to;
-    to->privatePtr = NULL;
+    toPrivate->defaultValue.parent = to;
+    toPrivate->privatePtr = NULL;
     
-    to->refCount = 1;
+    (to)->object.refcnt = 1;
 }
 
 static void
@@ -947,39 +1356,41 @@
 {
     CCSSettingValue *value;
 
-    if (setting->value != &setting->defaultValue)
-	ccsFreeSettingValue (setting->value);
+    SETTING_PRIV (setting);
+
+    if (sPrivate->value != &sPrivate->defaultValue)
+	ccsFreeSettingValue (sPrivate->value);
 
     value = calloc (1, sizeof (CCSSettingValue));
     if (!value)
     {
-	setting->value = &setting->defaultValue;
-	setting->isDefault = TRUE;
+	sPrivate->value = &sPrivate->defaultValue;
+	sPrivate->isDefault = TRUE;
 	return;
     }
     
     value->refCount = 1;
 
-    copyValue (&setting->defaultValue, value);
-    setting->value = value;
-    setting->isDefault = FALSE;
+    copyValue (&sPrivate->defaultValue, value);
+    sPrivate->value = value;
+    sPrivate->isDefault = FALSE;
 }
 
 void
-ccsResetToDefault (CCSSetting * setting, Bool processChanged)
+ccsSettingResetToDefaultDefault (CCSSetting * setting, Bool processChanged)
 {
-    if (setting->value != &setting->defaultValue)
+    SETTING_PRIV (setting)
+
+    if (sPrivate->value != &sPrivate->defaultValue)
     {
-	ccsFreeSettingValue (setting->value);
+	ccsFreeSettingValue (sPrivate->value);
 
 	if (processChanged)
-	    setting->parent->context->changedSettings =
-		ccsSettingListAppend (setting->parent->context->changedSettings,
-				       setting);
+	    ccsContextAddChangedSetting (ccsPluginGetContext (sPrivate->parent), setting);
     }
 
-    setting->value = &setting->defaultValue;
-    setting->isDefault = TRUE;
+    sPrivate->value = &sPrivate->defaultValue;
+    sPrivate->isDefault = TRUE;
 }
 
 Bool
@@ -987,16 +1398,16 @@
 {
     CCSSettingType type;
 
-    if (rhs->parent->type != lhs->parent->type)
+    if (ccsSettingGetType (rhs->parent) != ccsSettingGetType (lhs->parent))
     {
 	D (D_FULL, "[WARNING] Attempted to check equality between mismatched types!\n");
 	return FALSE;
     }
 
     if (rhs->isListChild)
-	type = rhs->parent->info.forList.listType;
+	type = ccsSettingGetInfo (rhs->parent)->forList.listType;
     else
-	type = rhs->parent->type;
+	type = ccsSettingGetType (rhs->parent);
     
     switch (type)
     {
@@ -1026,62 +1437,67 @@
 	case TypeList:
 	{
 	    return ccsCompareLists (lhs->value.asList, rhs->value.asList,
-				    lhs->parent->info.forList);
+				    ccsSettingGetInfo (lhs->parent)->forList);
 	
 	}
 	default:
 	    break;
     }
     
-    D (D_FULL, "[WARNING] Failed to process type %i\n", lhs->parent->type);
+    D (D_FULL, "[WARNING] Failed to process type %i\n", ccsSettingGetType (lhs->parent));
     return FALSE;
 }
 
+/* FIXME: That's a lot of code for the sake of type switching ...
+ * 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)
 {
-    if (setting->type != TypeInt)
+    SETTING_PRIV (setting)
+
+    if (sPrivate->type != TypeInt)
 	return FALSE;
 
-    if (setting->isDefault && (setting->defaultValue.value.asInt == data))
+    if (sPrivate->isDefault && (sPrivate->defaultValue.value.asInt == data))
 	return TRUE;
 
-    if (!setting->isDefault && (setting->defaultValue.value.asInt == data))
+    if (!sPrivate->isDefault && (sPrivate->defaultValue.value.asInt == data))
     {
 	ccsResetToDefault (setting, processChanged);
 	return TRUE;
     }
 
-    if (setting->value->value.asInt == data)
+    if (sPrivate->value->value.asInt == data)
 	return TRUE;
 
-    if ((data < setting->info.forInt.min) ||
-	 (data > setting->info.forInt.max))
+    if ((data < sPrivate->info.forInt.min) ||
+	 (data > sPrivate->info.forInt.max))
 	return FALSE;
 
-    if (setting->isDefault)
+    if (sPrivate->isDefault)
 	copyFromDefault (setting);
 
-    setting->value->value.asInt = data;
+    sPrivate->value->value.asInt = data;
 
     if (processChanged)
-	setting->parent->context->changedSettings =
-	    ccsSettingListAppend (setting->parent->context->changedSettings,
-				  setting);
+	ccsContextAddChangedSetting (ccsPluginGetContext (sPrivate->parent), setting);
 
     return TRUE;
 }
 
 Bool
-ccsSetFloat (CCSSetting * setting, float data, Bool processChanged)
+ccsSettingSetFloatDefault (CCSSetting * setting, float data, Bool processChanged)
 {
-    if (setting->type != TypeFloat)
+    SETTING_PRIV (setting);
+
+    if (sPrivate->type != TypeFloat)
 	return FALSE;
 
-    if (setting->isDefault && (setting->defaultValue.value.asFloat == data))
+    if (sPrivate->isDefault && (sPrivate->defaultValue.value.asFloat == data))
 	return TRUE;
 
-    if (!setting->isDefault && (setting->defaultValue.value.asFloat == data))
+    if (!sPrivate->isDefault && (sPrivate->defaultValue.value.asFloat == data))
     {
 	ccsResetToDefault (setting, processChanged);
 	return TRUE;
@@ -1089,308 +1505,306 @@
 
     /* allow the values to differ a tiny bit because of
        possible rounding / precision issues */
-    if (fabs (setting->value->value.asFloat - data) < 1e-5)
+    if (fabs (sPrivate->value->value.asFloat - data) < 1e-5)
 	return TRUE;
 
-    if ((data < setting->info.forFloat.min) ||
-	 (data > setting->info.forFloat.max))
+    if ((data < sPrivate->info.forFloat.min) ||
+	 (data > sPrivate->info.forFloat.max))
 	return FALSE;
 
-    if (setting->isDefault)
+    if (sPrivate->isDefault)
 	copyFromDefault (setting);
 
-    setting->value->value.asFloat = data;
+    sPrivate->value->value.asFloat = data;
 
     if (processChanged)
-	setting->parent->context->changedSettings =
-	    ccsSettingListAppend (setting->parent->context->changedSettings,
-				  setting);
+	ccsContextAddChangedSetting (ccsPluginGetContext (sPrivate->parent), setting);
 
     return TRUE;
 }
 
 Bool
-ccsSetBool (CCSSetting * setting, Bool data, Bool processChanged)
+ccsSettingSetBoolDefault (CCSSetting * setting, Bool data, Bool processChanged)
 {
-    if (setting->type != TypeBool)
+    SETTING_PRIV (setting)
+
+    if (sPrivate->type != TypeBool)
 	return FALSE;
 
-    if (setting->isDefault
-	&& ((setting->defaultValue.value.asBool && data)
-	     || (!setting->defaultValue.value.asBool && !data)))
+    if (sPrivate->isDefault
+	&& ((sPrivate->defaultValue.value.asBool && data)
+	     || (!sPrivate->defaultValue.value.asBool && !data)))
 	return TRUE;
 
-    if (!setting->isDefault
-	&& ((setting->defaultValue.value.asBool && data)
-	     || (!setting->defaultValue.value.asBool && !data)))
+    if (!sPrivate->isDefault
+	&& ((sPrivate->defaultValue.value.asBool && data)
+	     || (!sPrivate->defaultValue.value.asBool && !data)))
     {
 	ccsResetToDefault (setting, processChanged);
 	return TRUE;
     }
 
-    if ((setting->value->value.asBool && data)
-	 || (!setting->value->value.asBool && !data))
+    if ((sPrivate->value->value.asBool && data)
+	 || (!sPrivate->value->value.asBool && !data))
 	return TRUE;
 
-    if (setting->isDefault)
+    if (sPrivate->isDefault)
 	copyFromDefault (setting);
 
-    setting->value->value.asBool = data;
+    sPrivate->value->value.asBool = data;
 
     if (processChanged)
-	setting->parent->context->changedSettings =
-	    ccsSettingListAppend (setting->parent->context->changedSettings,
-				  setting);
+	ccsContextAddChangedSetting (ccsPluginGetContext (sPrivate->parent), setting);
 
     return TRUE;
 }
 
 Bool
-ccsSetString (CCSSetting * setting, const char *data, Bool processChanged)
+ccsSettingSetStringDefault (CCSSetting * setting, const char *data, Bool processChanged)
 {
-    if (setting->type != TypeString)
+    SETTING_PRIV (setting);
+
+    if (sPrivate->type != TypeString)
 	return FALSE;
 
     if (!data)
 	return FALSE;
 
-    Bool isDefault = strcmp (setting->defaultValue.value.asString, data) == 0;
+    Bool isDefault = strcmp (sPrivate->defaultValue.value.asString, data) == 0;
 
-    if (setting->isDefault && isDefault)
+    if (sPrivate->isDefault && isDefault)
 	return TRUE;
 
-    if (!setting->isDefault && isDefault)
+    if (!sPrivate->isDefault && isDefault)
     {
 	ccsResetToDefault (setting, processChanged);
 	return TRUE;
     }
 
-    if (!strcmp (setting->value->value.asString, data))
+    if (!strcmp (sPrivate->value->value.asString, data))
 	return TRUE;
 
-    if (setting->isDefault)
+    if (sPrivate->isDefault)
 	copyFromDefault (setting);
 
-    free (setting->value->value.asString);
+    free (sPrivate->value->value.asString);
 
-    setting->value->value.asString = strdup (data);
+    sPrivate->value->value.asString = strdup (data);
 
     if (processChanged)
-	setting->parent->context->changedSettings =
-		ccsSettingListAppend (setting->parent->context->changedSettings,
-				      setting);
+	ccsContextAddChangedSetting (ccsPluginGetContext (sPrivate->parent), setting);
 
     return TRUE;
 }
 
 Bool
-ccsSetColor (CCSSetting * setting, CCSSettingColorValue data, Bool processChanged)
+ccsSettingSetColorDefault (CCSSetting * setting, CCSSettingColorValue data, Bool processChanged)
 {
-    if (setting->type != TypeColor)
+    SETTING_PRIV (setting)
+
+    if (sPrivate->type != TypeColor)
 	return FALSE;
 
-    CCSSettingColorValue defValue = setting->defaultValue.value.asColor;
+    CCSSettingColorValue defValue = sPrivate->defaultValue.value.asColor;
 
     Bool isDefault = ccsIsEqualColor (defValue, data);
 
-    if (setting->isDefault && isDefault)
+    if (sPrivate->isDefault && isDefault)
 	return TRUE;
 
-    if (!setting->isDefault && isDefault)
+    if (!sPrivate->isDefault && isDefault)
     {
 	ccsResetToDefault (setting, processChanged);
 	return TRUE;
     }
 
-    if (ccsIsEqualColor (setting->value->value.asColor, data))
+    if (ccsIsEqualColor (sPrivate->value->value.asColor, data))
 	return TRUE;
 
-    if (setting->isDefault)
+    if (sPrivate->isDefault)
 	copyFromDefault (setting);
 
-    setting->value->value.asColor = data;
+    sPrivate->value->value.asColor = data;
 
     if (processChanged)
-	setting->parent->context->changedSettings =
-	    ccsSettingListAppend (setting->parent->context->changedSettings,
-				  setting);
+	ccsContextAddChangedSetting (ccsPluginGetContext (sPrivate->parent), setting);
 
     return TRUE;
 }
 
 Bool
-ccsSetMatch (CCSSetting * setting, const char *data, Bool processChanged)
+ccsSettingSetMatchDefault (CCSSetting * setting, const char *data, Bool processChanged)
 {
-    if (setting->type != TypeMatch)
+    SETTING_PRIV (setting);
+
+    if (sPrivate->type != TypeMatch)
 	return FALSE;
 
     if (!data)
 	return FALSE;
 
-    Bool isDefault = strcmp (setting->defaultValue.value.asMatch, data) == 0;
+    Bool isDefault = strcmp (sPrivate->defaultValue.value.asMatch, data) == 0;
 
-    if (setting->isDefault && isDefault)
+    if (sPrivate->isDefault && isDefault)
 	return TRUE;
 
-    if (!setting->isDefault && isDefault)
+    if (!sPrivate->isDefault && isDefault)
     {
 	ccsResetToDefault (setting, processChanged);
 	return TRUE;
     }
 
-    if (!strcmp (setting->value->value.asMatch, data))
+    if (!strcmp (sPrivate->value->value.asMatch, data))
 	return TRUE;
 
-    if (setting->isDefault)
+    if (sPrivate->isDefault)
 	copyFromDefault (setting);
 
-    free (setting->value->value.asMatch);
+    free (sPrivate->value->value.asMatch);
 
-    setting->value->value.asMatch = strdup (data);
+    sPrivate->value->value.asMatch = strdup (data);
 
     if (processChanged)
-	setting->parent->context->changedSettings =
-	    ccsSettingListAppend (setting->parent->context->changedSettings,
-				  setting);
+	ccsContextAddChangedSetting (ccsPluginGetContext (sPrivate->parent), setting);
 
     return TRUE;
 }
 
 Bool
-ccsSetKey (CCSSetting * setting, CCSSettingKeyValue data, Bool processChanged)
+ccsSettingSetKeyDefault (CCSSetting * setting, CCSSettingKeyValue data, Bool processChanged)
 {
-    if (setting->type != TypeKey)
+    SETTING_PRIV (setting);
+
+    if (sPrivate->type != TypeKey)
 	return FALSE;
 
-    CCSSettingKeyValue defValue = setting->defaultValue.value.asKey;
+    CCSSettingKeyValue defValue = sPrivate->defaultValue.value.asKey;
 
     Bool isDefault = ccsIsEqualKey (data, defValue);
 
-    if (setting->isDefault && isDefault)
+    if (sPrivate->isDefault && isDefault)
 	return TRUE;
 
-    if (!setting->isDefault && isDefault)
+    if (!sPrivate->isDefault && isDefault)
     {
 	ccsResetToDefault (setting, processChanged);
 	return TRUE;
     }
 
-    if (ccsIsEqualKey (setting->value->value.asKey, data))
+    if (ccsIsEqualKey (sPrivate->value->value.asKey, data))
 	return TRUE;
 
-    if (setting->isDefault)
+    if (sPrivate->isDefault)
 	copyFromDefault (setting);
 
-    setting->value->value.asKey.keysym = data.keysym;
-    setting->value->value.asKey.keyModMask = data.keyModMask;
+    sPrivate->value->value.asKey.keysym = data.keysym;
+    sPrivate->value->value.asKey.keyModMask = data.keyModMask;
 
     if (processChanged)
-	setting->parent->context->changedSettings =
-	    ccsSettingListAppend (setting->parent->context->changedSettings,
-				  setting);
+	ccsContextAddChangedSetting (ccsPluginGetContext (sPrivate->parent), setting);
 
     return TRUE;
 }
 
 Bool
-ccsSetButton (CCSSetting * setting, CCSSettingButtonValue data, Bool processChanged)
+ccsSettingSetButtonDefault (CCSSetting * setting, CCSSettingButtonValue data, Bool processChanged)
 {
-    if (setting->type != TypeButton)
+    SETTING_PRIV (setting);
+
+    if (sPrivate->type != TypeButton)
 	return FALSE;
 
-    CCSSettingButtonValue defValue = setting->defaultValue.value.asButton;
+    CCSSettingButtonValue defValue = sPrivate->defaultValue.value.asButton;
 
     Bool isDefault = ccsIsEqualButton (data, defValue);
 
-    if (setting->isDefault && isDefault)
-	return TRUE;
-
-    if (!setting->isDefault && isDefault)
-    {
-	ccsResetToDefault (setting, processChanged);
-	return TRUE;
-    }
-
-    if (ccsIsEqualButton (setting->value->value.asButton, data))
-	return TRUE;
-
-    if (setting->isDefault)
-	copyFromDefault (setting);
-
-    setting->value->value.asButton.button = data.button;
-    setting->value->value.asButton.buttonModMask = data.buttonModMask;
-    setting->value->value.asButton.edgeMask = data.edgeMask;
-
-    if (processChanged)
-	setting->parent->context->changedSettings =
-	    ccsSettingListAppend (setting->parent->context->changedSettings,
-				  setting);
-
-    return TRUE;
-}
-
-Bool
-ccsSetEdge (CCSSetting * setting, unsigned int data, Bool processChanged)
-{
-    if (setting->type != TypeEdge)
-	return FALSE;
-
-    Bool isDefault = (data == setting->defaultValue.value.asEdge);
-
-    if (setting->isDefault && isDefault)
-	return TRUE;
-
-    if (!setting->isDefault && isDefault)
-    {
-	ccsResetToDefault (setting, processChanged);
-	return TRUE;
-    }
-
-    if (setting->value->value.asEdge == data)
-	return TRUE;
-
-    if (setting->isDefault)
-	copyFromDefault (setting);
-
-    setting->value->value.asEdge = data;
-
-    if (processChanged)
-	setting->parent->context->changedSettings =
-	     ccsSettingListAppend (setting->parent->context->changedSettings,
-				   setting);
-
-    return TRUE;
-}
-
-Bool
-ccsSetBell (CCSSetting * setting, Bool data, Bool processChanged)
-{
-    if (setting->type != TypeBell)
-	return FALSE;
-
-    Bool isDefault = (data == setting->defaultValue.value.asBool);
-
-    if (setting->isDefault && isDefault)
-	return TRUE;
-
-    if (!setting->isDefault && isDefault)
-    {
-	ccsResetToDefault (setting, processChanged);
-	return TRUE;
-    }
-
-    if (setting->value->value.asBell == data)
-	return TRUE;
-
-    if (setting->isDefault)
-	copyFromDefault (setting);
-
-    setting->value->value.asBell = data;
-
-    if (processChanged)
-	setting->parent->context->changedSettings =
-	    ccsSettingListAppend (setting->parent->context->changedSettings,
-				  setting);
+    if (sPrivate->isDefault && isDefault)
+	return TRUE;
+
+    if (!sPrivate->isDefault && isDefault)
+    {
+	ccsResetToDefault (setting, processChanged);
+	return TRUE;
+    }
+
+    if (ccsIsEqualButton (sPrivate->value->value.asButton, data))
+	return TRUE;
+
+    if (sPrivate->isDefault)
+	copyFromDefault (setting);
+
+    sPrivate->value->value.asButton.button = data.button;
+    sPrivate->value->value.asButton.buttonModMask = data.buttonModMask;
+    sPrivate->value->value.asButton.edgeMask = data.edgeMask;
+
+    if (processChanged)
+	ccsContextAddChangedSetting (ccsPluginGetContext (sPrivate->parent), setting);
+
+    return TRUE;
+}
+
+Bool
+ccsSettingSetEdgeDefault (CCSSetting * setting, unsigned int data, Bool processChanged)
+{
+    SETTING_PRIV (setting)
+
+    if (sPrivate->type != TypeEdge)
+	return FALSE;
+
+    Bool isDefault = (data == sPrivate->defaultValue.value.asEdge);
+
+    if (sPrivate->isDefault && isDefault)
+	return TRUE;
+
+    if (!sPrivate->isDefault && isDefault)
+    {
+	ccsResetToDefault (setting, processChanged);
+	return TRUE;
+    }
+
+    if (sPrivate->value->value.asEdge == data)
+	return TRUE;
+
+    if (sPrivate->isDefault)
+	copyFromDefault (setting);
+
+    sPrivate->value->value.asEdge = data;
+
+    if (processChanged)
+	ccsContextAddChangedSetting (ccsPluginGetContext (sPrivate->parent), setting);
+
+    return TRUE;
+}
+
+Bool
+ccsSettingSetBellDefault (CCSSetting * setting, Bool data, Bool processChanged)
+{
+    SETTING_PRIV (setting);
+
+    if (sPrivate->type != TypeBell)
+	return FALSE;
+
+    Bool isDefault = (data == sPrivate->defaultValue.value.asBool);
+
+    if (sPrivate->isDefault && isDefault)
+	return TRUE;
+
+    if (!sPrivate->isDefault && isDefault)
+    {
+	ccsResetToDefault (setting, processChanged);
+	return TRUE;
+    }
+
+    if (sPrivate->value->value.asBell == data)
+	return TRUE;
+
+    if (sPrivate->isDefault)
+	copyFromDefault (setting);
+
+    sPrivate->value->value.asBell = data;
+
+    if (processChanged)
+	ccsContextAddChangedSetting (ccsPluginGetContext (sPrivate->parent), setting);
 
     return TRUE;
 }
@@ -1400,6 +1814,8 @@
 {
     CCSSettingValueList l2 = NULL;
 
+    SETTING_PRIV (setting)
+
     while (l1)
     {
 	CCSSettingValue *value = calloc (1, sizeof (CCSSettingValue));
@@ -1410,7 +1826,7 @@
 	value->parent = setting;
 	value->isListChild = TRUE;
 
-	switch (setting->info.forList.listType)
+	switch (sPrivate->info.forList.listType)
 	{
 	case TypeInt:
 	    value->value.asInt = l1->data->value.asInt;
@@ -1460,13 +1876,15 @@
 }
 
 Bool
-ccsSetList (CCSSetting * setting, CCSSettingValueList data, Bool processChanged)
+ccsSettingSetListDefault (CCSSetting * setting, CCSSettingValueList data, Bool processChanged)
 {
-    if (setting->type != TypeList)
+    SETTING_PRIV (setting)
+
+    if (sPrivate->type != TypeList)
 	return FALSE;
 
-    Bool isDefault = ccsCompareLists (setting->defaultValue.value.asList, data,
-				      setting->info.forList);
+    Bool isDefault = ccsCompareLists (sPrivate->defaultValue.value.asList, data,
+				      sPrivate->info.forList);
 
     /* Don't need to worry about default values
      * when processChanged is off since use of that
@@ -1474,53 +1892,53 @@
      * temporary storage */
     if (!processChanged)
     {
-	if (setting->isDefault && isDefault)
+	if (sPrivate->isDefault && isDefault)
 	{
 	    return TRUE;
 	}
 
-	if (!setting->isDefault && isDefault)
+	if (!sPrivate->isDefault && isDefault)
 	{
 	    ccsResetToDefault (setting, processChanged);
 	    return TRUE;
 	}
     }
 
-    if (ccsCompareLists (setting->value->value.asList, data,
-			 setting->info.forList))
+    if (ccsCompareLists (sPrivate->value->value.asList, data,
+			 sPrivate->info.forList))
     {
 	return TRUE;
     }
 
-    if (setting->isDefault)
+    if (sPrivate->isDefault)
 	copyFromDefault (setting);
 
-    ccsSettingValueListFree (setting->value->value.asList, TRUE);
-
-    setting->value->value.asList = ccsCopyList (data, setting);
-
-    if ((strcmp (setting->name, "active_plugins") == 0) &&
-	(strcmp (setting->parent->name, "core") == 0) && processChanged)
+    ccsSettingValueListFree (sPrivate->value->value.asList, TRUE);
+
+    sPrivate->value->value.asList = ccsCopyList (data, setting);
+
+    if ((strcmp (sPrivate->name, "active_plugins") == 0) &&
+	(strcmp (ccsPluginGetName (sPrivate->parent), "core") == 0) && processChanged)
     {
 	CCSStringList list;
 
-	list = ccsGetStringListFromValueList (setting->value->value.asList);
-	ccsSetActivePluginList (setting->parent->context, list);
+	list = ccsGetStringListFromValueList (sPrivate->value->value.asList);
+	ccsSetActivePluginList (ccsPluginGetContext (sPrivate->parent), list);
 	ccsStringListFree (list, TRUE);
     }
 
     if (processChanged)
-	setting->parent->context->changedSettings =
-	    ccsSettingListAppend (setting->parent->context->changedSettings,
-				  setting);
+	ccsContextAddChangedSetting (ccsPluginGetContext (sPrivate->parent), setting);
 
     return TRUE;
 }
 
 Bool
-ccsSetValue (CCSSetting * setting, CCSSettingValue * data, Bool processChanged)
+ccsSettingSetValueDefault (CCSSetting * setting, CCSSettingValue * data, Bool processChanged)
 {
-    switch (setting->type)
+    SETTING_PRIV (setting);
+
+    switch (sPrivate->type)
     {
     case TypeInt:
 	return ccsSetInt (setting, data->value.asInt, processChanged);
@@ -1562,113 +1980,300 @@
 }
 
 Bool
-ccsGetInt (CCSSetting * setting, int *data)
-{
-    if (setting->type != TypeInt)
-	return FALSE;
-
-    *data = setting->value->value.asInt;
-    return TRUE;
-}
-
-Bool
-ccsGetFloat (CCSSetting * setting, float *data)
-{
-    if (setting->type != TypeFloat)
-	return FALSE;
-
-    *data = setting->value->value.asFloat;
-    return TRUE;
-}
-
-Bool
-ccsGetBool (CCSSetting * setting, Bool * data)
-{
-    if (setting->type != TypeBool)
-	return FALSE;
-
-    *data = setting->value->value.asBool;
-    return TRUE;
-}
-
-Bool
-ccsGetString (CCSSetting * setting, char **data)
-{
-    if (setting->type != TypeString)
-	return FALSE;
-
-    *data = setting->value->value.asString;
-    return TRUE;
-}
-
-Bool
-ccsGetColor (CCSSetting * setting, CCSSettingColorValue * data)
-{
-    if (setting->type != TypeColor)
+ccsSettingGetIntDefault (CCSSetting * setting, int *data)
+{
+    SETTING_PRIV (setting);
+
+    if (sPrivate->type != TypeInt)
+	return FALSE;
+
+    *data = sPrivate->value->value.asInt;
+    return TRUE;
+}
+
+Bool
+ccsSettingGetFloatDefault (CCSSetting * setting, float *data)
+{
+    SETTING_PRIV (setting)
+
+    if (sPrivate->type != TypeFloat)
+	return FALSE;
+
+    *data = sPrivate->value->value.asFloat;
+    return TRUE;
+}
+
+Bool
+ccsSettingGetBoolDefault (CCSSetting * setting, Bool * data)
+{
+    SETTING_PRIV (setting)
+
+    if (sPrivate->type != TypeBool)
+	return FALSE;
+
+    *data = sPrivate->value->value.asBool;
+    return TRUE;
+}
+
+Bool
+ccsSettingGetStringDefault (CCSSetting * setting, char **data)
+{
+    SETTING_PRIV (setting)
+
+    if (sPrivate->type != TypeString)
+	return FALSE;
+
+    *data = sPrivate->value->value.asString;
+    return TRUE;
+}
+
+Bool
+ccsSettingGetColorDefault (CCSSetting * setting, CCSSettingColorValue * data)
+{
+    SETTING_PRIV (setting)
+
+    if (sPrivate->type != TypeColor)
 	return TRUE;
 
-    *data = setting->value->value.asColor;
-    return TRUE;
-}
-
-Bool
-ccsGetMatch (CCSSetting * setting, char **data)
-{
-    if (setting->type != TypeMatch)
-	return FALSE;
-
-    *data = setting->value->value.asMatch;
-    return TRUE;
-}
-
-Bool
-ccsGetKey (CCSSetting * setting, CCSSettingKeyValue * data)
-{
-    if (setting->type != TypeKey)
-	return FALSE;
-
-    *data = setting->value->value.asKey;
-    return TRUE;
-}
-
-Bool
-ccsGetButton (CCSSetting * setting, CCSSettingButtonValue * data)
-{
-    if (setting->type != TypeButton)
-	return FALSE;
-
-    *data = setting->value->value.asButton;
-    return TRUE;
-}
-
-Bool
-ccsGetEdge (CCSSetting * setting, unsigned int * data)
-{
-    if (setting->type != TypeEdge)
-	return FALSE;
-
-    *data = setting->value->value.asEdge;
-    return TRUE;
-}
-
-Bool
-ccsGetBell (CCSSetting * setting, Bool * data)
-{
-    if (setting->type != TypeBell)
-	return FALSE;
-
-    *data = setting->value->value.asBell;
-    return TRUE;
-}
-
-Bool
-ccsGetList (CCSSetting * setting, CCSSettingValueList * data)
-{
-    if (setting->type != TypeList)
-	return FALSE;
-
-    *data = setting->value->value.asList;
-    return TRUE;
+    *data = sPrivate->value->value.asColor;
+    return TRUE;
+}
+
+Bool
+ccsSettingGetMatchDefault (CCSSetting * setting, char **data)
+{
+    SETTING_PRIV (setting)
+
+    if (sPrivate->type != TypeMatch)
+	return FALSE;
+
+    *data = sPrivate->value->value.asMatch;
+    return TRUE;
+}
+
+Bool
+ccsSettingGetKeyDefault (CCSSetting * setting, CCSSettingKeyValue * data)
+{
+    SETTING_PRIV (setting)
+
+    if (sPrivate->type != TypeKey)
+	return FALSE;
+
+    *data = sPrivate->value->value.asKey;
+    return TRUE;
+}
+
+Bool
+ccsSettingGetButtonDefault (CCSSetting * setting, CCSSettingButtonValue * data)
+{
+    SETTING_PRIV (setting)
+
+    if (sPrivate->type != TypeButton)
+	return FALSE;
+
+    *data = sPrivate->value->value.asButton;
+    return TRUE;
+}
+
+Bool
+ccsSettingGetEdgeDefault (CCSSetting * setting, unsigned int * data)
+{
+    SETTING_PRIV (setting)
+
+    if (sPrivate->type != TypeEdge)
+	return FALSE;
+
+    *data = sPrivate->value->value.asEdge;
+    return TRUE;
+}
+
+Bool
+ccsSettingGetBellDefault (CCSSetting * setting, Bool * data)
+{
+    SETTING_PRIV (setting)
+
+    if (sPrivate->type != TypeBell)
+	return FALSE;
+
+    *data = sPrivate->value->value.asBell;
+    return TRUE;
+}
+
+Bool
+ccsSettingGetListDefault (CCSSetting * setting, CCSSettingValueList * data)
+{
+    SETTING_PRIV (setting)
+
+    if (sPrivate->type != TypeList)
+	return FALSE;
+
+    *data = sPrivate->value->value.asList;
+    return TRUE;
+}
+
+Bool ccsGetInt (CCSSetting *setting,
+		int        *data)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, setting))->settingGetInt) (setting, data);
+}
+
+Bool ccsGetFloat (CCSSetting *setting,
+		  float      *data)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, setting))->settingGetFloat) (setting, data);
+}
+
+Bool ccsGetBool (CCSSetting *setting,
+		 Bool       *data)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, setting))->settingGetBool) (setting, data);
+}
+
+Bool ccsGetString (CCSSetting *setting,
+		   char       **data)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, setting))->settingGetString) (setting, data);
+}
+
+Bool ccsGetColor (CCSSetting           *setting,
+		  CCSSettingColorValue *data)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, setting))->settingGetColor) (setting, data);
+}
+
+Bool ccsGetMatch (CCSSetting *setting,
+		  char       **data)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, setting))->settingGetMatch) (setting, data);
+}
+
+Bool ccsGetKey (CCSSetting         *setting,
+		CCSSettingKeyValue *data)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, setting))->settingGetKey) (setting, data);
+}
+
+Bool ccsGetButton (CCSSetting            *setting,
+		   CCSSettingButtonValue *data)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, setting))->settingGetButton) (setting, data);
+}
+
+Bool ccsGetEdge (CCSSetting  *setting,
+		 unsigned int *data)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, setting))->settingGetEdge) (setting, data);
+}
+
+Bool ccsGetBell (CCSSetting *setting,
+		 Bool       *data)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, setting))->settingGetBell) (setting, data);
+}
+
+Bool ccsGetList (CCSSetting          *setting,
+		 CCSSettingValueList *data)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, setting))->settingGetList) (setting, data);
+}
+
+Bool ccsSetInt (CCSSetting *setting,
+		int        data,
+		Bool	   processChanged)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, setting))->settingSetInt) (setting, data, processChanged);
+}
+
+Bool ccsSetFloat (CCSSetting *setting,
+		  float      data,
+		  Bool	     processChanged)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, setting))->settingSetFloat) (setting, data, processChanged);
+}
+
+Bool ccsSetBool (CCSSetting *setting,
+		 Bool       data,
+		 Bool	    processChanged)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, setting))->settingSetBool) (setting, data, processChanged);
+}
+
+Bool ccsSetString (CCSSetting *setting,
+		   const char *data,
+		   Bool	      processChanged)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, setting))->settingSetString) (setting, data, processChanged);
+}
+
+Bool ccsSetColor (CCSSetting           *setting,
+		  CCSSettingColorValue data,
+		  Bool		       processChanged)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, setting))->settingSetColor) (setting, data, processChanged);
+}
+
+Bool ccsSetMatch (CCSSetting *setting,
+		  const char *data,
+		  Bool	     processChanged)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, setting))->settingSetMatch) (setting, data, processChanged);
+}
+
+Bool ccsSetKey (CCSSetting         *setting,
+		CCSSettingKeyValue data,
+		Bool		   processChanged)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, setting))->settingSetKey) (setting, data, processChanged);
+}
+
+Bool ccsSetButton (CCSSetting            *setting,
+		   CCSSettingButtonValue data,
+		   Bool			 processChanged)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, setting))->settingSetButton) (setting, data, processChanged);
+}
+
+Bool ccsSetEdge (CCSSetting   *setting,
+		 unsigned int data,
+		 Bool	      processChanged)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, setting))->settingSetEdge) (setting, data, processChanged);
+}
+
+Bool ccsSetBell (CCSSetting *setting,
+		 Bool       data,
+		 Bool	    processChanged)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, setting))->settingSetBell) (setting, data, processChanged);
+}
+
+Bool ccsSetList (CCSSetting          *setting,
+		 CCSSettingValueList data,
+		 Bool	 processChanged)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, setting))->settingSetList) (setting, data, processChanged);
+}
+
+Bool ccsSetValue (CCSSetting      *setting,
+		  CCSSettingValue *data,
+		  Bool		  processChanged)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, setting))->settingSetValue) (setting, data, processChanged);
+}
+
+void ccsResetToDefault (CCSSetting * setting, Bool processChanged)
+{
+    (*(GET_INTERFACE (CCSSettingInterface, setting))->settingResetToDefault) (setting, processChanged);
+}
+
+Bool ccsSettingIsIntegrated (CCSSetting *setting)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, setting))->settingIsIntegrated) (setting);
+}
+
+Bool ccsSettingIsReadOnly (CCSSetting *setting)
+{
+    return (*(GET_INTERFACE (CCSSettingInterface, setting))->settingIsReadOnly) (setting);
 }
 
 void
@@ -1693,15 +2298,17 @@
 }
 
 CCSPluginList
-ccsGetActivePluginList (CCSContext * context)
+ccsGetActivePluginListDefault (CCSContext * context)
 {
+    CONTEXT_PRIV (context);
+
     CCSPluginList rv = NULL;
-    CCSPluginList l = context->plugins;
+    CCSPluginList l = cPrivate->plugins;
 
     while (l)
     {
 	PLUGIN_PRIV (l->data);
-	if (pPrivate->active && strcmp (l->data->name, "ccp"))
+	if (pPrivate->active && strcmp (ccsPluginGetName (l->data), "ccp"))
 	{
 	    rv = ccsPluginListAppend (rv, l->data);
 	}
@@ -1712,6 +2319,12 @@
     return rv;
 }
 
+CCSPluginList
+ccsGetActivePluginList (CCSContext *context)
+{
+    return (*(GET_INTERFACE (CCSContextInterface, context))->contextGetActivePluginList) (context);
+}
+
 static CCSPlugin *
 findPluginInList (CCSPluginList list, char *name)
 {
@@ -1720,7 +2333,7 @@
 
     while (list)
     {
-	if (!strcmp (list->data->name, name))
+	if (!strcmp (ccsPluginGetName (list->data), name))
 	    return list->data;
 
 	list = list->next;
@@ -1736,7 +2349,7 @@
 } PluginSortHelper;
 
 CCSStringList
-ccsGetSortedPluginStringList (CCSContext * context)
+ccsGetSortedPluginStringListDefault (CCSContext * context)
 {
     CCSPluginList ap = ccsGetActivePluginList (context);
     CCSPluginList list;
@@ -1777,7 +2390,7 @@
 
     for (i = 0; i < len; i++)
     {
-	CCSStringList l = plugins[i].plugin->loadAfter;
+	CCSStringList l = ccsPluginGetLoadAfter (plugins[i].plugin);
 	while (l)
 	{
 	    p = findPluginInList (ap, ((CCSString *)l->data)->value);
@@ -1788,13 +2401,13 @@
 	    l = l->next;
 	}
 
-	l = plugins[i].plugin->requiresPlugin;
+	l = ccsPluginGetRequiresPlugins (plugins[i].plugin);
 	while (l)
 	{
 	    Bool found = FALSE;
 	    p = findPluginInList (ap, ((CCSString *)l->data)->value);
 
-	    CCSStringList l2 = plugins[i].plugin->loadBefore;
+	    CCSStringList l2 = ccsPluginGetLoadBefore (plugins[i].plugin);
 	    while (l2)
 	    {
 		if (strcmp (((CCSString *)l2->data)->value,
@@ -1809,7 +2422,7 @@
 	    l = l->next;
 	}
 
-	l = plugins[i].plugin->loadBefore;
+	l = ccsPluginGetLoadBefore (plugins[i].plugin);
 	while (l)
 	{
 	    p = findPluginInList (ap, ((CCSString *)l->data)->value);
@@ -1852,7 +2465,7 @@
 
 	    /* This is a special case to ensure that bench is the last plugin */
 	    if (len - removed > 1 &&
-		strcmp (plugins[i].plugin->name, "bench") == 0)
+		strcmp (ccsPluginGetName (plugins[i].plugin), "bench") == 0)
 		continue;
 
 	    found = TRUE;
@@ -1866,7 +2479,7 @@
 
 	    strPluginName = calloc (1, sizeof (CCSString));
 	    
-	    strPluginName->value = strdup (p->name);
+	    strPluginName->value = strdup (ccsPluginGetName (p));
 	    strPluginName->refCount = 1;
 
 	    rv = ccsStringListAppend (rv, strPluginName);
@@ -1896,8 +2509,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;
@@ -1910,8 +2529,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;
@@ -1921,8 +2546,17 @@
     return cPrivate->deIntegration;
 }
 
+Bool