[empathy: 1/2] Remove control centre plugin

[Danielle Madeley <daniellem src gnome org>]

commit 5bc58b637fe191eabddef9517e4a810e6f667baa
Author: Danielle Madeley <danielle madeley collabora co uk>
Date:   Fri Sep 2 12:27:04 2011 +1000

    Remove control centre plugin
    
    GNOME no longer supports control centre plugins, and it was decided at the
    hackfest that empathy-accounts should not appear in the control centre.

 configure.ac                    |   41 -------
 src/Makefile.am                 |   31 -----
 src/cc-empathy-accounts-panel.c |  246 ---------------------------------------
 src/cc-empathy-accounts-panel.h |   55 ---------
 src/empathy-accounts-module.c   |   40 -------
 5 files changed, 0 insertions(+), 413 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 94ba3fe..f9a89cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,7 +57,6 @@ LIBCHAMPLAIN_GTK_REQUIRED=0.7.1
 LIBCHAMPLAIN_REQUIRED=0.9
 NAUTILUS_SENDTO_REQUIRED=2.90.0
 NETWORK_MANAGER_REQUIRED=0.7.0
-GNOME_CONTROL_CENTER_REQUIRED=2.31.4
 
 # Use --enable-maintainer-mode to disable deprecated symbols,
 # disable single include and enable GSEAL. If this is not a released empathy,
@@ -579,45 +578,6 @@ fi
 
 AM_CONDITIONAL(HAVE_NST, test "x$have_nst" = "xyes")
 
-# -----------------------------------------------------------
-# new, single-window control center
-# -----------------------------------------------------------
-AC_ARG_ENABLE(control_center_embedding,
-              AS_HELP_STRING([--enable-control-center-embedding=@<:@no/yes/auto@:>@],
-                             [Enable support for single-window control center]),
-                             , enable_control_center_embedding=auto)
-
-if test "x$enable_control_center_embedding" != "xno"; then
-
-   PKG_CHECK_MODULES(CONTROL_CENTER_EMBEDDING, [libgnome-control-center >= GNOME_CONTROL_CENTER_REQUIRED],
-        have_control_center_embedding="yes", have_control_center_embedding="no")
-
-   if test "x$have_control_center_embedding" = "xyes"; then
-      AC_DEFINE(HAVE_CONTROL_CENTER_EMBEDDING, 1, [Define if you have the single-window control center])
-
-      AC_MSG_CHECKING([gnome-control-center extension dir])
-      CONTROL_CENTER_EXTENSIONDIR=`$PKG_CONFIG --variable=extensiondir libgnome-control-center`
-      if test "x$CONTROL_CENTER_EXTENSIONDIR" = "x"; then
-          AC_MSG_ERROR([Could not determine extensiondir])
-      else
-          AC_MSG_RESULT([$CONTROL_CENTER_EXTENSIONDIR])
-      fi
-      AC_SUBST(CONTROL_CENTER_EXTENSIONDIR)
-   fi
-else
-   have_control_center_embedding="no"
-fi
-
-if test "x$enable_control_center_embedding" = "xyes" -a "x$have_control_center_embedding" != "xyes"; then
-   AC_MSG_ERROR([Could not find single-window control center dependencies:
-
-$CONTROL_CENTER_EMBEDDING_PKG_ERRORS])
-fi
-
-AM_CONDITIONAL(HAVE_CONTROL_CENTER_EMBEDDING, test "x$have_control_center_embedding" = "xyes")
-AC_SUBST(CONTROL_CENTER_EMBEDDING_CFLAGS)
-AC_SUBST(CONTROL_CENTER_EMBEDDING_LIBS)
-
 # Optional dependency for avatar selection
 AC_ARG_WITH([cheese],
             AS_HELP_STRING([--with-cheese],
@@ -687,7 +647,6 @@ Configure summary:
 	Location awareness (Geoclue):  ${have_geoclue}
 	Geocode support (Geocode)...:  ${have_geocode}
 	Meego widgets...............:  ${have_meego}
-	Control center embedding....:  ${have_control_center_embedding}
 	Cheese webcam support ......:  ${have_cheese}
 	Camera monitoring...........:  ${have_gudev}
 
diff --git a/src/Makefile.am b/src/Makefile.am
index cc4eebe..40be88c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -48,31 +48,6 @@ libempathy_accounts_common_la_LIBADD =					\
         $(LIBCHAMPLAIN_LIBS)						\
 	$(NULL)
 
-if HAVE_CONTROL_CENTER_EMBEDDING
-ccmodulesdir = $(CONTROL_CENTER_EXTENSIONDIR)
-ccmodules_LTLIBRARIES = libempathy-accounts-panel.la
-
-libempathy_accounts_panel_la_SOURCES =				\
-	empathy-accounts-module.c				\
-	cc-empathy-accounts-panel.c				\
-	cc-empathy-accounts-panel.h				\
-	$(NULL)
-
-libempathy_accounts_panel_la_CPPFLAGS =				\
-	$(CPPFLAGS_COMMON)					\
-	$(CONTROL_CENTER_EMBEDDING_CFLAGS)			\
-	-DLOCALEDIR=\""$(datadir)/locale"\"			\
-	$(NULL)
-
-libempathy_accounts_panel_la_LDFLAGS = -export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_io_module_(load|unload)'
-
-libempathy_accounts_panel_la_LIBADD =				\
-	$(EMPATHY_LIBS)						\
-	$(CONTROL_CENTER_EMBEDDING_LIBS)			\
-	libempathy-accounts-common.la				\
-	$(NULL)
-endif
-
 bin_PROGRAMS =			\
 	empathy			\
 	empathy-accounts	\
@@ -268,12 +243,6 @@ EXTRA_DIST +=					\
 	empathy-map-view.ui
 endif
 
-if !HAVE_CONTROL_CENTER_EMBEDDING
-EXTRA_DIST += $(libempathy_accounts_panel_la_SOURCES)
-else
-check_c_sources += $(libempathy_accounts_panel_la_SOURCES)
-endif
-
 dist_man_MANS =			\
 	empathy.1 \
 	empathy-accounts.1