[telepathy-mission-control/master] fd.o #22332: libmissioncontrol-server: remove unnecessary gconf dependency

[Simon McVittie]

libmissioncontrol-server no longer has anything to do with GConf.

In the case where plugins are enabled, this requires promoting the GModule
dependency from libmissioncontrol-server.la to libmcd-convenience.la:
previously, libmcd-convenience.la implicitly had a GModule dependency
anyway, via GConf, which masked this mistake.
---
 mission-control.pc.in |    2 +-
 src/Makefile.am       |    8 +++-----
 src/mcd-master.c      |    1 -
 src/mcd-service.c     |    1 -
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/mission-control.pc.in b/mission-control.pc.in
index 0c72e14..fdc15e0 100644
--- a/mission-control.pc.in
+++ b/mission-control.pc.in
@@ -7,7 +7,7 @@ pluginlibdir=@pluginlibdir@
 Name: mission-control
 Description:  Mission control filters interface library
 Requires: dbus-1 >= 0.50
-Requires.private: libmcclient, telepathy-glib, gconf-2.0, dbus-1, dbus-glib-1, gmodule-2.0, glib-2.0, gobject-2.0
+Requires.private: libmcclient, telepathy-glib, dbus-1, dbus-glib-1, gmodule-2.0, glib-2.0, gobject-2.0
 Version: @VERSION@
 Libs: -L${libdir} -lmissioncontrol-server
 Cflags: -I${includedir}/mission-control
diff --git a/src/Makefile.am b/src/Makefile.am
index ed40fb8..2adbb41 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,4 @@
 INCLUDES = \
-	   $(GCONF_CFLAGS) \
 	   $(TELEPATHY_CFLAGS) \
 	   $(DBUS_CFLAGS) \
 	   $(GLIB_CFLAGS) \
@@ -73,7 +72,6 @@ CLEANFILES = $(BUILT_SOURCES)
 
 libmcd_convenience_la_LIBADD = \
 	$(top_builddir)/libmcclient/libmcclient.la \
-	$(GCONF_LIBS) \
 	$(TELEPATHY_LIBS) \
 	$(DBUS_LIBS) \
 	$(GLIB_LIBS)
@@ -85,9 +83,7 @@ if ENABLE_PLUGINS
 # that wraps the convenience library
 lib_LTLIBRARIES = libmissioncontrol-server.la
 libmissioncontrol_server_la_SOURCES =
-libmissioncontrol_server_la_LIBADD = \
-	libmcd-convenience.la \
-	$(GMODULE_LIBS)
+libmissioncontrol_server_la_LIBADD = libmcd-convenience.la
 
 libmissioncontrol_server_la_LDFLAGS = \
 	-export-symbols-regex '^((mc_)|(mcd_)|(mission_control_))'
@@ -106,6 +102,8 @@ mission_control_include_HEADERS = $(mc_headers)
 genincludedir = $(mission_control_includedir)/_gen
 nodist_geninclude_HEADERS = $(mc_gen_headers)
 
+# We need GModule to load plugins
+libmcd_convenience_la_LIBADD += $(GMODULE_LIBS)
 INCLUDES += \
 	$(GMODULE_CFLAGS) \
 	-DMCD_DEFAULT_FILTER_PLUGIN_DIR=\"@pluginlibdir@\"
diff --git a/src/mcd-master.c b/src/mcd-master.c
index 308f9a5..fe565fd 100644
--- a/src/mcd-master.c
+++ b/src/mcd-master.c
@@ -51,7 +51,6 @@
 #include <config.h>
 
 #include <glib/gi18n.h>
-#include <gconf/gconf-client.h>
 #include <gmodule.h>
 #include <string.h>
 #include <dbus/dbus.h>
diff --git a/src/mcd-service.c b/src/mcd-service.c
index 997c716..5200dce 100644
--- a/src/mcd-service.c
+++ b/src/mcd-service.c
@@ -48,7 +48,6 @@
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
 #include <dbus/dbus.h>
-#include <gconf/gconf-client.h>
 
 #include "mcd-signals-marshal.h"
 #include "mcd-dispatcher.h"
-- 
1.5.6.5