[gedit/wip/tab-raviolli: 4/4] tab: some cleanup

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

commit 916727e3ea431d52981df1f834741a9d662b327e
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Sun Jun 15 16:30:54 2014 +0200

    tab: some cleanup

 gedit/gedit-tab.c |  103 ++++++++++++++++++++++++++---------------------------
 1 files changed, 51 insertions(+), 52 deletions(-)
---
diff --git a/gedit/gedit-tab.c b/gedit/gedit-tab.c
index ce3b650..7e4cd77 100644
--- a/gedit/gedit-tab.c
+++ b/gedit/gedit-tab.c
@@ -85,7 +85,6 @@ enum
        PROP_CAN_CLOSE
 };
 
-/* Signals */
 enum
 {
        DROP_URIS,
@@ -158,25 +157,25 @@ gedit_tab_get_property (GObject    *object,
        switch (prop_id)
        {
                case PROP_NAME:
-                       g_value_take_string (value,
-                                            _gedit_tab_get_name (tab));
+                       g_value_take_string (value, _gedit_tab_get_name (tab));
                        break;
+
                case PROP_STATE:
-                       g_value_set_enum (value,
-                                         gedit_tab_get_state (tab));
+                       g_value_set_enum (value, gedit_tab_get_state (tab));
                        break;
+
                case PROP_AUTO_SAVE:
-                       g_value_set_boolean (value,
-                                            gedit_tab_get_auto_save_enabled (tab));
+                       g_value_set_boolean (value, gedit_tab_get_auto_save_enabled (tab));
                        break;
+
                case PROP_AUTO_SAVE_INTERVAL:
-                       g_value_set_int (value,
-                                        gedit_tab_get_auto_save_interval (tab));
+                       g_value_set_int (value, gedit_tab_get_auto_save_interval (tab));
                        break;
+
                case PROP_CAN_CLOSE:
-                       g_value_set_boolean (value,
-                                            _gedit_tab_get_can_close (tab));
+                       g_value_set_boolean (value, _gedit_tab_get_can_close (tab));
                        break;
+
                default:
                        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
                        break;
@@ -194,13 +193,13 @@ gedit_tab_set_property (GObject      *object,
        switch (prop_id)
        {
                case PROP_AUTO_SAVE:
-                       gedit_tab_set_auto_save_enabled (tab,
-                                                        g_value_get_boolean (value));
+                       gedit_tab_set_auto_save_enabled (tab, g_value_get_boolean (value));
                        break;
+
                case PROP_AUTO_SAVE_INTERVAL:
-                       gedit_tab_set_auto_save_interval (tab,
-                                                         g_value_get_int (value));
+                       gedit_tab_set_auto_save_interval (tab, g_value_get_int (value));
                        break;
+
                default:
                        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
                        break;
@@ -436,7 +435,9 @@ gedit_tab_set_state (GeditTab      *tab,
        g_return_if_fail ((state >= 0) && (state < GEDIT_TAB_NUM_OF_STATES));
 
        if (tab->priv->state == state)
+       {
                return;
+       }
 
        tab->priv->state = state;
 
@@ -447,13 +448,12 @@ gedit_tab_set_state (GeditTab      *tab,
        {
                gtk_widget_hide (GTK_WIDGET (tab->priv->frame));
        }
-       else
+       else if (tab->priv->print_preview == NULL)
        {
-               if (tab->priv->print_preview == NULL)
-                       gtk_widget_show (GTK_WIDGET (tab->priv->frame));
+               gtk_widget_show (GTK_WIDGET (tab->priv->frame));
        }
 
-       set_cursor_according_to_state (GTK_TEXT_VIEW (gedit_view_frame_get_view (tab->priv->frame)),
+       set_cursor_according_to_state (GTK_TEXT_VIEW (gedit_tab_get_view (tab)),
                                       state);
 
        update_auto_save_timeout (tab);
@@ -621,9 +621,9 @@ io_loading_error_info_bar_response (GtkWidget *info_bar,
 }
 
 static void
-file_already_open_warning_info_bar_response (GtkWidget   *info_bar,
-                                            gint         response_id,
-                                            GeditTab    *tab)
+file_already_open_warning_info_bar_response (GtkWidget *info_bar,
+                                            gint       response_id,
+                                            GeditTab  *tab)
 {
        GeditView *view;
 
@@ -643,9 +643,9 @@ file_already_open_warning_info_bar_response (GtkWidget   *info_bar,
 }
 
 static void
-load_cancelled (GtkWidget        *bar,
-                gint              response_id,
-                GeditTab         *tab)
+load_cancelled (GtkWidget *bar,
+               gint       response_id,
+               GeditTab  *tab)
 {
        GeditDocument *doc = NULL;
 
@@ -659,14 +659,13 @@ load_cancelled (GtkWidget        *bar,
 }
 
 static void
-unrecoverable_reverting_error_info_bar_response (GtkWidget        *info_bar,
-                                                gint              response_id,
-                                                GeditTab         *tab)
+unrecoverable_reverting_error_info_bar_response (GtkWidget *info_bar,
+                                                gint       response_id,
+                                                GeditTab  *tab)
 {
        GeditView *view;
 
-       gedit_tab_set_state (tab,
-                            GEDIT_TAB_STATE_NORMAL);
+       gedit_tab_set_state (tab, GEDIT_TAB_STATE_NORMAL);
 
        set_info_bar (tab, NULL, GTK_RESPONSE_NONE);
 
@@ -875,8 +874,8 @@ show_saving_info_bar (GeditTab *tab)
 
 static void
 info_bar_set_progress (GeditTab *tab,
-                          goffset   size,
-                          goffset   total_size)
+                      goffset   size,
+                      goffset   total_size)
 {
        if (tab->priv->info_bar == NULL)
                return;
@@ -1183,9 +1182,9 @@ end_saving (GeditTab *tab)
 }
 
 static void
-unrecoverable_saving_error_info_bar_response (GtkWidget        *info_bar,
-                                              gint              response_id,
-                                              GeditTab         *tab)
+unrecoverable_saving_error_info_bar_response (GtkWidget *info_bar,
+                                             gint       response_id,
+                                             GeditTab  *tab)
 {
        GeditView *view;
 
@@ -1242,8 +1241,8 @@ invalid_character_info_bar_response (GtkWidget *info_bar,
 
 static void
 no_backup_error_info_bar_response (GtkWidget *info_bar,
-                                      gint       response_id,
-                                      GeditTab  *tab)
+                                  gint       response_id,
+                                  GeditTab  *tab)
 {
        if (response_id == GTK_RESPONSE_YES)
        {
@@ -1273,8 +1272,8 @@ no_backup_error_info_bar_response (GtkWidget *info_bar,
 
 static void
 externally_modified_error_info_bar_response (GtkWidget *info_bar,
-                                                gint       response_id,
-                                                GeditTab  *tab)
+                                            gint       response_id,
+                                            GeditTab  *tab)
 {
        if (response_id == GTK_RESPONSE_YES)
        {
@@ -1306,8 +1305,8 @@ externally_modified_error_info_bar_response (GtkWidget *info_bar,
 
 static void
 recoverable_saving_error_info_bar_response (GtkWidget *info_bar,
-                                               gint       response_id,
-                                               GeditTab  *tab)
+                                           gint       response_id,
+                                           GeditTab  *tab)
 {
        GeditDocument *doc;
 
@@ -1472,8 +1471,8 @@ document_saved (GeditDocument *document,
 
 static void
 externally_modified_notification_info_bar_response (GtkWidget *info_bar,
-                                                       gint       response_id,
-                                                       GeditTab  *tab)
+                                                   gint       response_id,
+                                                   GeditTab  *tab)
 {
        GeditView *view;
 
@@ -1563,9 +1562,9 @@ view_focused_in (GtkWidget     *widget,
 }
 
 static void
-on_drop_uris (GeditView *view,
-             gchar    **uri_list,
-             GeditTab  *tab)
+on_drop_uris (GeditView  *view,
+             gchar     **uri_list,
+             GeditTab   *tab)
 {
        g_signal_emit (G_OBJECT (tab), signals[DROP_URIS], 0, uri_list);
 }
@@ -1583,7 +1582,7 @@ network_available_warning_info_bar_response (GtkWidget *info_bar,
 
 void
 _gedit_tab_set_network_available (GeditTab *tab,
-                                 gboolean enable)
+                                 gboolean  enable)
 {
        GeditDocument *doc;
        GFile *location;
@@ -2318,10 +2317,10 @@ printing_cb (GeditPrintJob       *job,
        gtk_widget_show (tab->priv->info_bar);
 
        gedit_progress_info_bar_set_text (GEDIT_PROGRESS_INFO_BAR (tab->priv->info_bar),
-                                             gedit_print_job_get_status_string (job));
+                                         gedit_print_job_get_status_string (job));
 
        gedit_progress_info_bar_set_fraction (GEDIT_PROGRESS_INFO_BAR (tab->priv->info_bar),
-                                                 gedit_print_job_get_progress (job));
+                                             gedit_print_job_get_progress (job));
 }
 
 static void
@@ -2527,9 +2526,9 @@ preview_finished_cb (GtkSourcePrintJob *pjob, GeditTab *tab)
 #endif
 
 static void
-print_cancelled (GtkWidget        *bar,
-                 gint              response_id,
-                 GeditTab         *tab)
+print_cancelled (GtkWidget *bar,
+                gint       response_id,
+                GeditTab  *tab)
 {
        g_return_if_fail (GEDIT_IS_PROGRESS_INFO_BAR (tab->priv->info_bar));