rishi pushed to telepathy-haze (master). "Don't crash if a contact is already in the roster (FDO #47005)"

[notifications at fedoraproject.org]

>From 756d98ead74e73871c2db7456a7d227c035fe86a Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir at gnome.org>
Date: Wed, 6 May 2015 11:11:27 +0200
Subject: Don't crash if a contact is already in the roster (FDO #47005)


diff --git a/0001-contact-list-Don-t-crash-if-a-contact-is-already-in-.patch b/0001-contact-list-Don-t-crash-if-a-contact-is-already-in-.patch
new file mode 100644
index 0000000..2c480bb
--- /dev/null
+++ b/0001-contact-list-Don-t-crash-if-a-contact-is-already-in-.patch
@@ -0,0 +1,28 @@
+From 83589722731dde63118104f75c9ab89f66b21c21 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir at freedesktop.org>
+Date: Tue, 28 Apr 2015 19:13:39 +0200
+Subject: [PATCH] contact-list: Don't crash if a contact is already in the
+ roster
+
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=47005
+---
+ src/contact-list.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/contact-list.c b/src/contact-list.c
+index fc46de8..710ed19 100644
+--- a/src/contact-list.c
++++ b/src/contact-list.c
+@@ -532,7 +532,8 @@ haze_contact_list_request_subscription (HazeContactList *self,
+   /* If the buddy already exists, then it should already be on the
+    * subscribe list.
+    */
+-  g_assert (purple_find_buddy (account, bname) == NULL);
++  if (purple_find_buddy (account, bname) != NULL)
++    return;
+ 
+   buddy = purple_buddy_new (account, bname, NULL);
+ 
+-- 
+2.1.0
+
diff --git a/telepathy-haze.spec b/telepathy-haze.spec
index fc63373..48b4354 100644
--- a/telepathy-haze.spec
+++ b/telepathy-haze.spec
@@ -1,6 +1,6 @@
 Name:		telepathy-haze
 Version:	0.8.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	A multi-protocol Libpurple connection manager for Telepathy
 
 Group:		Applications/Communications
@@ -9,6 +9,9 @@ URL:		http://developer.pidgin.im/wiki/Telepathy
 
 Source0:	http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
 
+# https://bugs.freedesktop.org/show_bug.cgi?id=47005
+Patch0:		0001-contact-list-Don-t-crash-if-a-contact-is-already-in-.patch
+
 BuildRequires:	dbus-python
 BuildRequires:	libpurple-devel >= 2.7
 BuildRequires:	pygobject2
@@ -28,6 +31,7 @@ others will probably work too.
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -53,6 +57,9 @@ make check
 
 
 %changelog
+* Wed May 06 2015 Debarshi Ray <rishi at fedoraproject.org> - 0.8.0-4
+- Don't crash if a contact is already in the roster (FDO #47005)
+
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/telepathy-haze.git/commit/?h=master&id=756d98ead74e73871c2db7456a7d227c035fe86a