[Xfce4-commits] <midori:master> Change browser_save_uri to clear up variable initialization

[Christian Dywan]

Updating branch refs/heads/master
         to 27f5cbfb25b18ec4e0a89aa6e9841e7bb3365618 (commit)
       from 218a6d0b2e7e8a67851bb1b6eb9e4b74502cbf2e (commit)

commit 27f5cbfb25b18ec4e0a89aa6e9841e7bb3365618
Author: Christian Dywan <christian at twotoasts.de>
Date:   Thu Jul 19 21:01:43 2012 +0200

    Change browser_save_uri to clear up variable initialization

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

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index d137765..7239e43 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -1104,7 +1104,7 @@ midori_browser_save_uri (MidoriBrowser* browser,
     GtkWidget* dialog;
     const gchar* title = midori_view_get_display_title (view);
     gchar* filename;
-    gboolean file_only;
+    gboolean file_only = TRUE;
     GtkWidget* checkbox;
 
     if (!gtk_widget_get_visible (GTK_WIDGET (browser)))
@@ -1120,8 +1120,6 @@ midori_browser_save_uri (MidoriBrowser* browser,
         gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbox), TRUE);
         gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (dialog), checkbox);
     }
-    else
-        file_only = TRUE;
     if (last_dir && *last_dir)
         gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), last_dir);
     else
@@ -1143,7 +1141,7 @@ midori_browser_save_uri (MidoriBrowser* browser,
     if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
     {
         filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
-        file_only = !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbox));
+        file_only = !file_only && !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbox));
         if (!file_only && !g_str_equal (title, uri))
         {
             gchar* fullname = g_strconcat (filename, ".html", NULL);