[Xfce4-commits] <midori:master> Also reset icon when resetting location

[Christian Dywan]

Updating branch refs/heads/master
         to 32eb583cb5386586f62384f128551339a4bf99b7 (commit)
       from d3863a0abf0633ac3d1044a8edf905a09373c4db (commit)

commit 32eb583cb5386586f62384f128551339a4bf99b7
Author: Christian Dywan <christian at twotoasts.de>
Date:   Fri Jan 27 21:13:45 2012 +0100

    Also reset icon when resetting location

 midori/midori-browser.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 32d72a5..ccecdad 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -3744,10 +3744,14 @@ static void
 _action_location_reset_uri (GtkAction*     action,
                             MidoriBrowser* browser)
 {
-    const gchar* uri;
-
-    uri = midori_browser_get_current_uri (browser);
-    midori_location_action_set_text (MIDORI_LOCATION_ACTION (action), uri);
+    GtkWidget* view;
+    if ((view = midori_browser_get_current_tab (browser)))
+    {
+        midori_location_action_set_text (MIDORI_LOCATION_ACTION (action),
+            midori_view_get_display_uri (MIDORI_VIEW (view)));
+        midori_location_action_set_icon (MIDORI_LOCATION_ACTION (action),
+            midori_view_get_icon (MIDORI_VIEW (view)));
+    }
 }