[Pkg-telepathy-commits] ./packages/experimental/telepathy-gabble r91: Pull in 01fixmarshaller.patch, from upstream via Ubuntu intrepid

[Simon McVittie]

------------------------------------------------------------
revno: 91
committer: Simon McVittie <smcv at debian.org>
branch nick: telepathy-gabble-experimental
timestamp: Wed 2008-08-06 12:06:30 +0100
message:
  Pull in 01fixmarshaller.patch, from upstream via Ubuntu intrepid
added:
  patches/01fixmarshaller.patch
modified:
  changelog
-------------- next part --------------
=== modified file 'changelog'
--- a/changelog	2008-07-31 15:21:47 +0000
+++ b/changelog	2008-08-06 11:06:30 +0000
@@ -1,3 +1,11 @@
+telepathy-gabble (0.7.7-2) UNRELEASED; urgency=low
+
+  * debian/patches/01fixmarshaller.patch: Fix assertion failure when using
+    GLib 2.17's pedantic signal marshallers (patch from upstream darcs,
+    via Ubuntu; fd.o #16963).
+
+ -- Simon McVittie <smcv at debian.org>  Wed, 06 Aug 2008 12:03:23 +0100
+
 telepathy-gabble (0.7.7-1) experimental; urgency=low
 
   * New upstream release

=== added file 'patches/01fixmarshaller.patch'
--- a/patches/01fixmarshaller.patch	1970-01-01 00:00:00 +0000
+++ b/patches/01fixmarshaller.patch	2008-08-06 11:06:30 +0000
@@ -0,0 +1,15 @@
+Mon Aug  4 19:57:46 BST 2008  Simon McVittie <simon.mcvittie at collabora.co.uk>
+  * Use pedantically correct marshaller for a GArray, because GObject 2.17 actually checks for this :-(
+diff -rN -u old-telepathy-gabble/src/presence-cache.c new-telepathy-gabble/src/presence-cache.c
+--- old-telepathy-gabble/src/presence-cache.c	2008-08-05 07:18:44.578811391 +0100
++++ new-telepathy-gabble/src/presence-cache.c	2008-08-05 07:18:44.618813891 +0100
+@@ -297,7 +297,7 @@
+     G_SIGNAL_RUN_LAST,
+     0,
+     NULL, NULL,
+-    g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, DBUS_TYPE_G_UINT_ARRAY);
++    g_cclosure_marshal_VOID__BOXED, G_TYPE_NONE, 1, DBUS_TYPE_G_UINT_ARRAY);
+   signals[NICKNAME_UPDATE] = g_signal_new (
+     "nickname-update",
+     G_TYPE_FROM_CLASS (klass),
+