[gedit/wip/fix-external-tools] commands-file: misc code clean-up for the file saving

[Sébastien Wilmet <swilmet src gnome org>]

commit f4c55f6337a61dfbdd25afba8d6be5cfee1728c3
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Fri Nov 7 21:33:49 2014 +0100

    commands-file: misc code clean-up for the file saving

 gedit/gedit-commands-file.c |   71 +++++++++++++++++++-----------------------
 1 files changed, 32 insertions(+), 39 deletions(-)
---
diff --git a/gedit/gedit-commands-file.c b/gedit/gedit-commands-file.c
index bddb043..b27b76b 100644
--- a/gedit/gedit-commands-file.c
+++ b/gedit/gedit-commands-file.c
@@ -607,7 +607,7 @@ replace_read_only_file (GtkWindow *parent,
 
        gtk_widget_destroy (dialog);
 
-       return (ret == GTK_RESPONSE_YES);
+       return ret == GTK_RESPONSE_YES;
 }
 
 static gboolean
@@ -667,7 +667,6 @@ change_compression (GtkWindow *parent,
                button_label = _("_Save As Plain Text");
        }
 
-
        g_free (name_for_display);
 
        gtk_dialog_add_buttons (GTK_DIALOG (dialog),
@@ -684,7 +683,7 @@ change_compression (GtkWindow *parent,
 
        gtk_widget_destroy (dialog);
 
-       return (ret == GTK_RESPONSE_YES);
+       return ret == GTK_RESPONSE_YES;
 }
 
 static GtkSourceCompressionType
@@ -787,8 +786,7 @@ save_dialog_response_cb (GeditFileChooserDialog *dialog,
 
                g_free (parse_name);
 
-               /* let's remember the dir we navigated too,
-                * even if the saving fails... */
+               /* Let's remember the dir we navigated to, even if the saving fails... */
                _gedit_window_set_default_location (window, location);
 
                _gedit_tab_save_as_async (tab,
@@ -808,7 +806,9 @@ save_next_tab:
        data = g_object_get_data (G_OBJECT (window),
                                  GEDIT_LIST_OF_TABS_TO_SAVE_AS);
        if (data == NULL)
+       {
                return;
+       }
 
        /* Save As the next tab of the list (we are Saving All files) */
        tabs_to_save_as = (GSList *)data;
@@ -827,7 +827,7 @@ save_next_tab:
                tab = GEDIT_TAB (tabs_to_save_as->data);
 
                if (GPOINTER_TO_BOOLEAN (g_object_get_data (G_OBJECT (tab),
-                                                           GEDIT_IS_CLOSING_TAB)) == TRUE)
+                                                           GEDIT_IS_CLOSING_TAB)))
                {
                        g_object_set_data (G_OBJECT (tab),
                                           GEDIT_IS_CLOSING_TAB,
@@ -887,13 +887,13 @@ save_as_tab (GeditTab    *tab,
             GeditWindow *window)
 {
        GeditFileChooserDialog *save_dialog;
-       GtkWindowGroup *wg;
+       GtkWindowGroup *window_group;
+       GtkWindow *dialog_window;
        GeditDocument *doc;
        GtkSourceFile *file;
        GFile *location;
        const GtkSourceEncoding *encoding;
        GtkSourceNewlineType newline_type;
-       GtkWindow *win;
 
        g_return_if_fail (GEDIT_IS_TAB (tab));
        g_return_if_fail (GEDIT_IS_WINDOW (window));
@@ -917,13 +917,13 @@ save_as_tab (GeditTab    *tab,
                          G_CALLBACK (confirm_overwrite_callback),
                          NULL);
 
-       wg = gedit_window_get_group (window);
+       window_group = gedit_window_get_group (window);
 
-       win = gedit_file_chooser_dialog_get_window (save_dialog);
+       dialog_window = gedit_file_chooser_dialog_get_window (save_dialog);
 
-       if (win != NULL)
+       if (dialog_window != NULL)
        {
-               gtk_window_group_add_window (wg, win);
+               gtk_window_group_add_window (window_group, dialog_window);
        }
 
        /* Save As dialog is modal to its main window */
@@ -1007,9 +1007,7 @@ save_tab (GeditTab    *tab,
            gedit_document_get_readonly (doc))
        {
                gedit_debug_message (DEBUG_COMMANDS, "Untitled or Readonly");
-
                save_as_tab (tab, window);
-
                return;
        }
 
@@ -1038,10 +1036,10 @@ _gedit_cmd_file_save (GSimpleAction *action,
        gedit_debug (DEBUG_COMMANDS);
 
        tab = gedit_window_get_active_tab (window);
-       if (tab == NULL)
-               return;
-
-       save_tab (tab, window);
+       if (tab != NULL)
+       {
+               save_tab (tab, window);
+       }
 }
 
 void
@@ -1055,10 +1053,10 @@ _gedit_cmd_file_save_as (GSimpleAction *action,
        gedit_debug (DEBUG_COMMANDS);
 
        tab = gedit_window_get_active_tab (window);
-       if (tab == NULL)
-               return;
-
-       save_as_tab (tab, window);
+       if (tab != NULL)
+       {
+               save_as_tab (tab, window);
+       }
 }
 
 /*
@@ -1073,29 +1071,27 @@ save_documents_list (GeditWindow *window,
 
        gedit_debug (DEBUG_COMMANDS);
 
-       g_return_if_fail (!(gedit_window_get_state (window) &
-                           GEDIT_WINDOW_STATE_PRINTING));
+       g_return_if_fail ((gedit_window_get_state (window) & GEDIT_WINDOW_STATE_PRINTING) == 0);
 
-       l = docs;
-       while (l != NULL)
+       for (l = docs; l != NULL; l = l->next)
        {
                GeditDocument *doc;
-               GeditTab *t;
+               GeditTab *tab;
                GeditTabState state;
 
                g_return_if_fail (GEDIT_IS_DOCUMENT (l->data));
+               doc = l->data;
 
-               doc = GEDIT_DOCUMENT (l->data);
-               t = gedit_tab_get_from_document (doc);
-               state = gedit_tab_get_state (t);
+               tab = gedit_tab_get_from_document (doc);
+               state = gedit_tab_get_state (tab);
 
                g_return_if_fail (state != GEDIT_TAB_STATE_PRINTING);
                g_return_if_fail (state != GEDIT_TAB_STATE_PRINT_PREVIEWING);
                g_return_if_fail (state != GEDIT_TAB_STATE_CLOSING);
 
-               if ((state == GEDIT_TAB_STATE_NORMAL) ||
-                   (state == GEDIT_TAB_STATE_SHOWING_PRINT_PREVIEW) ||
-                   (state == GEDIT_TAB_STATE_GENERIC_NOT_EDITABLE))
+               if (state == GEDIT_TAB_STATE_NORMAL ||
+                   state == GEDIT_TAB_STATE_SHOWING_PRINT_PREVIEW ||
+                   state == GEDIT_TAB_STATE_GENERIC_NOT_EDITABLE)
                {
                        if (_gedit_document_needs_saving (doc))
                        {
@@ -1104,12 +1100,11 @@ save_documents_list (GeditWindow *window,
                                if (gedit_document_is_untitled (doc) ||
                                    gedit_document_get_readonly (doc))
                                {
-                                       tabs_to_save_as = g_slist_prepend (tabs_to_save_as,
-                                                                          t);
+                                       tabs_to_save_as = g_slist_prepend (tabs_to_save_as, tab);
                                }
                                else
                                {
-                                       save_tab (t, window);
+                                       save_tab (tab, window);
                                }
                        }
                }
@@ -1145,15 +1140,13 @@ save_documents_list (GeditWindow *window,
                                             state);
                        g_free (uri_for_display);
                }
-
-               l = g_list_next (l);
        }
 
        if (tabs_to_save_as != NULL)
        {
                GeditTab *tab;
 
-               tabs_to_save_as = g_slist_reverse (tabs_to_save_as );
+               tabs_to_save_as = g_slist_reverse (tabs_to_save_as);
 
                g_return_if_fail (g_object_get_data (G_OBJECT (window),
                                                     GEDIT_LIST_OF_TABS_TO_SAVE_AS) == NULL);