diff options
| author | Xavier Claessens <xclaesse@src.gnome.org> | 2009-01-31 01:07:45 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2009-01-31 01:07:45 +0800 |
| commit | ff811719fa1fd178d9be7edd6b18fb04d0c3a0d3 (patch) | |
| tree | 0eafaef3d1eace14bb068c3cb0b347c189b5e517 /src | |
| parent | 5e818246cfc20394b14756d872145b853a53296c (diff) | |
| download | gsoc2013-empathy-ff811719fa1fd178d9be7edd6b18fb04d0c3a0d3.tar gsoc2013-empathy-ff811719fa1fd178d9be7edd6b18fb04d0c3a0d3.tar.gz gsoc2013-empathy-ff811719fa1fd178d9be7edd6b18fb04d0c3a0d3.tar.bz2 gsoc2013-empathy-ff811719fa1fd178d9be7edd6b18fb04d0c3a0d3.tar.lz gsoc2013-empathy-ff811719fa1fd178d9be7edd6b18fb04d0c3a0d3.tar.xz gsoc2013-empathy-ff811719fa1fd178d9be7edd6b18fb04d0c3a0d3.tar.zst gsoc2013-empathy-ff811719fa1fd178d9be7edd6b18fb04d0c3a0d3.zip | |
Add a convenience function to avoid hacks when getting the pixbuf from the icon name.
svn path=/trunk/; revision=2288
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-chat-window.c | 7 | ||||
| -rw-r--r-- | src/empathy-status-icon.c | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index 1bc9f2056..e080a5317 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -852,7 +852,7 @@ chat_window_notification_closed_cb (NotifyNotification *notify, reason = notify_notification_get_closed_reason (notify); if (reason == 2) { - empathy_chat_window_present_chat (chat); + g_idle_add ((GSourceFunc) notification_closed_idle_cb, chat); } } @@ -877,9 +877,8 @@ chat_window_show_or_update_notification (EmpathyMessage *message, body = empathy_message_get_body (message); pixbuf = empathy_pixbuf_avatar_from_contact_scaled (sender, 48, 48); if (pixbuf == NULL) { - /* we use INVALID here so we fall pack to 48px */ - pixbuf = empathy_pixbuf_from_icon_name (EMPATHY_IMAGE_NEW_MESSAGE, - GTK_ICON_SIZE_INVALID); + pixbuf = empathy_pixbuf_from_icon_name_sized + (EMPATHY_IMAGE_NEW_MESSAGE, 48); } if (priv->notification != NULL) { diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c index 4c7964566..86a2c84fa 100644 --- a/src/empathy-status-icon.c +++ b/src/empathy-status-icon.c @@ -126,9 +126,8 @@ status_icon_update_notification (EmpathyStatusIcon *icon) } if (!pixbuf) { - /* we use INVALID here so we fall pack to 48px */ - pixbuf = empathy_pixbuf_from_icon_name (priv->event->icon_name, - GTK_ICON_SIZE_INVALID); + pixbuf = empathy_pixbuf_from_icon_name_sized + (priv->event->icon_name, 48); } priv->notification = notify_notification_new_with_status_icon |