[gimp/blend-tool-fun: 16/163] app: reorder functions in GimpSaveDialog so method impls are together

[Michael Henning <mhenning src gnome org>]

commit 2d6b87b0d397fa52e3812d0867b30c3ab8a0d7ce
Author: Michael Natterer <mitch gimp org>
Date:   Tue Sep 8 10:51:05 2015 +0200

    app: reorder functions in GimpSaveDialog so method impls are together
    
    Also, "real" is in the name of a method's default impl, not its impl
    in a subclass.

 app/widgets/gimpsavedialog.c |   67 ++++++++++++++++++++++--------------------
 1 files changed, 35 insertions(+), 32 deletions(-)
---
diff --git a/app/widgets/gimpsavedialog.c b/app/widgets/gimpsavedialog.c
index 5759e48..a9252d3 100644
--- a/app/widgets/gimpsavedialog.c
+++ b/app/widgets/gimpsavedialog.c
@@ -57,6 +57,11 @@ struct _GimpSaveDialogState
 
 static void     gimp_save_dialog_constructed         (GObject             *object);
 
+static void     gimp_save_dialog_save_state          (GimpFileDialog      *dialog,
+                                                      const gchar         *state_name);
+static void     gimp_save_dialog_load_state          (GimpFileDialog      *dialog,
+                                                      const gchar         *state_name);
+
 static GFile  * gimp_save_dialog_get_default_folder  (Gimp                *gimp);
 static void     gimp_save_dialog_add_compat_toggle   (GimpSaveDialog      *dialog);
 static void     gimp_save_dialog_compat_toggled      (GtkToggleButton     *button,
@@ -68,26 +73,23 @@ static void     gimp_save_dialog_set_state           (GimpSaveDialog      *dialo
                                                       GimpSaveDialogState *state);
 static void     gimp_save_dialog_state_destroy       (GimpSaveDialogState *state);
 
-static void     gimp_save_dialog_real_save_state     (GimpFileDialog      *dialog,
-                                                      const gchar         *state_name);
-static void     gimp_save_dialog_real_load_state     (GimpFileDialog      *dialog,
-                                                      const gchar         *state_name);
 
 G_DEFINE_TYPE (GimpSaveDialog, gimp_save_dialog,
                GIMP_TYPE_FILE_DIALOG)
 
 #define parent_class gimp_save_dialog_parent_class
 
+
 static void
 gimp_save_dialog_class_init (GimpSaveDialogClass *klass)
 {
   GObjectClass        *object_class = G_OBJECT_CLASS (klass);
   GimpFileDialogClass *fd_class     = GIMP_FILE_DIALOG_CLASS (klass);
 
-  object_class->constructed  = gimp_save_dialog_constructed;
+  object_class->constructed = gimp_save_dialog_constructed;
 
-  fd_class->save_state       = gimp_save_dialog_real_save_state;
-  fd_class->load_state       = gimp_save_dialog_real_load_state;
+  fd_class->save_state      = gimp_save_dialog_save_state;
+  fd_class->load_state      = gimp_save_dialog_load_state;
 }
 
 static void
@@ -107,6 +109,32 @@ gimp_save_dialog_constructed (GObject *object)
   gimp_save_dialog_add_compat_toggle (dialog);
 }
 
+static void
+gimp_save_dialog_save_state (GimpFileDialog *dialog,
+                             const gchar    *state_name)
+{
+  g_return_if_fail (GIMP_IS_SAVE_DIALOG (dialog));
+
+  g_object_set_data_full (G_OBJECT (dialog->gimp), state_name,
+                          gimp_save_dialog_get_state (GIMP_SAVE_DIALOG (dialog)),
+                          (GDestroyNotify) gimp_save_dialog_state_destroy);
+}
+
+static void
+gimp_save_dialog_load_state (GimpFileDialog *dialog,
+                             const gchar    *state_name)
+{
+  GimpSaveDialogState *state;
+
+  g_return_if_fail (GIMP_IS_SAVE_DIALOG (dialog));
+
+  state = g_object_get_data (G_OBJECT (dialog->gimp), state_name);
+
+  if (state)
+    gimp_save_dialog_set_state (GIMP_SAVE_DIALOG (dialog), state);
+}
+
+
 /*  public functions  */
 
 GtkWidget *
@@ -419,28 +447,3 @@ gimp_save_dialog_state_destroy (GimpSaveDialogState *state)
   g_free (state->filter_name);
   g_slice_free (GimpSaveDialogState, state);
 }
-
-static void
-gimp_save_dialog_real_save_state (GimpFileDialog *dialog,
-                                  const gchar    *state_name)
-{
-  g_return_if_fail (GIMP_IS_SAVE_DIALOG (dialog));
-
-  g_object_set_data_full (G_OBJECT (dialog->gimp), state_name,
-                          gimp_save_dialog_get_state (GIMP_SAVE_DIALOG (dialog)),
-                          (GDestroyNotify) gimp_save_dialog_state_destroy);
-}
-
-static void
-gimp_save_dialog_real_load_state (GimpFileDialog *dialog,
-                                  const gchar    *state_name)
-{
-  GimpSaveDialogState *state;
-
-  g_return_if_fail (GIMP_IS_SAVE_DIALOG (dialog));
-
-  state = g_object_get_data (G_OBJECT (dialog->gimp), state_name);
-
-  if (state)
-    gimp_save_dialog_set_state (GIMP_SAVE_DIALOG (dialog), state);
-}