This is an automated email from the git hooks/post-receive script. ochosi pushed a commit to branch master in repository apps/xfce4-notifyd.
commit ca47d12621562a1ec0b3f9a8f736b5e1ede4a14c Author: Simon Steinbeiss <simon.steinbe...@elfenbeinturm.at> Date: Sun Jul 3 23:09:17 2016 +0200 Fix custom icons in notifications (Bug #12675) --- xfce4-notifyd/xfce-notify-window.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/xfce4-notifyd/xfce-notify-window.c b/xfce4-notifyd/xfce-notify-window.c index 4c5df56..5f7feb3 100644 --- a/xfce4-notifyd/xfce-notify-window.c +++ b/xfce4-notifyd/xfce-notify-window.c @@ -769,17 +769,18 @@ xfce_notify_window_set_icon_name(XfceNotifyWindow *window, g_return_if_fail(XFCE_IS_NOTIFY_WINDOW(window)); - if(icon_name && *icon_name) { + if (icon_name && *icon_name) { gint w, h; GdkPixbuf *pix; gtk_icon_size_lookup(GTK_ICON_SIZE_DIALOG, &w, &h); - if(g_path_is_absolute(icon_name)) + if (g_path_is_absolute(icon_name)) { pix = gdk_pixbuf_new_from_file_at_size(icon_name, w, h, NULL); - else if(g_str_has_prefix (icon_name, "file://")) { + } + else if (g_str_has_prefix (icon_name, "file://")) { filename = g_filename_from_uri(icon_name, NULL, NULL); - if(filename) + if (filename) pix = gdk_pixbuf_new_from_file_at_size(filename, w, h, NULL); g_free(filename); } @@ -789,22 +790,21 @@ xfce_notify_window_set_icon_name(XfceNotifyWindow *window, w, GTK_ICON_LOOKUP_FORCE_SIZE, NULL); - - if(pix) { - gtk_image_set_from_pixbuf(GTK_IMAGE(window->icon), pix); - gtk_widget_show(window->icon_box); - g_object_unref(G_OBJECT(pix)); - icon_set = TRUE; - } + } + if(pix) { + gtk_image_set_from_pixbuf(GTK_IMAGE(window->icon), pix); + gtk_widget_show(window->icon_box); + g_object_unref(G_OBJECT(pix)); + icon_set = TRUE; } } - if(!icon_set) { + if (!icon_set) { gtk_image_clear(GTK_IMAGE(window->icon)); gtk_widget_hide(window->icon_box); } - if(gtk_widget_get_realized(GTK_WIDGET(window))) + if (gtk_widget_get_realized(GTK_WIDGET(window))) gtk_widget_queue_draw(GTK_WIDGET(window)); } -- To stop receiving notification emails like this one, please contact the administrator of this repository. _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits