[gnome-shell] shell: Remove ContactSystem

[Florian MÃllner <fmuellner src gnome org>]

commit 970b9deeaa14471a7496dcd6cf5b32d4d41420d9
Author: Florian MÃllner <fmuellner gnome org>
Date:   Mon Jun 11 15:18:17 2012 +0200

    shell: Remove ContactSystem
    
    Remove the now unused ShellContactSystem. As a side effect, we no
    longer depend on folks now.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=677442

 configure.ac               |   17 --
 js/Makefile.am             |    1 -
 js/misc/config.js.in       |    2 -
 src/Makefile.am            |   11 -
 src/shell-contact-system.c |  490 --------------------------------------------
 src/shell-contact-system.h |   53 -----
 6 files changed, 0 insertions(+), 574 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index cea22db..d5875f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,7 +64,6 @@ CLUTTER_MIN_VERSION=1.9.16
 GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
 GJS_MIN_VERSION=1.33.2
 MUTTER_MIN_VERSION=3.5.3
-FOLKS_MIN_VERSION=0.5.2
 GTK_MIN_VERSION=3.3.9
 GIO_MIN_VERSION=2.31.6
 LIBECAL_MIN_VERSION=3.5.3
@@ -78,27 +77,11 @@ GCR_MIN_VERSION=3.3.90
 GNOME_DESKTOP_REQUIRED_VERSION=3.5.1
 GNOME_MENUS_REQUIRED_VERSION=3.5.3
 
-AC_ARG_WITH(folks,
-            AS_HELP_STRING([--with-folks],
-                           [Enable folks support]),
-            [with_folks=$withval], [with_folks=yes])
-
-if test x${with_folks} = xyes; then
-  FOLKS_REQUIREMENT="folks >= $FOLKS_MIN_VERSION"
-  AC_DEFINE([HAVE_FOLKS], [1], [folks support])
-  AC_SUBST([HAVE_FOLKS],[1])
-else
-  FOLKS_REQUIREMENT=
-  AC_SUBST([HAVE_FOLKS],[0])
-fi
-AM_CONDITIONAL(BUILD_WITH_FOLKS, test x${with_folks} = xyes)
-
 # Collect more than 20 libraries for a prize!
 PKG_CHECK_MODULES(GNOME_SHELL, gio-unix-2.0 >= $GIO_MIN_VERSION
 			       libxml-2.0
                                gtk+-3.0 >= $GTK_MIN_VERSION
                                atk-bridge-2.0
-			       $FOLKS_REQUIREMENT
                                libmutter >= $MUTTER_MIN_VERSION
                                gjs-internals-1.0 >= $GJS_MIN_VERSION
 			       libgnome-menu-3.0 >= $GNOME_MENUS_REQUIRED_VERSION
diff --git a/js/Makefile.am b/js/Makefile.am
index 0b98cbd..a3a7301 100644
--- a/js/Makefile.am
+++ b/js/Makefile.am
@@ -6,7 +6,6 @@ misc/config.js: misc/config.js.in Makefile
 	[ -d $(@D) ] || $(mkdir_p) $(@D) ; \
 	sed -e "s|[ ]PACKAGE_NAME@|$(PACKAGE_NAME)|g" \
 	    -e "s|[ ]PACKAGE_VERSION@|$(PACKAGE_VERSION)|g" \
-	    -e "s|[ ]HAVE_FOLKS@|$(HAVE_FOLKS)|g" \
 	    -e "s|[ ]HAVE_BLUETOOTH@|$(HAVE_BLUETOOTH)|g" \
 	    -e "s|[ ]GETTEXT_PACKAGE@|$(GETTEXT_PACKAGE)|g" \
 	    -e "s|[ ]datadir@|$(datadir)|g" \
diff --git a/js/misc/config.js.in b/js/misc/config.js.in
index 33a7a54..9769104 100644
--- a/js/misc/config.js.in
+++ b/js/misc/config.js.in
@@ -6,8 +6,6 @@ const PACKAGE_NAME = '@PACKAGE_NAME@';
 const PACKAGE_VERSION = '@PACKAGE_VERSION@';
 /* 1 if gnome-bluetooth is available, 0 otherwise */
 const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@;
-/* 1 if folks is available, 0 otherwise */
-const HAVE_FOLKS = @HAVE_FOLKS@;
 /* gettext package */
 const GETTEXT_PACKAGE = '@GETTEXT_PACKAGE@';
 /* locale dir */
diff --git a/src/Makefile.am b/src/Makefile.am
index a585cf8..99251af 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -131,10 +131,6 @@ shell_public_headers_h =		\
 	shell-wm.h			\
 	shell-xfixes-cursor.h
 
-if BUILD_WITH_FOLKS
-shell_public_headers_h += shell-contact-system.h
-endif
-
 shell_private_sources = \
 	gactionmuxer.h			\
 	gactionmuxer.c			\
@@ -187,10 +183,6 @@ libgnome_shell_la_SOURCES =		\
 	shell-xfixes-cursor.c		\
 	$(NULL)
 
-if BUILD_WITH_FOLKS
-libgnome_shell_la_SOURCES += shell-contact-system.c
-endif
-
 libgnome_shell_la_gir_sources = \
 	$(filter-out %-private.h $(shell_private_sources), $(shell_public_headers_h) $(libgnome_shell_la_SOURCES))
 
@@ -307,9 +299,6 @@ libgnome_shell_la_CPPFLAGS = $(gnome_shell_cflags)
 
 Shell-0.1.gir: libgnome-shell.la St-1.0.gir
 Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2 Soup-2.4 GMenu-3.0 NetworkManager-1.0 NMClient-1.0
-if BUILD_WITH_FOLKS
-Shell_0_1_gir_INCLUDES += Folks-0.6
-endif
 Shell_0_1_gir_CFLAGS = $(libgnome_shell_la_CPPFLAGS) -I $(srcdir)
 Shell_0_1_gir_LIBS = libgnome-shell.la
 Shell_0_1_gir_FILES = $(libgnome_shell_la_gir_sources)