[gnome-control-center] universal-access: Keep your own gconf horrors

[Bastien Nocera <hadess src gnome org>]

commit 4a8c7afbe03be04202bfed0eb8786695187ae8bc
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Jun 29 17:34:22 2011 +0100

    universal-access: Keep your own gconf horrors

 libgnome-control-center/Makefile.am                |    5 --
 libgnome-control-center/cc-marshal.c               |   41 --------------------
 libgnome-control-center/cc-marshal.h               |   15 -------
 panels/universal-access/Makefile.am                |   10 +++-
 panels/universal-access/cc-ua-panel.c              |    2 +-
 .../universal-access}/gconf-property-editor.c      |    0
 .../universal-access}/gconf-property-editor.h      |    0
 7 files changed, 8 insertions(+), 65 deletions(-)
---
diff --git a/libgnome-control-center/Makefile.am b/libgnome-control-center/Makefile.am
index dafacae..6973288 100644
--- a/libgnome-control-center/Makefile.am
+++ b/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)
diff --git a/panels/universal-access/Makefile.am b/panels/universal-access/Makefile.am
index 1593768..896143d 100644
--- a/panels/universal-access/Makefile.am
+++ b/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	\
-	cc-ua-panel.c	\
-	cc-ua-panel.h
+	universal-access-module.c		\
+	cc-ua-panel.c				\
+	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)
diff --git a/panels/universal-access/cc-ua-panel.c b/panels/universal-access/cc-ua-panel.c
index 350c1c6..0bf1f4d 100644
--- a/panels/universal-access/cc-ua-panel.c
+++ b/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)
 
diff --git a/libgnome-control-center/gconf-property-editor.c b/panels/universal-access/gconf-property-editor.c
similarity index 100%
rename from libgnome-control-center/gconf-property-editor.c
rename to panels/universal-access/gconf-property-editor.c
diff --git a/libgnome-control-center/gconf-property-editor.h b/panels/universal-access/gconf-property-editor.h
similarity index 100%
rename from libgnome-control-center/gconf-property-editor.h
rename to panels/universal-access/gconf-property-editor.h