From 047f48e8509652cfd7e9cf03f4fc1adf0b6e3826 Mon Sep 17 00:00:00 2001
From: Rodrigo Moya <rodrigo@gnome-db.org>
Date: Thu, 11 Nov 2010 14:28:08 +0100
Subject: [PATCH] Some build fixes

---
 panels/default-applications/Makefile.am   | 3 ++-
 panels/keyboard/Makefile.am               | 2 +-
 panels/mouse/Makefile.am                  | 2 +-
 panels/network/Makefile.am                | 2 +-
 panels/network/gnome-network-properties.c | 2 +-
 panels/region/Makefile.am                 | 2 +-
 panels/sound/Makefile.am                  | 2 ++
 panels/universal-access/Makefile.am       | 2 +-
 8 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/panels/default-applications/Makefile.am b/panels/default-applications/Makefile.am
index 543de242c..bd144b908 100644
--- a/panels/default-applications/Makefile.am
+++ b/panels/default-applications/Makefile.am
@@ -13,7 +13,8 @@ libdefault_applications_la_SOURCES = \
 
 libdefault_applications_la_LIBADD = \
 	$(PANEL_LIBS) \
-	$(XML_LIBS)
+	$(XML_LIBS) \
+	$(GNOMECC_CAPPLETS_LIBS)
 
 libdefault_applications_la_LDFLAGS = $(PANEL_LDFLAGS)
 
diff --git a/panels/keyboard/Makefile.am b/panels/keyboard/Makefile.am
index 0de3540a5..339d1c039 100644
--- a/panels/keyboard/Makefile.am
+++ b/panels/keyboard/Makefile.am
@@ -18,7 +18,7 @@ libkeyboard_la_SOURCES =   \
 	eggaccelerators.h
 
 libkeyboard_la_CFLAGS = $(PANEL_CFLAGS)
-libkeyboard_la_LIBADD = $(PANEL_LIBS)
+libkeyboard_la_LIBADD = $(PANEL_LIBS) $(GNOMECC_CAPPLETS_LIBS)
 libkeyboard_la_LDFLAGS = $(PANEL_LDFLAGS)
 
 @INTLTOOL_DESKTOP_RULE@
diff --git a/panels/mouse/Makefile.am b/panels/mouse/Makefile.am
index 4cecfe26c..7c505b75d 100644
--- a/panels/mouse/Makefile.am
+++ b/panels/mouse/Makefile.am
@@ -24,7 +24,7 @@ libmouse_properties_la_SOURCES =	\
 	gnome-mouse-accessibility.c	\
 	gnome-mouse-accessibility.h
 
-libmouse_properties_la_LIBADD = $(PANEL_LIBS) $(GSD_DBUS_LIBS)
+libmouse_properties_la_LIBADD = $(PANEL_LIBS) $(GSD_DBUS_LIBS) $(GNOMECC_CAPPLETS_LIBS)
 libmouse_properties_la_LDFLAGS = $(PANEL_LDFLAGS)
 
 @INTLTOOL_DESKTOP_RULE@
diff --git a/panels/network/Makefile.am b/panels/network/Makefile.am
index 6f74ddd25..a515ef230 100644
--- a/panels/network/Makefile.am
+++ b/panels/network/Makefile.am
@@ -9,7 +9,7 @@ libnetwork_la_SOURCES = gnome-network-properties.c \
 			cc-network-panel.c \
 			cc-network-panel.h \
 			network-module.c
-libnetwork_la_LIBADD = $(PANEL_LIBS)
+libnetwork_la_LIBADD = $(PANEL_LIBS) $(GNOMECC_CAPPLETS_LIBS)
 libnetwork_la_LDFLAGS = $(PANEL_LDFLAGS)
 
 
diff --git a/panels/network/gnome-network-properties.c b/panels/network/gnome-network-properties.c
index e77b75d4b..1f2398f65 100644
--- a/panels/network/gnome-network-properties.c
+++ b/panels/network/gnome-network-properties.c
@@ -897,7 +897,7 @@ cb_delete_button_clicked (GtkWidget *button,
 	key = g_strconcat (LOCATION_DIR "/", esc, NULL);
 	g_free (esc);
 
-	copy_location (key, "", client);
+	/* copy_location (key, "", client); */
 	gconf_client_recursive_unset (client, key,
 	                              GCONF_UNSET_INCLUDING_SCHEMA_NAMES, NULL);
 	gconf_client_suggest_sync (client, NULL);
diff --git a/panels/region/Makefile.am b/panels/region/Makefile.am
index 416ae70b5..6bd63cac6 100644
--- a/panels/region/Makefile.am
+++ b/panels/region/Makefile.am
@@ -27,7 +27,7 @@ libregion_la_SOURCES =	\
 	gnome-region-panel-xkbpv.c \
 	gnome-region-panel-xkb.h
 
-libregion_la_LIBADD = $(PANEL_LIBS) $(LIBGNOMEKBD_LIBS)
+libregion_la_LIBADD = $(PANEL_LIBS) $(LIBGNOMEKBD_LIBS) $(GNOMECC_CAPPLETS_LIBS)
 
 libregion_la_LDFLAGS = $(PANEL_LDFLAGS)
 
diff --git a/panels/sound/Makefile.am b/panels/sound/Makefile.am
index 6e8f34e00..40dcf2e15 100644
--- a/panels/sound/Makefile.am
+++ b/panels/sound/Makefile.am
@@ -63,6 +63,7 @@ gnome_sound_applet_LDADD =			\
 	libgnomevolumecontrol.la		\
 	$(CANBERRA_LIBS)			\
 	$(PULSEAUDIO_LIBS)			\
+	$(GNOMECC_CAPPLETS_LIBS)		\
 	$(NULL)
 
 gnome_sound_applet_SOURCES =			\
@@ -85,6 +86,7 @@ libsound_la_LDFLAGS =				\
 	$(CANBERRA_LIBS)			\
 	$(PULSEAUDIO_LIBS)			\
 	$(XML_LIBS)				\
+	$(GNOMECC_CAPPLETS_LIBS)		\
 	$(NULL)
 
 libsound_la_SOURCES =				\
diff --git a/panels/universal-access/Makefile.am b/panels/universal-access/Makefile.am
index 55b36e598..7ca3584a5 100644
--- a/panels/universal-access/Makefile.am
+++ b/panels/universal-access/Makefile.am
@@ -14,7 +14,7 @@ libuniversal_access_la_SOURCES =		\
 	cc-ua-panel.c	\
 	cc-ua-panel.h
 
-libuniversal_access_la_LIBADD = $(PANEL_LIBS)
+libuniversal_access_la_LIBADD = $(PANEL_LIBS) $(GNOMECC_CAPPLETS_LIBS)
 libuniversal_access_la_LDFLAGS = $(PANEL_LDFLAGS)
 
 uidir = $(pkgdatadir)/ui