diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-11-12 20:53:57 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-11-13 19:37:18 +0800 |
| commit | ab3c9ccb3c468f03ddc790bb2e5a84845684bfc5 (patch) | |
| tree | 53512f7f6d9f009b81d36327e8cf3f9fb7dea34e /src | |
| parent | 31ffe0cd7670a9c31402443587dbe7d12f8561e0 (diff) | |
| download | gsoc2013-empathy-ab3c9ccb3c468f03ddc790bb2e5a84845684bfc5.tar gsoc2013-empathy-ab3c9ccb3c468f03ddc790bb2e5a84845684bfc5.tar.gz gsoc2013-empathy-ab3c9ccb3c468f03ddc790bb2e5a84845684bfc5.tar.bz2 gsoc2013-empathy-ab3c9ccb3c468f03ddc790bb2e5a84845684bfc5.tar.lz gsoc2013-empathy-ab3c9ccb3c468f03ddc790bb2e5a84845684bfc5.tar.xz gsoc2013-empathy-ab3c9ccb3c468f03ddc790bb2e5a84845684bfc5.tar.zst gsoc2013-empathy-ab3c9ccb3c468f03ddc790bb2e5a84845684bfc5.zip | |
change empathy_misc_get_pixbuf_for_notification to empathy_notify_manager_get_pixbuf_for_notification
Making this function a method of EmpathyNotifyManager would allow us to
tweak the size of the icon depending on the notifications server as
suggested in bug 588054.
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-chat-window.c | 7 | ||||
| -rw-r--r-- | src/empathy-status-icon.c | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index 6d69235a3..fc64d340f 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -75,6 +75,7 @@ typedef struct { gboolean dnd_same_window; guint save_geometry_id; EmpathyChatroomManager *chatroom_manager; + EmpathyNotifyManager *notify_mgr; GtkWidget *dialog; GtkWidget *notebook; NotifyNotification *notification; @@ -1111,7 +1112,8 @@ chat_window_show_or_update_notification (EmpathyChatWindow *window, G_CALLBACK (chat_window_notification_closed_cb), cb_data); } - pixbuf = empathy_misc_get_pixbuf_for_notification (sender, EMPATHY_IMAGE_NEW_MESSAGE); + pixbuf = empathy_notify_manager_get_pixbuf_for_notification (priv->notify_mgr, + sender, EMPATHY_IMAGE_NEW_MESSAGE); if (pixbuf != NULL) { notify_notification_set_icon_from_pixbuf (priv->notification, pixbuf); @@ -1508,6 +1510,7 @@ chat_window_finalize (GObject *object) g_object_unref (priv->ui_manager); g_object_unref (priv->chatroom_manager); + g_object_unref (priv->notify_mgr); if (priv->save_geometry_id != 0) { g_source_remove (priv->save_geometry_id); chat_window_save_geometry_timeout_cb (window); @@ -1690,6 +1693,8 @@ empathy_chat_window_init (EmpathyChatWindow *window) priv->chats_new_msg = NULL; priv->chats_composing = NULL; priv->current_chat = NULL; + + priv->notify_mgr = empathy_notify_manager_dup_singleton (); } EmpathyChatWindow * diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c index aaf827dc3..76c549ebb 100644 --- a/src/empathy-status-icon.c +++ b/src/empathy-status-icon.c @@ -187,7 +187,8 @@ status_icon_update_notification (EmpathyStatusIcon *icon) G_CALLBACK (status_icon_notification_closed_cb), icon); } - pixbuf = empathy_misc_get_pixbuf_for_notification (priv->event->contact, + pixbuf = empathy_notify_manager_get_pixbuf_for_notification ( + priv->notify_mgr, priv->event->contact, priv->event->icon_name); if (pixbuf != NULL) { |