[Xfce4-commits] <midori:master> Append fallback icon instead of checking the theme

Christian Dywan noreply at xfce.org
Tue Feb 15 21:34:01 CET 2011


Updating branch refs/heads/master
         to 296ede80f77157dc0691bbf56fbb3a09ea294fce (commit)
       from 24b39d2885ed54ead40d6c9a8f658353f4480648 (commit)

commit 296ede80f77157dc0691bbf56fbb3a09ea294fce
Author: Christian Dywan <christian at twotoasts.de>
Date:   Tue Feb 15 21:31:39 2011 +0100

    Append fallback icon instead of checking the theme

 midori/midori-view.c |   11 ++---------
 1 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/midori/midori-view.c b/midori/midori-view.c
index 57efc83..f76bb51 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -2832,7 +2832,6 @@ webkit_web_view_mime_type_decision_cb (GtkWidget*               web_view,
     gchar* description;
     #if GTK_CHECK_VERSION (2, 14, 0)
     GIcon* icon;
-    GtkIconInfo* icon_info;
     GtkWidget* image;
     #endif
     gchar* title;
@@ -2882,14 +2881,8 @@ webkit_web_view_mime_type_decision_cb (GtkWidget*               web_view,
     description = g_content_type_get_description (content_type);
     #if GTK_CHECK_VERSION (2, 14, 0)
     icon = g_content_type_get_icon (content_type);
-    icon_info = gtk_icon_theme_lookup_by_gicon (icon);
-    if (icon_info != NULL)
-    {
-        image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_DIALOG);
-        gtk_icon_info_free (icon_info);
-    }
-    else
-        image = gtk_image_new_from_stock (GTK_STOCK_FILE, GTK_ICON_SIZE_DIALOG);
+    g_themed_icon_append_name (G_THEMED_ICON (icon), "document-x-generic");
+    image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_DIALOG);
     g_object_unref (icon);
     gtk_widget_show (image);
     gtk_message_dialog_set_image (GTK_MESSAGE_DIALOG (dialog), image);



More information about the Xfce4-commits mailing list