universal-access: Keep your own gconf horrors

libgnome-control-center/Makefile.am

@@ -14,18 +14,13 @@ lib_LTLIBRARIES = libgnome-control-center.la
 libgnome_control_center_include_HEADERS =	\
 	cc-panel.h				\
 	cc-shell.h				\
-	gconf-property-editor.h			\
 	$(NULL)
 
 libgnome_control_center_la_SOURCES =		\
-	cc-marshal.c				\
-	cc-marshal.h				\
 	cc-panel.c				\
 	cc-panel.h				\
 	cc-shell.c				\
 	cc-shell.h				\
-	gconf-property-editor.c			\
-	gconf-property-editor.h			\
 	cc-editable-entry.c			\
 	cc-editable-entry.h			\
 	$(NULL)

libgnome-control-center/cc-marshal.c

@@ -1,41 +0,0 @@
-#include <glib.h>
-#include <glib-object.h>
-#include "cc-marshal.h"
-
-/* VOID:STRING,POINTER (peditor-marshal.list:25) */
-void
-cc_marshal_VOID__STRING_POINTER (GClosure     *closure,
-				 GValue       *return_value,
-				 guint         n_param_values,
-				 const GValue *param_values,
-				 gpointer      invocation_hint,
-				 gpointer      marshal_data)
-{
-  typedef void (*GMarshalFunc_VOID__STRING_POINTER) (gpointer     data1,
-                                                     gpointer     arg_1,
-                                                     gpointer     arg_2,
-                                                     gpointer     data2);
-  register GMarshalFunc_VOID__STRING_POINTER callback;
-  register GCClosure *cc = (GCClosure*) closure;
-  register gpointer data1, data2;
-
-  g_return_if_fail (n_param_values == 3);
-
-  if (G_CCLOSURE_SWAP_DATA (closure))
-    {
-      data1 = closure->data;
-      data2 = g_value_peek_pointer (param_values + 0);
-    }
-  else
-    {
-      data1 = g_value_peek_pointer (param_values + 0);
-      data2 = closure->data;
-    }
-  callback = (GMarshalFunc_VOID__STRING_POINTER) (marshal_data ? marshal_data : cc->callback);
-
-  callback (data1,
-            (char*) g_value_get_string (param_values + 1),
-            g_value_get_pointer (param_values + 2),
-            data2);
-}
-

libgnome-control-center/cc-marshal.h

@@ -1,15 +0,0 @@
-
-#include	<gobject/gmarshal.h>
-
-G_BEGIN_DECLS
-
-/* VOID:STRING,POINTER (peditor-marshal.list:25) */
-extern void cc_marshal_VOID__STRING_POINTER (GClosure     *closure,
-					     GValue       *return_value,
-					     guint         n_param_values,
-					     const GValue *param_values,
-					     gpointer      invocation_hint,
-					     gpointer      marshal_data);
-
-G_END_DECLS
-

panels/universal-access/Makefile.am

@@ -13,9 +13,13 @@ ccpanelsdir = $(PANELS_DIR)
 ccpanels_LTLIBRARIES = libuniversal-access.la
 
 libuniversal_access_la_SOURCES =		\
-	universal-access-module.c	\
+	universal-access-module.c		\
-	cc-ua-panel.c	\
+	cc-ua-panel.c				\
-	cc-ua-panel.h
+	cc-ua-panel.h				\
+	gconf-property-editor.h			\
+	gconf-property-editor.c			\
+	cc-marshal.c				\
+	cc-marshal.h
 
 libuniversal_access_la_LIBADD = $(PANEL_LIBS) $(UNIVERSAL_ACCESS_PANEL_LIBS) $(top_builddir)/panels/common/libshortcuts.la
 libuniversal_access_la_LDFLAGS = $(PANEL_LDFLAGS)

panels/universal-access/cc-ua-panel.c

@@ -30,7 +30,7 @@
 #include <gconf/gconf-client.h>
 
 #include "eggaccelerators.h"
-#include "libgnome-control-center/gconf-property-editor.h"
+#include "gconf-property-editor.h"
 
 #define WID(b, w) (GtkWidget *) gtk_builder_get_object (b, w)