[Pkg-telepathy-commits] [SCM] Empathy packaging branch, debian, updated. debian/3.4.2.3-3
Simon McVittie
smcv at debian.org
Mon May 13 13:10:17 UTC 2013
The following commit has been merged in the debian branch:
commit 9e6aad049d5a42f03ea03b65001f67fe9019b3c8
Author: Simon McVittie <smcv at debian.org>
Date: Mon May 13 09:24:05 2013 +0100
Backport patch from upstream 3.8 branch to avoid a crash now that Google Talk vCards can contain a (read-only) <URL> field, which is not flagged as supported in telepathy-gabble. (Closes: #706900)
diff --git a/debian/changelog b/debian/changelog
index b53ccd8..1a6c647 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+empathy (3.4.2.3-3) unstable; urgency=low
+
+ * Backport patch from upstream 3.8 branch to avoid a crash now that
+ Google Talk vCards can contain a (read-only) <URL> field, which is
+ not flagged as supported in telepathy-gabble. (Closes: #706900)
+
+ -- Simon McVittie <smcv at debian.org> Mon, 13 May 2013 09:10:18 +0100
+
empathy (3.4.2.3-2) unstable; urgency=low
* Apply patch from upstream 3.5.5 to accept Windows Live's TLS certificate,
diff --git a/debian/patches/0002-Fix-crash-when-displaying-google-account-vcard.patch b/debian/patches/0002-Fix-crash-when-displaying-google-account-vcard.patch
new file mode 100644
index 0000000..2b2cff3
--- /dev/null
+++ b/debian/patches/0002-Fix-crash-when-displaying-google-account-vcard.patch
@@ -0,0 +1,33 @@
+From: Xavier Claessens <xavier.claessens at collabora.co.uk>
+Date: Tue, 7 May 2013 15:14:48 +0200
+Subject: Fix crash when displaying google account vcard
+
+Origin: backport, commit:add79d54e, 3.8.2
+Backported-by: Simon McVittie <smcv at debian.org>
+Bug-Debian: http://bugs.debian.org/706900
+---
+ libempathy-gtk/empathy-contact-widget.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
+index 5691891..8b37b7d 100644
+--- a/libempathy-gtk/empathy-contact-widget.c
++++ b/libempathy-gtk/empathy-contact-widget.c
+@@ -342,6 +342,17 @@ contact_widget_details_update_edit (EmpathyContactWidget *information)
+ {
+ TpContactInfoField *field = l->data;
+
++ /* For some reason it can happen that the vCard contains fields the CM
++ * claims to be not supported. This is a workaround for gabble bug
++ * https://bugs.freedesktop.org/show_bug.cgi?id=64319. But we shouldn't
++ * crash on buggy CM anyway. */
++ if (get_spec_from_list (specs, field->field_name) == NULL)
++ {
++ DEBUG ("Buggy CM: self's vCard contains %s field but it is not in "
++ "Connection' supported fields", field->field_name);
++ continue;
++ }
++
+ /* make a copy for the details_to_set list */
+ field = tp_contact_info_field_copy (field);
+ DEBUG ("Field %s is in our vCard", field->field_name);
diff --git a/debian/patches/series b/debian/patches/series
index 21b15ed..17248fa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
0001-GOA-set-param-extra-certificate-identities-for-Windo.patch
+0002-Fix-crash-when-displaying-google-account-vcard.patch
--
Empathy packaging
More information about the Pkg-telepathy-commits
mailing list