Merge lp:~om26er/ubuntu/maverick/empathy/empathy-fix-666288 into lp:ubuntu/maverick-proposed/empathy

[Omer Akram]

fix bug 666288 backported two upstream commits

[Andy Whitcroft (apw)]

Patches appear consistent with what was included in Natty. They look appropriate for an SRU request.

[Andy Whitcroft (apw)]

As per the above this seems appropriate. Approve.

review: Approve

[Ken VanDine (ken-vandine)]

Merged and uploaded to maverick-proposed

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-16 22:01:18 +0000
+++ debian/changelog	2011-01-10 19:44:33 +0000
@@ -1,3 +1,11 @@
+empathy (2.32.1-0ubuntu1.1) maverick-proposed; urgency=low
+
+  * debian/patches/22_tell_if_the_message_is_a_pending_one_or_not.patch:
+  * debian/patches/22_dont_display_notifications_for_pending_messages.patch:
+    - Don't display duplicate notifications. (LP: #666288)
+
+ -- Omer Akram <[e-mail]>  Tue, 11 Jan 2011 00:30:48 +0500
+
 empathy (2.32.1-0ubuntu1) maverick-proposed; urgency=low
 
   * New Upstream Release

=== added file 'debian/patches/22_dont_display_notifications_for_pending_messages.patch'
--- debian/patches/22_dont_display_notifications_for_pending_messages.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/22_dont_display_notifications_for_pending_messages.patch	2011-01-10 19:44:33 +0000
@@ -0,0 +1,23 @@
+From: Omer Akram <[e-mail]>
+Author: Guillaume Desmottes <[e-mail]>
+Subject: Chat-window: don't display notifications for pending messages.
+Origin: http://git.gnome.org/browse/empathy/commit/?id=16b77581e53f068035343c0daf302ffb73303134
+Bug: https://bugs.gnome.org/635513
+Bug-Ubuntu: https://launchpad.net/bugs/666288
+
+--- a//src/empathy-chat-window.c	2011-01-10 20:49:55.000000000 +0500
++++ b//src/empathy-chat-window.c	2011-01-10 20:53:18.628355689 +0500
+@@ -1503,7 +1503,12 @@
+ 
+ 		empathy_sound_play (GTK_WIDGET (priv->dialog),
+ 		    EMPATHY_SOUND_MESSAGE_INCOMING);
+-		chat_window_show_or_update_notification (window, message, chat);
++		
++		/* Pending messages have already been displayed in the approver, so we don't
++		* display a notification for those. */
++		if (!pending)
++			chat_window_show_or_update_notification (window, message, chat);
++			
+ #ifdef HAVE_LIBINDICATE
+ 		chat_window_add_indicator (window, message, chat);
+ #endif

=== added file 'debian/patches/22_tell_if_the_message_is_a_pending_one_or_not.patch'
--- debian/patches/22_tell_if_the_message_is_a_pending_one_or_not.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/22_tell_if_the_message_is_a_pending_one_or_not.patch	2011-01-10 19:44:33 +0000
@@ -0,0 +1,93 @@
+From: Omer Akram <[e-mail]>
+Author: Guillaume Desmottes <[e-mail]>
+Subject: EmpathyChat::new-message: tell if the message is a pending one or not.
+Origin: http://git.gnome.org/browse/empathy/commit/?id=fb049bcc5f5622b56112c947b5b571c6f0956671
+Bug: https://bugs.gnome.org/635513
+Bug-Ubuntu: https://launchpad.net/bugs/666288
+
+
+---
+diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
+index dc3bb8f..0424798 100644
+--- a/libempathy-gtk/empathy-chat.c
++++ b/libempathy-gtk/empathy-chat.c
+@@ -42,6 +42,7 @@
+ #include <libempathy/empathy-gsettings.h>
+ #include <libempathy/empathy-utils.h>
+ #include <libempathy/empathy-dispatcher.h>
++#include <libempathy/empathy-marshal.h>
+ 
+ #include "empathy-chat.h"
+ #include "empathy-spell.h"
+@@ -58,6 +59,7 @@
+ #define DEBUG_FLAG EMPATHY_DEBUG_CHAT
+ #include <libempathy/empathy-debug.h>
+ 
++
+ #define CHAT_DIR_CREATE_MODE  (S_IRUSR | S_IWUSR | S_IXUSR)
+ #define CHAT_FILE_CREATE_MODE (S_IRUSR | S_IWUSR)
+ #define IS_ENTER(v) (v == GDK_KEY_Return || v == GDK_KEY_ISO_Enter || v == GDK_KEY_KP_Enter)
+@@ -1111,7 +1113,9 @@ chat_state_changed_cb (EmpathyTpChat      *tp_chat,
+ }
+ 
+ static void
+-chat_message_received (EmpathyChat *chat, EmpathyMessage *message)
++chat_message_received (EmpathyChat *chat,
++	EmpathyMessage *message,
++	gboolean pending)
+ {
+ 	EmpathyChatPriv *priv = GET_PRIV (chat);
+ 	EmpathyContact  *sender;
+@@ -1130,7 +1134,7 @@ chat_message_received (EmpathyChat *chat, EmpathyMessage *message)
+ 			       chat);
+ 
+ 	priv->unread_messages++;
+-	g_signal_emit (chat, signals[NEW_MESSAGE], 0, message);
++	g_signal_emit (chat, signals[NEW_MESSAGE], 0, message, pending);
+ }
+ 
+ static void
+@@ -1138,7 +1142,7 @@ chat_message_received_cb (EmpathyTpChat  *tp_chat,
+ 			  EmpathyMessage *message,
+ 			  EmpathyChat    *chat)
+ {
+-	chat_message_received (chat, message);
++	chat_message_received (chat, message, FALSE);
+ }
+ 
+ static void
+@@ -2032,7 +2036,7 @@ show_pending_messages (EmpathyChat *chat) {
+ 
+ 	for (l = messages; l != NULL ; l = g_list_next (l)) {
+ 		EmpathyMessage *message = EMPATHY_MESSAGE (l->data);
+-		chat_message_received (chat, message);
++		chat_message_received (chat, message, TRUE);
+ 	}
+ }
+ 
+@@ -2832,9 +2836,9 @@ empathy_chat_class_init (EmpathyChatClass *klass)
+ 			      G_SIGNAL_RUN_LAST,
+ 			      0,
+ 			      NULL, NULL,
+-			      g_cclosure_marshal_VOID__OBJECT,
++			      _empathy_marshal_VOID__OBJECT_BOOLEAN,
+ 			      G_TYPE_NONE,
+-			      1, EMPATHY_TYPE_MESSAGE);
++			      2, EMPATHY_TYPE_MESSAGE, G_TYPE_BOOLEAN);
+ 
+ 	g_type_class_add_private (object_class, sizeof (EmpathyChatPriv));
+ }
+diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
+index 457be5b..1eeba27 100644
+--- a/src/empathy-chat-window.c
++++ b/src/empathy-chat-window.c
+@@ -1383,6 +1383,7 @@ empathy_chat_window_has_focus (EmpathyChatWindow *window)
+ static void
+ chat_window_new_message_cb (EmpathyChat       *chat,
+ 			    EmpathyMessage    *message,
++			    gboolean pending,
+ 			    EmpathyChatWindow *window)
+ {
+ 	EmpathyChatWindowPriv *priv;
+--
+cgit v0.8.3.1

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-10-04 12:03:51 +0000
+++ debian/patches/series	2011-01-10 19:44:33 +0000
@@ -4,6 +4,8 @@
 11_empathy_accounts_category.patch
 20_libindicate.patch
 21_login_indicators.patch
+22_tell_if_the_message_is_a_pending_one_or_not.patch
+22_dont_display_notifications_for_pending_messages.patch
 31_really_raise_window.patch
 34_start_raised_execpt_in_session.patch
 36_chat_window_default_size.patch