[empathy/gnome-3-0] set a not empty string when setting EMPATHY_NOTIFY_MANAGER_CAP_X_CANONICAL_APPEND



commit 8562c5e1f120d2ef33406d527ecb5599be01be20
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Fri Apr 29 17:53:17 2011 +0200

    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).

 src/empathy-chat-window.c            |    3 ++-
 src/empathy-notifications-approver.c |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 6341267..96d5ee8 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 af07447..5d3f6e4 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))



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]