Completely remove dependency on capplets/common directory

The capplets directory is no longer built or distributed, so the panels
cannot depend on files in it.

15 files changed, 19 insertions, 30 deletions

diff --git a/configure.ac b/configure.ac
index d68fa0035..f0f6a3666 100644
--- a/configure.ac
+++ b/configure.ac
@@ -259,13 +259,10 @@ AM_GCONF_SOURCE_2
 dnl ==============================================
 dnl Define the main variables
 dnl ==============================================
-COMMON_CFLAGS="-I\$(top_srcdir)/capplets/common"
-COMMON_LIBS="\$(top_builddir)/capplets/common/libcommon.la"
-
 EXTRA_CFLAGS="-I\$(top_srcdir)/ -DG_LOG_DOMAIN=\"\\\"\$(cappletname)-properties\\\"\""
 
-GNOMECC_CAPPLETS_CFLAGS="${COMMON_CFLAGS} ${CAPPLET_CFLAGS} ${EXTRA_CFLAGS} ${DBUS_CFLAGS}"
-GNOMECC_CAPPLETS_LIBS="${COMMON_LIBS} ${CAPPLET_LIBS} ${DBUS_LIBS}"
+GNOMECC_CAPPLETS_CFLAGS="${CAPPLET_CFLAGS} ${EXTRA_CFLAGS} ${DBUS_CFLAGS}"
+GNOMECC_CAPPLETS_LIBS="${CAPPLET_LIBS} ${DBUS_LIBS}"
 
 GNOMECC_CAPPLETS_CLEANFILES="\$(desktop) \$(desktop).in"
 GNOMECC_CAPPLETS_EXTRA_DIST="ChangeLog \$(desktop).in.in \$(cappletname)-capplet.png \$(pixmaps_DATA)"
diff --git a/panels/default-applications/gnome-da-capplet.c b/panels/default-applications/gnome-da-capplet.c
index 8f9b5a790..d7682bcb4 100644
--- a/panels/default-applications/gnome-da-capplet.c
+++ b/panels/default-applications/gnome-da-capplet.c
@@ -27,11 +27,10 @@
 #include <glib/gi18n.h>
 #include <stdlib.h>
 
-#include "gconf-property-editor.h"
+#include "libgnome-control-center/gconf-property-editor.h"
 #include "gnome-da-capplet.h"
 #include "gnome-da-xml.h"
 #include "gnome-da-item.h"
-#include "capplet-util.h"
 
 enum
 {
diff --git a/panels/keybindings/gnome-keybinding-properties.c b/panels/keybindings/gnome-keybinding-properties.c
index afaec744f..5c4ad67e4 100644
--- a/panels/keybindings/gnome-keybinding-properties.c
+++ b/panels/keybindings/gnome-keybinding-properties.c
@@ -15,7 +15,6 @@
 
 #include "wm-common.h"
 #include "eggcellrendererkeys.h"
-#include "activate-settings-daemon.h"
 
 #define GCONF_BINDING_DIR "/desktop/gnome/keybindings"
 #define MAX_ELEMENTS_BEFORE_SCROLLING 10
diff --git a/panels/keyboard/gnome-keyboard-properties-a11y.c b/panels/keyboard/gnome-keyboard-properties-a11y.c
index 4a86c1182..39567e8cc 100644
--- a/panels/keyboard/gnome-keyboard-properties-a11y.c
+++ b/panels/keyboard/gnome-keyboard-properties-a11y.c
@@ -27,10 +27,10 @@
 #include "gnome-keyboard-properties-a11y.h"
 #include <gconf/gconf-client.h>
 #include "gconf-property-editor.h"
-#include "capplet-util.h"
 
 #define CONFIG_ROOT "/desktop/gnome/accessibility/keyboard"
 #define NWID(s) GTK_WIDGET (gtk_builder_get_object (notifications_dialog, s))
+#define WID(s) GTK_WIDGET (gtk_builder_get_object (dialog, s))
 
 static GtkBuilder *notifications_dialog = NULL;
 
diff --git a/panels/keyboard/gnome-keyboard-properties-xkb.c b/panels/keyboard/gnome-keyboard-properties-xkb.c
index 31ce53a5f..4976b1294 100644
--- a/panels/keyboard/gnome-keyboard-properties-xkb.c
+++ b/panels/keyboard/gnome-keyboard-properties-xkb.c
@@ -30,7 +30,6 @@
 #include <gconf/gconf-client.h>
 #include <glib/gi18n.h>
 
-#include "capplet-util.h"
 #include "gconf-property-editor.h"
 
 #include "gnome-keyboard-properties-xkb.h"
diff --git a/panels/keyboard/gnome-keyboard-properties-xkb.h b/panels/keyboard/gnome-keyboard-properties-xkb.h
index d9c387850..340525dee 100644
--- a/panels/keyboard/gnome-keyboard-properties-xkb.h
+++ b/panels/keyboard/gnome-keyboard-properties-xkb.h
@@ -25,11 +25,13 @@
 #define __GNOME_KEYBOARD_PROPERTY_XKB_H
 
 #include <gconf/gconf-client.h>
+#include <gtk/gtk.h>
 
 #include "libgnomekbd/gkbd-keyboard-config.h"
 
 G_BEGIN_DECLS
 #define CWID(s) GTK_WIDGET (gtk_builder_get_object (chooser_dialog, s))
+#define WID(s) GTK_WIDGET (gtk_builder_get_object (dialog, s))
 extern XklEngine *engine;
 extern XklConfigRegistry *config_registry;
 extern GConfClient *xkb_gconf_client;
diff --git a/panels/keyboard/gnome-keyboard-properties-xkblt.c b/panels/keyboard/gnome-keyboard-properties-xkblt.c
index 948eea570..92a7c1626 100644
--- a/panels/keyboard/gnome-keyboard-properties-xkblt.c
+++ b/panels/keyboard/gnome-keyboard-properties-xkblt.c
@@ -32,7 +32,6 @@
 #include <libgnomekbd/gkbd-desktop-config.h>
 #include <libgnomekbd/gkbd-keyboard-drawing.h>
 
-#include "capplet-util.h"
 #include "gnome-keyboard-properties-xkb.h"
 
 
diff --git a/panels/keyboard/gnome-keyboard-properties-xkbltadd.c b/panels/keyboard/gnome-keyboard-properties-xkbltadd.c
index 8f7898563..44d28dfa6 100644
--- a/panels/keyboard/gnome-keyboard-properties-xkbltadd.c
+++ b/panels/keyboard/gnome-keyboard-properties-xkbltadd.c
@@ -30,7 +30,6 @@
 #include <libgnomekbd/gkbd-keyboard-drawing.h>
 #include <libgnomekbd/gkbd-util.h>
 
-#include "capplet-util.h"
 #include "gnome-keyboard-properties-xkb.h"
 
 enum {
diff --git a/panels/keyboard/gnome-keyboard-properties-xkbmc.c b/panels/keyboard/gnome-keyboard-properties-xkbmc.c
index 4b55e064d..4a217281d 100644
--- a/panels/keyboard/gnome-keyboard-properties-xkbmc.c
+++ b/panels/keyboard/gnome-keyboard-properties-xkbmc.c
@@ -29,8 +29,6 @@
 #include <gconf/gconf-client.h>
 #include <glib/gi18n.h>
 
-#include "capplet-util.h"
-
 #include "gnome-keyboard-properties-xkb.h"
 
 static gchar *current_model_name = NULL;
diff --git a/panels/keyboard/gnome-keyboard-properties-xkbot.c b/panels/keyboard/gnome-keyboard-properties-xkbot.c
index 75a516311..abe6a5fd5 100644
--- a/panels/keyboard/gnome-keyboard-properties-xkbot.c
+++ b/panels/keyboard/gnome-keyboard-properties-xkbot.c
@@ -30,8 +30,6 @@
 #include <string.h>
 #include <gconf/gconf-client.h>
 
-#include "capplet-util.h"
-
 #include "gnome-keyboard-properties-xkb.h"
 
 static GtkBuilder *chooser_dialog = NULL;
@@ -418,8 +416,8 @@ chooser_response_cb (GtkDialog * dialog, gint response, gpointer data)
 {
 	switch (response) {
 	case GTK_RESPONSE_HELP:
-		capplet_help (GTK_WINDOW (dialog),
-			      "prefs-keyboard-layoutoptions");
+		/* capplet_help (GTK_WINDOW (dialog),
+			      "prefs-keyboard-layoutoptions"); */
 		break;
 	case GTK_RESPONSE_CLOSE:{
 			/* just cleanup */
diff --git a/panels/keyboard/gnome-keyboard-properties-xkbpv.c b/panels/keyboard/gnome-keyboard-properties-xkbpv.c
index 225d8f5af..48e1f6c33 100644
--- a/panels/keyboard/gnome-keyboard-properties-xkbpv.c
+++ b/panels/keyboard/gnome-keyboard-properties-xkbpv.c
@@ -27,7 +27,6 @@
 
 #include <libgnomekbd/gkbd-keyboard-drawing.h>
 
-#include "capplet-util.h"
 #include "gnome-keyboard-properties-xkb.h"
 
 #ifdef HAVE_X11_EXTENSIONS_XKB_H
diff --git a/panels/keyboard/gnome-keyboard-properties.c b/panels/keyboard/gnome-keyboard-properties.c
index aba74bfb1..bf0283937 100644
--- a/panels/keyboard/gnome-keyboard-properties.c
+++ b/panels/keyboard/gnome-keyboard-properties.c
@@ -30,7 +30,6 @@
 
 #include <gconf/gconf-client.h>
 
-#include "capplet-util.h"
 #include "gconf-property-editor.h"
 
 #include "gnome-keyboard-properties-a11y.h"
diff --git a/panels/mouse/gnome-mouse-accessibility.c b/panels/mouse/gnome-mouse-accessibility.c
index e1bb74ba5..a6e310c03 100644
--- a/panels/mouse/gnome-mouse-accessibility.c
+++ b/panels/mouse/gnome-mouse-accessibility.c
@@ -18,7 +18,6 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#include "capplet-util.h"
 #include "gconf-property-editor.h"
 
 #define MT_GCONF_HOME "/desktop/gnome/accessibility/mouse"
@@ -26,6 +25,8 @@
 /* 5th entry in combo box */
 #define DIRECTION_DISABLE 4
 
+#define WID(x) (GtkWidget*) gtk_builder_get_object (dialog, x)
+
 enum {
 	CLICK_TYPE_SINGLE,
 	CLICK_TYPE_DOUBLE,
diff --git a/panels/mouse/gnome-mouse-properties.c b/panels/mouse/gnome-mouse-properties.c
index 242385cd3..81122bd2a 100644
--- a/panels/mouse/gnome-mouse-properties.c
+++ b/panels/mouse/gnome-mouse-properties.c
@@ -31,7 +31,6 @@
 #include <gdk/gdkx.h>
 #include <math.h>
 
-#include "capplet-util.h"
 #include "gconf-property-editor.h"
 #include "gnome-mouse-accessibility.h"
 #include "capplet-stock-icons.h"
@@ -48,6 +47,8 @@
 #include <X11/Xcursor/Xcursor.h>
 #endif
 
+#define WID(x) (GtkWidget*) gtk_builder_get_object (dialog, x)
+
 enum
 {
 	DOUBLE_CLICK_TEST_OFF,
diff --git a/panels/network/gnome-network-properties.c b/panels/network/gnome-network-properties.c
index 159a06df4..47d1f56b8 100644
--- a/panels/network/gnome-network-properties.c
+++ b/panels/network/gnome-network-properties.c
@@ -31,8 +31,7 @@
 #include <gconf/gconf-client.h>
 #include <glib/gi18n.h>
 
-#include "capplet-util.h"
-#include "gconf-property-editor.h"
+#include "libgnome-control-center/gconf-property-editor.h"
 
 enum ProxyMode
 {
@@ -196,10 +195,10 @@ cb_remove_url (GtkButton *button, gpointer data)
 static void
 cb_dialog_response (GtkDialog *dialog, gint response_id)
 {
-	if (response_id == GTK_RESPONSE_HELP)
+	/* if (response_id == GTK_RESPONSE_HELP)
 		capplet_help (GTK_WINDOW (dialog),
 			"goscustdesk-50");
-	else if (response_id == GTK_RESPONSE_CLOSE || response_id == GTK_RESPONSE_DELETE_EVENT)
+	else */ if (response_id == GTK_RESPONSE_CLOSE || response_id == GTK_RESPONSE_DELETE_EVENT)
 	{
 		if (ignore_hosts) {
 			g_slist_foreach (ignore_hosts, (GFunc) g_free, NULL);
@@ -213,10 +212,10 @@ cb_dialog_response (GtkDialog *dialog, gint response_id)
 static void
 cb_details_dialog_response (GtkDialog *dialog, gint response_id)
 {
-	if (response_id == GTK_RESPONSE_HELP)
-		capplet_help (GTK_WINDOW (dialog),
-			      "goscustdesk-50");
-	else {
+	if (response_id == GTK_RESPONSE_HELP) {
+		/* capplet_help (GTK_WINDOW (dialog),
+			      "goscustdesk-50"); */
+        } else {
 		gtk_widget_destroy (GTK_WIDGET (dialog));
 		details_dialog = NULL;
 	}