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

Check if the pixbuf of the search engine is valid before returning it

Browse source
This commit is contained in:
Dale Whittaker 2009-01-29 01:06:27 +01:00 committed by Christian Dywan
parent badc48c1fd
commit 2c9b011048
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
midori/midori-searchaction.c
View file

@ -389,6 +389,7 @@ midori_search_action_get_icon (MidoriSearchAction* search_action,
GdkScreen* screen; GdkScreen* screen;
GtkIconTheme* icon_theme; GtkIconTheme* icon_theme;
gint width, height; gint width, height;
GdkPixbuf* pixbuf;
if (G_UNLIKELY (!(screen = gtk_widget_get_screen (widget)))) if (G_UNLIKELY (!(screen = gtk_widget_get_screen (widget))))
return gtk_widget_render_icon (widget, GTK_STOCK_FILE, return gtk_widget_render_icon (widget, GTK_STOCK_FILE,
@ -396,8 +397,9 @@ midori_search_action_get_icon (MidoriSearchAction* search_action,
icon_theme = gtk_icon_theme_get_for_screen (screen); icon_theme = gtk_icon_theme_get_for_screen (screen);
gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (widget), gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (widget),
GTK_ICON_SIZE_MENU, &width, &height); GTK_ICON_SIZE_MENU, &width, &height);
return gtk_icon_theme_load_icon (icon_theme, icon, MAX (width, height), if ((pixbuf = gtk_icon_theme_load_icon (icon_theme, icon, MAX (width, height),
GTK_ICON_LOOKUP_USE_BUILTIN, NULL); GTK_ICON_LOOKUP_USE_BUILTIN, NULL)))
return pixbuf;
} }
if ((icon = katze_item_get_uri (item)) && strstr (icon, "://")) if ((icon = katze_item_get_uri (item)) && strstr (icon, "://"))