From 1966875e98979db272f40f6be0f77f130b5c0dc8 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 15 Dec 2011 04:25:43 +0100 Subject: [PATCH] Correct accidental _modify_fg rather than _text Fixes: https://bugs.launchpad.net/midori/+bug/904276 --- midori/midori-locationaction.c | 2 +- midori/midori-view.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index c1e4b2b1..f380b6dd 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -1689,7 +1689,7 @@ midori_location_action_set_security_hint (MidoriLocationAction* location_action, if (bg_color) gdk_color_parse (bg_color, &color); gtk_widget_modify_base (entry, GTK_STATE_NORMAL, bg_color ? &color : NULL); 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 } } diff --git a/midori/midori-view.c b/midori/midori-view.c index d73bcfd9..47d28a03 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -667,7 +667,7 @@ midori_view_apply_icon (MidoriView* view, if (view->tab_icon) { - if (icon_name) + if (icon_name && !strchr (icon_name, '/')) katze_throbber_set_static_icon_name (KATZE_THROBBER (view->tab_icon), icon_name); else @@ -677,7 +677,7 @@ midori_view_apply_icon (MidoriView* view, if (view->menu_item) { GtkWidget* image; - if (icon_name) + if (icon_name && !strchr (icon_name, '/')) image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); else image = gtk_image_new_from_pixbuf (view->icon); @@ -719,7 +719,7 @@ midori_view_update_icon (MidoriView* view, if (icon) { - midori_view_apply_icon (view, icon, NULL); + midori_view_apply_icon (view, icon, view->icon_uri); return; }