Merge ~mitya57/compiz:typo into compiz:master

[Dmitry Shachnev]

Remove unused empty private structs.

Remove unused empty private structs.

[Alberts Muktupāvels (muktupavels)]

Looks good, but is this private needed? Struct is empty...

review: Approve

[Dmitry Shachnev (mitya57)]

Good question! Looks it's just some boilerplate copied, and we can safely remove it. Also found another similar empty struct.

[Alberts Muktupāvels (muktupavels)]

Thanks!

diff --git a/compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_wrapper_factory.c b/compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_wrapper_factory.c
index 0e17bac..7f3897c 100644
--- a/compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_wrapper_factory.c
+++ b/compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_wrapper_factory.c
@@ -27,11 +27,6 @@
 #include "ccs_gsettings_interface_wrapper.h"
 
 /* CCSGSettingsWrapperFactory implementation */
-typedef struct _CCSGSettingsWrapperFactoryPrivate CCSGSettingsWrapperFactoryPrivate;
-struct _CCSGSettingsWrapperFactoryPrivate
-{
-};
-
 static void
 ccsGSettingsWrapperDefaultImplFree (CCSGSettingsWrapperFactory *wrapperFactory)
 {
@@ -78,17 +73,8 @@ ccsGSettingsWrapperFactoryDefaultImplNew (CCSObjectAllocationInterface *ai)
     if (!wrapperFactory)
 	return NULL;
 
-    CCSGSettingsWrapperFactoryPrivate *priv = (*ai->calloc_) (ai->allocator, 1, sizeof (CCSGSettingsWrapperFactoryPrivate));
-
-    if (!priv)
-    {
-	(*ai->free_) (ai->allocator, wrapperFactory);
-	return NULL;
-    }
-
     ccsObjectInit (wrapperFactory, ai);
     ccsObjectAddInterface (wrapperFactory, (const CCSInterface *) &ccsGSettingsWrapperFactoryInterface, GET_INTERFACE_TYPE (CCSGSettingsWrapperFactoryInterface));
-    ccsObjectSetPrivate (wrapperFactory, (CCSPrivate *) priv);
 
     ccsGSettingsWrapperFactoryRef (wrapperFactory);
 
diff --git a/compizconfig/libcompizconfig/src/ccs_backend_loader.c b/compizconfig/libcompizconfig/src/ccs_backend_loader.c
index 9798e4e..f4de45f 100644
--- a/compizconfig/libcompizconfig/src/ccs_backend_loader.c
+++ b/compizconfig/libcompizconfig/src/ccs_backend_loader.c
@@ -38,12 +38,6 @@
 #include <ccs_backend_loader_interface.h>
 #include <ccs_backend_loader.h>
 
-typedef struct _CCSShraedLibBackendLoaderPrivate CCSShraedLibBackendLoaderPrivate;
-
-struct _CCSShraedLibBackendLoaderPrivate
-{
-};
-
 static void *
 openBackend (const char *backend)
 {
@@ -209,20 +203,6 @@ allocateLoader (CCSObjectAllocationInterface *ai)
     return loader;
 }
 
-static CCSShraedLibBackendLoaderPrivate *
-backendLoaderAllocatePrivate (CCSBackendLoader *loader, CCSObjectAllocationInterface *ai)
-{
-    CCSShraedLibBackendLoaderPrivate *priv = (*ai->calloc_) (ai->allocator, 1, sizeof (CCSShraedLibBackendLoaderPrivate));
-
-    if (!priv)
-    {
-	freeAndFinalizeLoader (loader, ai);
-	return NULL;
-    }
-
-    return priv;
-}
-
 CCSBackendLoader *
 ccsSharedLibBackendLoaderNew (CCSObjectAllocationInterface *ai)
 {
@@ -231,12 +211,6 @@ ccsSharedLibBackendLoaderNew (CCSObjectAllocationInterface *ai)
     if (!loader)
 	return NULL;
 
-    CCSShraedLibBackendLoaderPrivate *priv = backendLoaderAllocatePrivate (loader, ai);
-
-    if (!priv)
-	return NULL;
-
-    ccsObjectSetPrivate (loader, (CCSPrivate *) (priv));
     ccsObjectAddInterface (loader, (const CCSInterface *) &ccsSharedLibBackendLoaderInterface,
 			   GET_INTERFACE_TYPE (CCSBackendLoaderInterface));
     ccsObjectRef (loader);