[Pkg-telepathy-commits] ./packages/unstable/telepathy-gabble r83: Avoid requiring telepathy-glib 0.7.6

[Simon McVittie]

------------------------------------------------------------
revno: 83
committer: Simon McVittie <smcv at debian.org>
branch nick: telepathy-gabble-unstable
timestamp: Mon 2008-05-12 09:27:47 +0100
message:
  Avoid requiring telepathy-glib 0.7.6
added:
  patches/00-no-call-state.diff
modified:
  changelog
-------------- next part --------------
=== modified file 'changelog'
--- a/changelog	2008-05-05 12:20:17 +0000
+++ b/changelog	2008-05-12 08:27:47 +0000
@@ -1,3 +1,11 @@
+telepathy-gabble (0.7.5-2) UNRELEASED; urgency=low
+
+  * patches/00-no-call-state.diff: Added, from upstream darcs.
+    Avoid referencing the CallState interface, so we don't have to depend on
+    telepathy-glib >= 0.7.6
+
+ -- Simon McVittie <smcv at debian.org>  Mon, 12 May 2008 09:25:20 +0100
+
 telepathy-gabble (0.7.5-1) unstable; urgency=low
 
   * New upstream version

=== added file 'patches/00-no-call-state.diff'
--- a/patches/00-no-call-state.diff	1970-01-01 00:00:00 +0000
+++ b/patches/00-no-call-state.diff	2008-05-12 08:27:47 +0000
@@ -0,0 +1,17 @@
+Fri May  9 13:14:14 BST 2008  Simon McVittie <simon.mcvittie at collabora.co.uk>
+  * Don't claim support for the CallStates interface unless we're actually compiling it (it's effectively #if 0 at the moment)
+
+diff -rN -u -p old-tmphMeJ2W/src/gabble-media-channel.c new-tmphMeJ2W/src/gabble-media-channel.c
+--- old-tmphMeJ2W/src/gabble-media-channel.c	2008-05-09 13:20:22.805431221 +0100
++++ new-tmphMeJ2W/src/gabble-media-channel.c	2008-05-09 13:20:22.849433971 +0100
+@@ -713,7 +713,9 @@ gabble_media_channel_get_interfaces (TpS
+                                      DBusGMethodInvocation *context)
+ {
+   const gchar *interfaces[] = {
++#ifdef WITH_CALL_STATE
+       TP_IFACE_CHANNEL_INTERFACE_CALL_STATE,
++#endif
+       TP_IFACE_CHANNEL_INTERFACE_GROUP,
+       GABBLE_IFACE_CHANNEL_INTERFACE_HOLD,
+       TP_IFACE_CHANNEL_INTERFACE_MEDIA_SIGNALLING,
+