diff options
| author | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-05-02 17:49:27 +0800 |
|---|---|---|
| committer | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-05-02 17:49:27 +0800 |
| commit | 392db8ab3e1ceeebd6c7dfba125786c67be527d0 (patch) | |
| tree | 1dc627e3c3191d29d0587462ae18c5bcf2aada6f /src | |
| parent | 84b6ed525031e805e95829fbefa8ceb86f395290 (diff) | |
| parent | b84d4bc7464a400fd983a3c430189daab69f49d2 (diff) | |
| download | gsoc2013-empathy-392db8ab3e1ceeebd6c7dfba125786c67be527d0.tar gsoc2013-empathy-392db8ab3e1ceeebd6c7dfba125786c67be527d0.tar.gz gsoc2013-empathy-392db8ab3e1ceeebd6c7dfba125786c67be527d0.tar.bz2 gsoc2013-empathy-392db8ab3e1ceeebd6c7dfba125786c67be527d0.tar.lz gsoc2013-empathy-392db8ab3e1ceeebd6c7dfba125786c67be527d0.tar.xz gsoc2013-empathy-392db8ab3e1ceeebd6c7dfba125786c67be527d0.tar.zst gsoc2013-empathy-392db8ab3e1ceeebd6c7dfba125786c67be527d0.zip | |
Merge branch 'gnome-2-34' into empathy-skype
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-chat-window.c | 3 | ||||
| -rw-r--r-- | src/empathy-main-window.c | 3 | ||||
| -rw-r--r-- | src/empathy-status-icon.c | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index 4bbf1a789..d498d8fec 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -1389,8 +1389,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-main-window.c b/src/empathy-main-window.c index 2fcc31e02..73ae51bd6 100644 --- a/src/empathy-main-window.c +++ b/src/empathy-main-window.c @@ -223,6 +223,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, @@ -243,6 +245,7 @@ main_window_flash_foreach (GtkTreeModel *model, g_object_unref (individual); tp_clear_object (&contact); + tp_clear_object (&pixbuf); return FALSE; } 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, |