[Pkg-telepathy-commits] [SCM] telepathy-gabble packaging branch, debian, updated. debian/0.8.1-2-5-g4a65fe1

[Jonny Lamb]

The following commit has been merged in the debian branch:
commit 6f36e37fa7b39765d6eab172113c1334ac19c308
Author: Jonny Lamb <jonny at debian.org>
Date:   Tue Sep 8 14:41:44 2009 +0100

    debian/patches/: 0001-Fix-a-crash-when-advertising-tube-caps-without-Servi.patch: Removed as is in new upstream.
    
    Signed-off-by: Jonny Lamb <jonny at debian.org>

diff --git a/debian/changelog b/debian/changelog
index c050f1f..6b5d113 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 telepathy-gabble (0.8.2-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * debian/patches/:
+    + 0001-Fix-a-crash-when-advertising-tube-caps-without-Servi.patch:
+      Removed as is in new upstream.
 
- -- Jonny Lamb <jonny at debian.org>  Tue, 08 Sep 2009 14:37:08 +0100
+ -- Jonny Lamb <jonny at debian.org>  Tue, 08 Sep 2009 14:41:10 +0100
 
 telepathy-gabble (0.8.1-2) unstable; urgency=low
 
diff --git a/debian/patches/0001-Fix-a-crash-when-advertising-tube-caps-without-Servi.patch b/debian/patches/0001-Fix-a-crash-when-advertising-tube-caps-without-Servi.patch
deleted file mode 100644
index 1df0fe1..0000000
--- a/debian/patches/0001-Fix-a-crash-when-advertising-tube-caps-without-Servi.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 2305ded1dc04e93b944c95aaabaf5a95efb3302d Mon Sep 17 00:00:00 2001
-From: Sjoerd Simons <sjoerd.simons at collabora.co.uk>
-Date: Fri, 28 Aug 2009 21:14:10 +0100
-Subject: [PATCH] Fix a crash when advertising tube caps without Service{,Name}
-
----
- src/private-tubes-factory.c |   22 ++++++++++++++--------
- 1 files changed, 14 insertions(+), 8 deletions(-)
-
-diff --git a/src/private-tubes-factory.c b/src/private-tubes-factory.c
-index 5a10640..42f9d93 100644
---- a/src/private-tubes-factory.c
-+++ b/src/private-tubes-factory.c
-@@ -888,20 +888,26 @@ gabble_private_tubes_factory_add_cap (GabbleCapsChannelManager *manager,
-       Feature *feat = g_new0 (Feature, 1);
-       gchar *service = g_strdup (tp_asv_get_string (cap,
-           TP_IFACE_CHANNEL_TYPE_STREAM_TUBE ".Service"));
--      feat->feature_type = FEATURE_OPTIONAL;
--      feat->ns = g_strdup_printf ("%s/stream#%s", NS_TUBES, service);
--      feat->caps = 0;
--      g_hash_table_insert (caps->stream_tube_caps, service, feat);
-+      if (service != NULL)
-+        {
-+          feat->feature_type = FEATURE_OPTIONAL;
-+          feat->ns = g_strdup_printf ("%s/stream#%s", NS_TUBES, service);
-+          feat->caps = 0;
-+          g_hash_table_insert (caps->stream_tube_caps, service, feat);
-+        }
-     }
-   else if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_DBUS_TUBE))
-     {
-       Feature *feat = g_new0 (Feature, 1);
-       gchar *service = g_strdup (tp_asv_get_string (cap,
-           TP_IFACE_CHANNEL_TYPE_DBUS_TUBE ".ServiceName"));
--      feat->feature_type = FEATURE_OPTIONAL;
--      feat->ns = g_strdup_printf ("%s/dbus#%s", NS_TUBES, service);
--      feat->caps = 0;
--      g_hash_table_insert (caps->dbus_tube_caps, service, feat);
-+      if (service != NULL)
-+        {
-+          feat->feature_type = FEATURE_OPTIONAL;
-+          feat->ns = g_strdup_printf ("%s/dbus#%s", NS_TUBES, service);
-+          feat->caps = 0;
-+          g_hash_table_insert (caps->dbus_tube_caps, service, feat);
-+        }
-     }
- }
- 

-- 
telepathy-gabble packaging