From 554ea28a6a158f3dee384c485f84184cf606d61c Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Fri, 29 Apr 2011 17:53:17 +0200 Subject: 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(-) (limited to 'src') diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index cb9de9b5b..4995dcdc6 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 a4ca21300..325fa7f0f 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, -- cgit v1.2.3 From f6bdbd0bcafdc6dbad2fff389eedc9aa36a5fa1c Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Mon, 2 May 2011 10:04:22 +0200 Subject: main_window_flash_foreach: don't leak the pixbuf returned by empathy_pixbuf_from_icon_name --- src/empathy-main-window.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src') diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c index 864ef474e..c93b25b9d 100644 --- a/src/empathy-main-window.c +++ b/src/empathy-main-window.c @@ -219,6 +219,8 @@ main_window_flash_foreach (GtkTreeModel *model, pixbuf = empathy_individual_store_get_individual_status_icon ( GET_PRIV (data->window)->individual_store, individual); + if (pixbuf != NULL) + g_object_ref (pixbuf); } gtk_tree_store_set (GTK_TREE_STORE (model), iter, @@ -239,6 +241,7 @@ main_window_flash_foreach (GtkTreeModel *model, g_object_unref (individual); tp_clear_object (&contact); + tp_clear_object (&pixbuf); return FALSE; } -- cgit v1.2.3