debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Append fallback icon instead of checking the theme

Browse source
This commit is contained in:
Christian Dywan 2011-02-15 21:31:39 +01:00
parent 24b39d2885
commit 296ede80f7
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
midori/midori-view.c
View file

@ -2832,7 +2832,6 @@ webkit_web_view_mime_type_decision_cb (GtkWidget* web_view,
gchar* description; gchar* description;
#if GTK_CHECK_VERSION (2, 14, 0) #if GTK_CHECK_VERSION (2, 14, 0)
GIcon* icon; GIcon* icon;
GtkIconInfo* icon_info;
GtkWidget* image; GtkWidget* image;
#endif #endif
gchar* title; gchar* title;
@ -2882,14 +2881,8 @@ webkit_web_view_mime_type_decision_cb (GtkWidget* web_view,
description = g_content_type_get_description (content_type); description = g_content_type_get_description (content_type);
#if GTK_CHECK_VERSION (2, 14, 0) #if GTK_CHECK_VERSION (2, 14, 0)
icon = g_content_type_get_icon (content_type); icon = g_content_type_get_icon (content_type);
icon_info = gtk_icon_theme_lookup_by_gicon (icon); g_themed_icon_append_name (G_THEMED_ICON (icon), "document-x-generic");
if (icon_info != NULL) image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_DIALOG);
{
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_object_unref (icon); g_object_unref (icon);
gtk_widget_show (image); gtk_widget_show (image);
gtk_message_dialog_set_image (GTK_MESSAGE_DIALOG (dialog), image); gtk_message_dialog_set_image (GTK_MESSAGE_DIALOG (dialog), image);