[Xfce4-commits] <midori:master> Don't overwrite uri in _action_location_secondary_icon_released

[Christian Dywan]

Updating branch refs/heads/master
         to b10b311b0763cd59b587ede57880e7ff4c1c45cc (commit)
       from 25bbea02e2a09037f6556d68a1e8ac59ae4a125b (commit)

commit b10b311b0763cd59b587ede57880e7ff4c1c45cc
Author: Samuel Creshal <creshal at arcor.de>
Date:   Sat Mar 13 19:58:06 2010 +0100

    Don't overwrite uri in _action_location_secondary_icon_released

 midori/midori-browser.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 566b800..94cf7ec 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -3969,9 +3969,10 @@ _action_location_secondary_icon_released (GtkAction*     action,
     if ((view = midori_browser_get_current_tab (browser)))
     {
         const gchar* uri = midori_view_get_display_uri (MIDORI_VIEW (view));
+        const gchar* feed;
         if (gtk_window_get_focus (GTK_WINDOW (browser)) == widget)
             _action_location_submit_uri (action, uri, FALSE, browser);
-        else if ((uri = g_object_get_data (G_OBJECT (view), "news-feeds")))
+        else if ((feed = g_object_get_data (G_OBJECT (view), "news-feeds")))
         {
             KatzeArray* news_feeds;
             KatzeItem* item;
@@ -4014,7 +4015,7 @@ _action_location_secondary_icon_released (GtkAction*     action,
                                     KATZE_MENU_POSITION_RIGHT);
             }
             else
-                midori_browser_subscribe_to_news_feed (browser, uri);
+                midori_browser_subscribe_to_news_feed (browser, feed);
             g_object_unref (news_feeds);
         }
         else