summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-04-29 17:53:17 +0200
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-05-02 10:57:11 +0200
commit8562c5e1f120d2ef33406d527ecb5599be01be20 (patch)
tree1c5ef7719723381cc4348a1b13a78e18446a0015
parent2101aab8df151497bfa3bea4b1a2f0ec64f02005 (diff)
downloadempathy-8562c5e1f120d2ef33406d527ecb5599be01be20.tar.gz
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 634126799..96d5ee80e 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 af074470e..5d3f6e4bd 100644
--- a/src/empathy-notifications-approver.c
+++ b/src/empathy-notifications-approver.c
@@ -328,8 +328,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))