← Back to branch summary

~om26er/ubuntu/natty/empathy/empathy-fix-769234

« back to all changes in this revision

Viewing changes to debian/patches/70_append_messages_in_notifications.patch

  • Committer: Omer Akram
  • Date: 2011-05-03 14:20:37 UTC
  • Revision ID: om26er@ubuntu.com-20110503142037-hvikt7nlw1a4lzh3
* debian/patches/70_append_messages_in_notifications.patch:
  - Append new messages in notifications. (LP: #769234)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/70_append_messages_in_notifications.patch
 
1
From: Omer Akram <om26er@ubuntu.com>
 
2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
 
3
Subject: set a not empty string when setting EMPATHY_NOTIFY_MANAGER_CAP_X_CANONICAL_APPEND.
 
4
Origin: http://git.gnome.org/browse/empathy/commit/?h=gnome-2-34&id=554ea28a6a158f3dee384c485f84184cf606d61c
 
5
Bug: https://bugs.gnome.org/648842
 
6
Bug-Ubuntu: https://launchpad.net/bugs/769234
 
7
 
 
8
--- a//src/empathy-chat-window.c        2011-05-03 23:58:05.000000000 +0500
 
9
+++ b//src/empathy-chat-window.c        2011-05-03 23:56:40.163246021 +0500
 
10
@@ -1452,8 +1452,9 @@
 
11
                                  G_CALLBACK (chat_window_notification_closed_cb), window, 0);
 
12
 
 
13
                if (has_x_canonical_append) {
 
14
+                        /* We have to set a not empty string to keep libnotify happy */
 
15
                        notify_notification_set_hint_string (notification,
 
16
-                               EMPATHY_NOTIFY_MANAGER_CAP_X_CANONICAL_APPEND, "");
 
17
+                               EMPATHY_NOTIFY_MANAGER_CAP_X_CANONICAL_APPEND, "1");
 
18
                }
 
19
        }
 
20
 
 
21
diff -ruN a//src/empathy-status-icon.c b//src/empathy-status-icon.c
 
22
--- a//src/empathy-status-icon.c        2011-05-03 23:58:05.000000000 +0500
 
23
+++ b//src/empathy-status-icon.c        2011-05-03 23:57:31.015245996 +0500
 
24
@@ -268,8 +268,9 @@
 
25
                                                         NOTIFY_EXPIRES_DEFAULT);
 
26
 
 
27
                        if (has_x_canonical_append) {
 
28
+                                /* We have to set a not empty string to keep libnotify happy */
 
29
                                notify_notification_set_hint_string (notification,
 
30
-                                       EMPATHY_NOTIFY_MANAGER_CAP_X_CANONICAL_APPEND, "");
 
31
+                                       EMPATHY_NOTIFY_MANAGER_CAP_X_CANONICAL_APPEND, "1");
 
32
                        }
 
33
 
 
34
                        if (empathy_notify_manager_has_capability (priv->notify_mgr,