[empathy/gnome-2-34] set a not empty string when setting EMPATHY_NOTIFY_MANAGER_CAP_X_CANONICAL_APPEND



commit 554ea28a6a158f3dee384c485f84184cf606d61c
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-status-icon.c |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index cb9de9b..4995dcd 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -1337,8 +1337,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-status-icon.c b/src/empathy-status-icon.c
index a4ca213..325fa7f 100644
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -251,8 +251,9 @@ status_icon_update_notification (EmpathyStatusIcon *icon)
 							 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 (priv->notify_mgr,



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