Removed dependency on Telepathy

linuxmint · Jul 24, 2012 · 790c7ed · 790c7ed
1 parent 879b65e
commit 790c7ed
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 660 deletions.
diff --git a/configure.ac b/configure.ac
@@ -69,8 +69,6 @@ GIO_MIN_VERSION=2.29.10
 LIBECAL_MIN_VERSION=2.32.0
 LIBEDATASERVER_MIN_VERSION=1.2.0
 LIBEDATASERVERUI_MIN_VERSION=2.91.6
-TELEPATHY_GLIB_MIN_VERSION=0.15.5
-TELEPATHY_LOGGER_MIN_VERSION=0.2.4
 POLKIT_MIN_VERSION=0.100
 STARTUP_NOTIFICATION_MIN_VERSION=0.11
 
@@ -86,8 +84,6 @@ PKG_CHECK_MODULES(CINNAMON, gio-2.0 >= $GIO_MIN_VERSION
                                libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_MIN_VERSION
                                gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
 			       libcanberra
-                               telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION
-                               telepathy-logger-0.2 >= $TELEPATHY_LOGGER_MIN_VERSION
                                polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
                                libnm-glib libnm-util gnome-keyring-1)
 

diff --git a/debian/control b/debian/control
@@ -45,8 +45,6 @@ Build-Depends: cdbs,
                libecal1.2-dev (>= 2.32),
                libedataserver1.2-dev (>= 3.0.0),
                libedataserverui-3.0-dev (>= 3.0.0),
-               libtelepathy-glib-dev (>= 0.15.5),
-               libtelepathy-logger-dev (>= 0.2.4),
                libpolkit-agent-1-dev (>= 0.100),
                libjson-glib-dev (>= 0.13.2)
 Standards-Version: 3.9.1

diff --git a/debian/control.in b/debian/control.in
@@ -40,8 +40,6 @@ Build-Depends: cdbs,
                libecal1.2-dev (>= 2.32),
                libedataserver1.2-dev (>= 3.0.0),
                libedataserverui-3.0-dev (>= 3.0.0),
-               libtelepathy-glib-dev (>= 0.15.5),
-               libtelepathy-logger-dev (>= 0.2.4),
                libpolkit-agent-1-dev (>= 0.100),
                libjson-glib-dev (>= 0.13.2)
 Standards-Version: 3.9.1

diff --git a/js/ui/lookingGlass.js b/js/ui/lookingGlass.js
@@ -26,7 +26,6 @@ var commandHeader = 'const Clutter = imports.gi.Clutter; ' +
                     'const Mainloop = imports.mainloop; ' +
                     'const Meta = imports.gi.Meta; ' +
                     'const Cinnamon = imports.gi.Cinnamon; ' +
-                    'const Tp = imports.gi.TelepathyGLib; ' +
                     'const Main = imports.ui.main; ' +
                     'const Lang = imports.lang; ' +
                     'const Tweener = imports.ui.tweener; ' +

diff --git a/po/POTFILES.in b/po/POTFILES.in
@@ -33,7 +33,6 @@ js/ui/status/keyboard.js
 js/ui/status/network.js
 js/ui/status/power.js
 js/ui/status/volume.js
-js/ui/telepathyClient.js
 js/ui/userMenu.js
 js/ui/viewSelector.js
 js/ui/windowAttentionHandler.js

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -112,7 +112,6 @@ cinnamon_public_headers_h =		\
 	cinnamon-perf-log.h		\
 	cinnamon-slicer.h			\
 	cinnamon-stack.h			\
-	cinnamon-tp-client.h		\
 	cinnamon-tray-icon.h		\
 	cinnamon-tray-manager.h		\
 	cinnamon-util.h			\
@@ -150,7 +149,6 @@ libcinnamon_la_SOURCES =		\
 	cinnamon-polkit-authentication-agent.c	\
 	cinnamon-slicer.c			\
 	cinnamon-stack.c			\
-	cinnamon-tp-client.c			\
 	cinnamon-tray-icon.c		\
 	cinnamon-tray-manager.c		\
 	cinnamon-util.c			\
@@ -269,7 +267,7 @@ libcinnamon_la_LIBADD =		\
 libcinnamon_la_CPPFLAGS = $(cinnamon_cflags)
 
 Cinnamon-0.1.gir: libcinnamon.la St-1.0.gir
-Cinnamon_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
+Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 Soup-2.4 GMenu-3.0 NetworkManager-1.0 NMClient-1.0
 Cinnamon_0_1_gir_CFLAGS = $(libcinnamon_la_CPPFLAGS) -I $(srcdir)
 Cinnamon_0_1_gir_LIBS = libcinnamon.la
 Cinnamon_0_1_gir_FILES = $(libcinnamon_la_gir_sources)