Fix telepathy-glib-0.4 compatibility (bug #413423, thanks to Antoine Lemoine and Jack River). Fix a crash and do not silently fail to send messages. Drop old.

(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)

5 files changed, 160 insertions, 4 deletions

diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog
index 9db492f1d808..9c6e9472b010 100644
--- a/net-im/empathy/ChangeLog
+++ b/net-im/empathy/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-im/empathy
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.102 2012/02/14 04:57:56 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.103 2012/05/02 05:45:35 tetromino Exp $
+
+*empathy-3.2.2-r1 (02 May 2012)
+
+  02 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -empathy-3.2.1.2.ebuild, +empathy-3.2.2-r1.ebuild,
+  +files/empathy-3.2.2-cancellable-not-NULL.patch,
+  +files/empathy-3.2.2-delivery-failed.patch,
+  +files/empathy-3.2.2-telepathy-logger-0.4.patch:
+  Fix telepathy-glib-0.4 compatibility (bug #413423, thanks to Antoine Lemoine
+  and Jack River). Fix a crash and do not silently fail to send messages. Drop
+  old.
 
   14 Feb 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   empathy-3.2.1.2.ebuild, empathy-3.2.2.ebuild:
diff --git a/net-im/empathy/empathy-3.2.1.2.ebuild b/net-im/empathy/empathy-3.2.2-r1.ebuild
index 110fef95cb1e..2fa11075c6ec 100644
--- a/net-im/empathy/empathy-3.2.1.2.ebuild
+++ b/net-im/empathy/empathy-3.2.2-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.2.1.2.ebuild,v 1.4 2012/02/14 04:57:56 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.2.2-r1.ebuild,v 1.1 2012/05/02 05:45:35 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2:2.5"
 
-inherit gnome2 python
+inherit eutils gnome2 python
 
 DESCRIPTION="Telepathy client and library using GTK+"
 HOMEPAGE="http://live.gnome.org/Empathy"
@@ -41,7 +41,7 @@ RDEPEND=">=dev-libs/glib-2.28:2
 	media-libs/gstreamer:0.10
 	media-libs/gst-plugins-base:0.10
 	media-libs/gst-plugins-bad
-	>=net-im/telepathy-logger-0.2.8
+	>=net-im/telepathy-logger-0.2.13
 	net-libs/farsight2
 	>=net-libs/telepathy-farsight-0.0.14
 	net-im/telepathy-connection-managers
@@ -108,6 +108,16 @@ pkg_setup() {
 	python_pkg_setup
 }
 
+src_prepare() {
+	# In next release
+	epatch "${FILESDIR}/${P}-delivery-failed.patch"
+	epatch "${FILESDIR}/${P}-cancellable-not-NULL.patch"
+	# Fix telepathy-logger-0.4 compatibility, bug #413423; patch from 3.4
+	epatch "${FILESDIR}/${PN}-3.2.2-telepathy-logger-0.4.patch"
+
+	gnome2_src_prepare
+}
+
 src_test() {
 	unset DBUS_SESSION_BUS_ADDRESS
 	emake check
diff --git a/net-im/empathy/files/empathy-3.2.2-cancellable-not-NULL.patch b/net-im/empathy/files/empathy-3.2.2-cancellable-not-NULL.patch
new file mode 100644
index 000000000000..c58e7563a77d
--- /dev/null
+++ b/net-im/empathy/files/empathy-3.2.2-cancellable-not-NULL.patch
@@ -0,0 +1,36 @@
+From 641a6b06225cd00f62001d041316e72535662306 Mon Sep 17 00:00:00 2001
+From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
+Date: Wed, 30 Nov 2011 12:55:29 +0100
+Subject: [PATCH] ui-utils: don't expect that cancellable is not NULL
+
+cancellable are always optional so this code should be NULL safe.
+---
+ libempathy-gtk/empathy-ui-utils.c |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
+index d5f63c9..2b9f5cf 100644
+--- a/libempathy-gtk/empathy-ui-utils.c
++++ b/libempathy-gtk/empathy-ui-utils.c
+@@ -549,7 +549,8 @@ pixbuf_avatar_from_individual_closure_new (FolksIndividual    *individual,
+ 	closure->result = g_object_ref (result);
+ 	closure->width = width;
+ 	closure->height = height;
+-	closure->cancellable = g_object_ref (cancellable);
++	if (cancellable != NULL)
++		closure->cancellable = g_object_ref (cancellable);
+ 
+ 	return closure;
+ }
+@@ -558,7 +559,7 @@ static void
+ pixbuf_avatar_from_individual_closure_free (
+ 		PixbufAvatarFromIndividualClosure *closure)
+ {
+-	g_object_unref (closure->cancellable);
++	g_clear_object (&closure->cancellable);
+ 	tp_clear_object (&closure->loader);
+ 	g_object_unref (closure->individual);
+ 	g_object_unref (closure->result);
+-- 
+1.7.8.6
+
diff --git a/net-im/empathy/files/empathy-3.2.2-delivery-failed.patch b/net-im/empathy/files/empathy-3.2.2-delivery-failed.patch
new file mode 100644
index 000000000000..84c0dd841150
--- /dev/null
+++ b/net-im/empathy/files/empathy-3.2.2-delivery-failed.patch
@@ -0,0 +1,31 @@
+From 457cdd199d2aa20cbebcc25ea305137ce7b0f440 Mon Sep 17 00:00:00 2001
+From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
+Date: Tue, 22 Nov 2011 15:42:11 +0100
+Subject: [PATCH] don't ignore TP_DELIVERY_STATUS_TEMPORARILY_FAILED delivery
+ report
+
+We should display an error message as well if not the user will assume the
+message has been sent and the spinner keeps spinning.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=664564
+---
+ libempathy/empathy-tp-chat.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
+index 2285f3f..f65f25d 100644
+--- a/libempathy/empathy-tp-chat.c
++++ b/libempathy/empathy-tp-chat.c
+@@ -375,7 +375,8 @@ handle_delivery_report (EmpathyTpChat *self,
+ 		tp_chat_set_delivery_status (self, delivery_token,
+ 			EMPATHY_DELIVERY_STATUS_NONE);
+ 		goto out;
+-	} else if (delivery_status != TP_DELIVERY_STATUS_PERMANENTLY_FAILED) {
++	} else if (delivery_status != TP_DELIVERY_STATUS_PERMANENTLY_FAILED &&
++		   delivery_status != TP_DELIVERY_STATUS_TEMPORARILY_FAILED) {
+ 		goto out;
+ 	}
+ 
+-- 
+1.7.8.6
+
diff --git a/net-im/empathy/files/empathy-3.2.2-telepathy-logger-0.4.patch b/net-im/empathy/files/empathy-3.2.2-telepathy-logger-0.4.patch
new file mode 100644
index 000000000000..4ce89197bd49
--- /dev/null
+++ b/net-im/empathy/files/empathy-3.2.2-telepathy-logger-0.4.patch
@@ -0,0 +1,68 @@
+From 86ba5be5fa9a044fbcce6618ac6cd6dd7bdf3482 Mon Sep 17 00:00:00 2001
+From: Danielle Madeley <danielle.madeley@collabora.co.uk>
+Date: Tue, 3 Apr 2012 10:35:09 +1000
+Subject: [PATCH] TplCallEndReason ceased to exist on March 28
+
+---
+ libempathy-gtk/empathy-log-window.c |   11 ++++++-----
+ libempathy/empathy-message.c        |    2 +-
+ 2 files changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
+index 72d4d46..c11bb02 100644
+--- a/libempathy-gtk/empathy-log-window.c
++++ b/libempathy-gtk/empathy-log-window.c
+@@ -1236,11 +1236,11 @@ get_icon_for_event (TplEvent *event)
+   else if (TPL_IS_CALL_EVENT (event))
+     {
+       TplCallEvent *call = TPL_CALL_EVENT (event);
+-      TplCallEndReason reason = tpl_call_event_get_end_reason (call);
++      TpCallStateChangeReason reason = tpl_call_event_get_end_reason (call);
+       TplEntity *sender = tpl_event_get_sender (event);
+       TplEntity *receiver = tpl_event_get_receiver (event);
+ 
+-      if (reason == TPL_CALL_END_REASON_NO_ANSWER)
++      if (reason == TP_CALL_STATE_CHANGE_REASON_NO_ANSWER)
+         icon = EMPATHY_IMAGE_CALL_MISSED;
+       else if (tpl_entity_get_entity_type (sender) == TPL_ENTITY_SELF)
+         icon = EMPATHY_IMAGE_CALL_OUTGOING;
+@@ -1357,7 +1357,7 @@ log_window_append_call (TplEvent *event,
+       COL_EVENTS_EVENT, event,
+       -1);
+ 
+-  if (tpl_call_event_get_end_reason (call) != TPL_CALL_END_REASON_NO_ANSWER)
++  if (tpl_call_event_get_end_reason (call) != TP_CALL_STATE_CHANGE_REASON_NO_ANSWER)
+     {
+       gchar *body;
+       gchar *tmp;
+@@ -3243,11 +3243,12 @@ log_window_got_messages_for_date_cb (GObject *manager,
+             }
+           else
+             {
+-              TplCallEndReason reason = tpl_call_event_get_end_reason (call);
++              TpCallStateChangeReason reason =
++                tpl_call_event_get_end_reason (call);
+               TplEntity *sender = tpl_event_get_sender (event);
+               TplEntity *receiver = tpl_event_get_receiver (event);
+ 
+-              if (reason == TPL_CALL_END_REASON_NO_ANSWER)
++              if (reason == TP_CALL_STATE_CHANGE_REASON_NO_ANSWER)
+                 {
+                   if (ctx->subtype & EVENT_CALL_MISSED)
+                     append = TRUE;
+diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c
+index 6111bcd..a4caae1 100644
+--- a/libempathy/empathy-message.c
++++ b/libempathy/empathy-message.c
+@@ -411,7 +411,7 @@ empathy_message_from_tpl_log_event (TplEvent *logevent)
+ 
+ 		timestamp = tpl_event_get_timestamp (logevent);
+ 
+-		if (tpl_call_event_get_end_reason (call) == TPL_CALL_END_REASON_NO_ANSWER)
++		if (tpl_call_event_get_end_reason (call) == TP_CALL_STATE_CHANGE_REASON_NO_ANSWER)
+ 			body = g_strdup_printf (_("Missed call from %s"),
+ 				tpl_entity_get_alias (tpl_event_get_sender (logevent)));
+ 		else if (tpl_entity_get_entity_type (tpl_event_get_sender (logevent)) == TPL_ENTITY_SELF)
+-- 
+1.7.8.6
+