aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-04-29 23:53:17 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-05-02 16:56:11 +0800
commit7078e93bbcd562175248a8fdf752f2fa92f1171c (patch)
tree1d0ff67eac0b5412925e4fc258785fd076bcb7bc
parent85058e4e3f88412683771172f7dace66366ad069 (diff)
downloadgsoc2013-empathy-7078e93bbcd562175248a8fdf752f2fa92f1171c.tar
gsoc2013-empathy-7078e93bbcd562175248a8fdf752f2fa92f1171c.tar.gz
gsoc2013-empathy-7078e93bbcd562175248a8fdf752f2fa92f1171c.tar.bz2
gsoc2013-empathy-7078e93bbcd562175248a8fdf752f2fa92f1171c.tar.lz
gsoc2013-empathy-7078e93bbcd562175248a8fdf752f2fa92f1171c.tar.xz
gsoc2013-empathy-7078e93bbcd562175248a8fdf752f2fa92f1171c.tar.zst
gsoc2013-empathy-7078e93bbcd562175248a8fdf752f2fa92f1171c.zip
set a not empty string when setting EMPATHY_NOTIFY_MANAGER_CAP_X_CANONICAL_APPEND
libnotify now filters out empty string so the hint was not set (#648842).
-rw-r--r--src/empathy-chat-window.c3
-rw-r--r--src/empathy-notifications-approver.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 94f93e2bf..ee4f445e5 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -1335,8 +1335,9 @@ chat_window_show_or_update_notification (EmpathyChatWindow *window,
G_CALLBACK (chat_window_notification_closed_cb), window, 0);
if (has_x_canonical_append) {
+ /* We have to set a not empty string to keep libnotify happy */
notify_notification_set_hint_string (notification,
- EMPATHY_NOTIFY_MANAGER_CAP_X_CANONICAL_APPEND, "");
+ EMPATHY_NOTIFY_MANAGER_CAP_X_CANONICAL_APPEND, "1");
}
}
diff --git a/src/empathy-notifications-approver.c b/src/empathy-notifications-approver.c
index a87a6d30e..ec1e65c24 100644
--- a/src/empathy-notifications-approver.c
+++ b/src/empathy-notifications-approver.c
@@ -335,8 +335,9 @@ update_notification (EmpathyNotificationsApprover *self)
NOTIFY_EXPIRES_DEFAULT);
if (has_x_canonical_append)
+ /* We have to set a not empty string to keep libnotify happy */
notify_notification_set_hint_string (notification,
- EMPATHY_NOTIFY_MANAGER_CAP_X_CANONICAL_APPEND, "");
+ EMPATHY_NOTIFY_MANAGER_CAP_X_CANONICAL_APPEND, "1");
if (empathy_notify_manager_has_capability (self->priv->notify_mgr,
EMPATHY_NOTIFY_MANAGER_CAP_ACTIONS))