Merge lp:~mortenmjelva/zeitgeist-datasources/trivia into lp:zeitgeist-datasources/0.8

[Morten Mjelva]

[Morten Mjelva (mortenmjelva)]

Typo fix after review by Seif Lotfy. Merging.

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2010-11-10 16:39:21 +0000
+++ configure.ac	2010-12-05 10:22:52 +0000
@@ -65,7 +65,7 @@
 AC_MSG_RESULT($all_plugins)
 
 # The full list of plugins
-allowed_plugins="bzr chrome eog firefox-libzg geany gedit rhythmbox totem-libzg vim emacs tomboy"
+allowed_plugins="bzr chrome eog firefox-libzg geany gedit rhythmbox totem-libzg vim emacs tomboy telepathy"
 # currently disabled = "epiphany"
 
 # npapi-plugin has a template Makefile.am, but don't use it directly
@@ -222,6 +222,8 @@
 		emacs)
 			AM_PATH_LISPDIR
 		;;
+		telepathy)
+		;;
 		*)
 			plugin_error_or_ignore "${plugin} is not handled"
 			continue
@@ -307,6 +309,10 @@
                                         		AC_CONFIG_FILES([emacs/Makefile])
                                         		continue 2
                                         	;;
+											telepathy)
+												AC_CONFIG_FILES([telepathy/Makefile])
+												continue 2
+											;;
                                         	*)
                                         		AC_MSG_ERROR([cannot configure ${allowed_plugin}])
                                         		continue 2
 
=== added file 'telepathy/Makefile.am'
--- telepathy/Makefile.am	1970-01-01 00:00:00 +0000
+++ telepathy/Makefile.am	2010-12-05 10:22:52 +0000
@@ -0,0 +1,7 @@
+servicedir = ${datadir}/dbus-1/services
+nodist_service_DATA = org.freedesktop.Telepathy.Client.Zeitgeist.service
+
+appdir = ${datadir}/telepathy/clients
+app_DATA = Zeitgeist.client
+
+bin_SCRIPTS = zeitgeist-telepathy-observer
 
=== modified file 'telepathy/org.freedesktop.Telepathy.Client.Zeitgeist.service'
--- telepathy/org.freedesktop.Telepathy.Client.Zeitgeist.service	2010-12-04 20:22:46 +0000
+++ telepathy/org.freedesktop.Telepathy.Client.Zeitgeist.service	2010-12-05 10:22:52 +0000
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.freedesktop.Telepathy.Client.Zeitgeist
-Exec=/home/seif/Projects/zeitgeist-dataproviders/telepathy/zeitgeist-telepathy-observer.py
+Exec=/usr/bin/zeitgeist-telepathy-observer
 
=== renamed file 'telepathy/zeitgeist-telepathy-observer.py' => 'telepathy/zeitgeist-telepathy-observer'