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

Proposed by Omer Akram on 2011-01-10
Status: Merged
Merge reported by: Sebastien Bacher
Merged at revision: not available
Proposed branch: lp:~om26er/ubuntu/maverick/empathy/empathy-fix-666288
Merge into: lp:ubuntu/maverick-proposed/empathy
Diff against target: 154 lines (+126/-0)
4 files modified
debian/changelog (+8/-0)
debian/patches/22_dont_display_notifications_for_pending_messages.patch (+23/-0)
debian/patches/22_tell_if_the_message_is_a_pending_one_or_not.patch (+93/-0)
debian/patches/series (+2/-0)
To merge this branch: bzr merge lp:~om26er/ubuntu/maverick/empathy/empathy-fix-666288
Reviewer Review Type Date Requested Status
Ken VanDine 2011-01-10 Approve on 2011-01-21
Andy Whitcroft Approve on 2011-01-19
Review via email: mp+45740@code.launchpad.net

Description of the change

fix bug 666288 backported two upstream commits

To post a comment you must log in.
Andy Whitcroft (apw) wrote :

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

Andy Whitcroft (apw) wrote :

As per the above this seems appropriate. Approve.

review: Approve
Ken VanDine (ken-vandine) wrote :

Merged and uploaded to maverick-proposed

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-11-16 22:01:18 +0000
3+++ debian/changelog 2011-01-10 19:44:33 +0000
4@@ -1,3 +1,11 @@
5+empathy (2.32.1-0ubuntu1.1) maverick-proposed; urgency=low
6+
7+ * debian/patches/22_tell_if_the_message_is_a_pending_one_or_not.patch:
8+ * debian/patches/22_dont_display_notifications_for_pending_messages.patch:
9+ - Don't display duplicate notifications. (LP: #666288)
10+
11+ -- Omer Akram <om26er@ubuntu.com> Tue, 11 Jan 2011 00:30:48 +0500
12+
13 empathy (2.32.1-0ubuntu1) maverick-proposed; urgency=low
14
15 * New Upstream Release
16
17=== added file 'debian/patches/22_dont_display_notifications_for_pending_messages.patch'
18--- debian/patches/22_dont_display_notifications_for_pending_messages.patch 1970-01-01 00:00:00 +0000
19+++ debian/patches/22_dont_display_notifications_for_pending_messages.patch 2011-01-10 19:44:33 +0000
20@@ -0,0 +1,23 @@
21+From: Omer Akram <om26er@ubuntu.com>
22+Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
23+Subject: Chat-window: don't display notifications for pending messages.
24+Origin: http://git.gnome.org/browse/empathy/commit/?id=16b77581e53f068035343c0daf302ffb73303134
25+Bug: https://bugs.gnome.org/635513
26+Bug-Ubuntu: https://launchpad.net/bugs/666288
27+
28+--- a//src/empathy-chat-window.c 2011-01-10 20:49:55.000000000 +0500
29++++ b//src/empathy-chat-window.c 2011-01-10 20:53:18.628355689 +0500
30+@@ -1503,7 +1503,12 @@
31+
32+ empathy_sound_play (GTK_WIDGET (priv->dialog),
33+ EMPATHY_SOUND_MESSAGE_INCOMING);
34+- chat_window_show_or_update_notification (window, message, chat);
35++
36++ /* Pending messages have already been displayed in the approver, so we don't
37++ * display a notification for those. */
38++ if (!pending)
39++ chat_window_show_or_update_notification (window, message, chat);
40++
41+ #ifdef HAVE_LIBINDICATE
42+ chat_window_add_indicator (window, message, chat);
43+ #endif
44
45=== added file 'debian/patches/22_tell_if_the_message_is_a_pending_one_or_not.patch'
46--- debian/patches/22_tell_if_the_message_is_a_pending_one_or_not.patch 1970-01-01 00:00:00 +0000
47+++ debian/patches/22_tell_if_the_message_is_a_pending_one_or_not.patch 2011-01-10 19:44:33 +0000
48@@ -0,0 +1,93 @@
49+From: Omer Akram <om26er@ubuntu.com>
50+Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
51+Subject: EmpathyChat::new-message: tell if the message is a pending one or not.
52+Origin: http://git.gnome.org/browse/empathy/commit/?id=fb049bcc5f5622b56112c947b5b571c6f0956671
53+Bug: https://bugs.gnome.org/635513
54+Bug-Ubuntu: https://launchpad.net/bugs/666288
55+
56+
57+---
58+diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
59+index dc3bb8f..0424798 100644
60+--- a/libempathy-gtk/empathy-chat.c
61++++ b/libempathy-gtk/empathy-chat.c
62+@@ -42,6 +42,7 @@
63+ #include <libempathy/empathy-gsettings.h>
64+ #include <libempathy/empathy-utils.h>
65+ #include <libempathy/empathy-dispatcher.h>
66++#include <libempathy/empathy-marshal.h>
67+
68+ #include "empathy-chat.h"
69+ #include "empathy-spell.h"
70+@@ -58,6 +59,7 @@
71+ #define DEBUG_FLAG EMPATHY_DEBUG_CHAT
72+ #include <libempathy/empathy-debug.h>
73+
74++
75+ #define CHAT_DIR_CREATE_MODE (S_IRUSR | S_IWUSR | S_IXUSR)
76+ #define CHAT_FILE_CREATE_MODE (S_IRUSR | S_IWUSR)
77+ #define IS_ENTER(v) (v == GDK_KEY_Return || v == GDK_KEY_ISO_Enter || v == GDK_KEY_KP_Enter)
78+@@ -1111,7 +1113,9 @@ chat_state_changed_cb (EmpathyTpChat *tp_chat,
79+ }
80+
81+ static void
82+-chat_message_received (EmpathyChat *chat, EmpathyMessage *message)
83++chat_message_received (EmpathyChat *chat,
84++ EmpathyMessage *message,
85++ gboolean pending)
86+ {
87+ EmpathyChatPriv *priv = GET_PRIV (chat);
88+ EmpathyContact *sender;
89+@@ -1130,7 +1134,7 @@ chat_message_received (EmpathyChat *chat, EmpathyMessage *message)
90+ chat);
91+
92+ priv->unread_messages++;
93+- g_signal_emit (chat, signals[NEW_MESSAGE], 0, message);
94++ g_signal_emit (chat, signals[NEW_MESSAGE], 0, message, pending);
95+ }
96+
97+ static void
98+@@ -1138,7 +1142,7 @@ chat_message_received_cb (EmpathyTpChat *tp_chat,
99+ EmpathyMessage *message,
100+ EmpathyChat *chat)
101+ {
102+- chat_message_received (chat, message);
103++ chat_message_received (chat, message, FALSE);
104+ }
105+
106+ static void
107+@@ -2032,7 +2036,7 @@ show_pending_messages (EmpathyChat *chat) {
108+
109+ for (l = messages; l != NULL ; l = g_list_next (l)) {
110+ EmpathyMessage *message = EMPATHY_MESSAGE (l->data);
111+- chat_message_received (chat, message);
112++ chat_message_received (chat, message, TRUE);
113+ }
114+ }
115+
116+@@ -2832,9 +2836,9 @@ empathy_chat_class_init (EmpathyChatClass *klass)
117+ G_SIGNAL_RUN_LAST,
118+ 0,
119+ NULL, NULL,
120+- g_cclosure_marshal_VOID__OBJECT,
121++ _empathy_marshal_VOID__OBJECT_BOOLEAN,
122+ G_TYPE_NONE,
123+- 1, EMPATHY_TYPE_MESSAGE);
124++ 2, EMPATHY_TYPE_MESSAGE, G_TYPE_BOOLEAN);
125+
126+ g_type_class_add_private (object_class, sizeof (EmpathyChatPriv));
127+ }
128+diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
129+index 457be5b..1eeba27 100644
130+--- a/src/empathy-chat-window.c
131++++ b/src/empathy-chat-window.c
132+@@ -1383,6 +1383,7 @@ empathy_chat_window_has_focus (EmpathyChatWindow *window)
133+ static void
134+ chat_window_new_message_cb (EmpathyChat *chat,
135+ EmpathyMessage *message,
136++ gboolean pending,
137+ EmpathyChatWindow *window)
138+ {
139+ EmpathyChatWindowPriv *priv;
140+--
141+cgit v0.8.3.1
142
143=== modified file 'debian/patches/series'
144--- debian/patches/series 2010-10-04 12:03:51 +0000
145+++ debian/patches/series 2011-01-10 19:44:33 +0000
146@@ -4,6 +4,8 @@
147 11_empathy_accounts_category.patch
148 20_libindicate.patch
149 21_login_indicators.patch
150+22_tell_if_the_message_is_a_pending_one_or_not.patch
151+22_dont_display_notifications_for_pending_messages.patch
152 31_really_raise_window.patch
153 34_start_raised_execpt_in_session.patch
154 36_chat_window_default_size.patch

Subscribers

People subscribed via source and target branches

to all changes: