summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeif Lotfy <seif@lotfy.com>2012-06-26 13:06:30 +0200
committerSeif Lotfy <seif@lotfy.com>2012-06-26 13:06:30 +0200
commitf3ed8e83ad2277b73b9a13accc42540ae66b3096 (patch)
treedd7463fde8e0d698d73b95ba75fb1bb01501e922
parent011cb860671cc734f1d2aca37f77f2fd16885d32 (diff)
Add Telepathy observer support
-rw-r--r--configure.ac8
-rw-r--r--src/Makefile.am4
-rw-r--r--src/zeitgeist-datahub.vala1
3 files changed, 10 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index a6269ba..5b2a4cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ AC_STDC_HEADERS
dnl ==============================================
dnl Check for vala
dnl ==============================================
-AM_PROG_VALAC([0.11.2])
+AM_PROG_VALAC([0.16.0])
AM_SILENT_RULES([yes])
@@ -64,9 +64,11 @@ dnl Check that we meet the dependencies
dnl ==============================================
MIN_GLIB_VERSION=2.26.0
MIN_GTK_VERSION=2.16.0
-MIN_ZEITGEIST_VERSION=0.3.3
+MIN_ZEITGEIST_VERSION=0.3.18
+MIN_TP_GLIB_VERSION=0.18.0
+MIN_JSON_GLIB_VERSION=0.14.2
-LIBRARY_MODULES="glib-2.0 >= $MIN_GLIB_VERSION gobject-2.0 gio-2.0 gio-unix-2.0 zeitgeist-1.0 >= $MIN_ZEITGEIST_VERSION"
+LIBRARY_MODULES="glib-2.0 >= $MIN_GLIB_VERSION gobject-2.0 gio-2.0 gio-unix-2.0 zeitgeist-1.0 >= $MIN_ZEITGEIST_VERSION telepathy-glib >= $MIN_TP_GLIB_VERSION json-glib-1.0 >= $MIN_JSON_GLIB_VERSION"
PKG_CHECK_MODULES(DATAHUB_MODULES, [$LIBRARY_MODULES])
PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= $MIN_GTK_VERSION])
diff --git a/src/Makefile.am b/src/Makefile.am
index a7e9363..de5d208 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,11 +1,14 @@
AM_CPPFLAGS = \
-include $(CONFIG_HEADER) \
+ $(pkg_check_modules) \
$(NULL)
VALAFLAGS = \
--pkg gio-2.0 \
--pkg gio-unix-2.0 \
--pkg gtk+-2.0 \
+ --pkg json-glib-1.0 \
+ --pkg telepathy-glib \
--pkg zeitgeist-1.0 \
glib-extra.vapi \
$(top_srcdir)/config.vapi \
@@ -23,6 +26,7 @@ zeitgeist_datahub_SOURCES = \
downloads-directory-provider.vala \
kde-recent-document-provider.vala \
recent-manager-provider.vala \
+ telepathy-observer.vala \
utils.vala \
zeitgeist-datahub.vala \
$(optional_zeitgeist_datahub_SOURCES) \
diff --git a/src/zeitgeist-datahub.vala b/src/zeitgeist-datahub.vala
index dea323b..a336cbb 100644
--- a/src/zeitgeist-datahub.vala
+++ b/src/zeitgeist-datahub.vala
@@ -111,6 +111,7 @@ public class DataHub : Object, DataHubService
*/
providers.prepend (new RecentManagerGtk (this));
providers.prepend (new RecentDocumentsKDE (this));
+ providers.prepend (new TelepathyObserver (this));
if (Config.DOWNLOADS_MONITOR_ENABLED)
providers.prepend (new DownloadsDirectoryMonitor (this));