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

Correct accidental _modify_fg rather than _text

Browse source 
Fixes: https://bugs.launchpad.net/midori/+bug/904276
This commit is contained in:
Christian Dywan 2011-12-15 04:25:43 +01:00
parent 98bb257554
commit 1966875e98
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
midori/midori-locationaction.c
View file

@ -1689,7 +1689,7 @@ midori_location_action_set_security_hint (MidoriLocationAction* location_action,
if (bg_color) gdk_color_parse (bg_color, &color); if (bg_color) gdk_color_parse (bg_color, &color);
gtk_widget_modify_base (entry, GTK_STATE_NORMAL, bg_color ? &color : NULL); gtk_widget_modify_base (entry, GTK_STATE_NORMAL, bg_color ? &color : NULL);
if (fg_color) gdk_color_parse (fg_color, &color); if (fg_color) gdk_color_parse (fg_color, &color);
gtk_widget_modify_fg (entry, GTK_STATE_NORMAL, fg_color ? &color : NULL); gtk_widget_modify_text (entry, GTK_STATE_NORMAL, fg_color ? &color : NULL);
#endif #endif
} }
} }

6
midori/midori-view.c
View file

@ -667,7 +667,7 @@ midori_view_apply_icon (MidoriView* view,
if (view->tab_icon) if (view->tab_icon)
{ {
if (icon_name) if (icon_name && !strchr (icon_name, '/'))
katze_throbber_set_static_icon_name (KATZE_THROBBER (view->tab_icon), katze_throbber_set_static_icon_name (KATZE_THROBBER (view->tab_icon),
icon_name); icon_name);
else else
@ -677,7 +677,7 @@ midori_view_apply_icon (MidoriView* view,
if (view->menu_item) if (view->menu_item)
{ {
GtkWidget* image; GtkWidget* image;
if (icon_name) if (icon_name && !strchr (icon_name, '/'))
image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
else else
image = gtk_image_new_from_pixbuf (view->icon); image = gtk_image_new_from_pixbuf (view->icon);
@ -719,7 +719,7 @@ midori_view_update_icon (MidoriView* view,
if (icon) if (icon)
{ {
midori_view_apply_icon (view, icon, NULL); midori_view_apply_icon (view, icon, view->icon_uri);
return; return;
} }