[gimp] Move "show-statusbar" next to "show-menubar"

[Michael Natterer <mitch src gnome org>]

commit 6c76120561ffc110a2e597c893efd28df976bd88
Author: Michael Natterer <mitch gimp org>
Date:   Fri Sep 25 20:18:26 2009 +0200

    Move "show-statusbar" next to "show-menubar"

 app/display/gimpdisplayoptions.c |   30 +++++++++++++++---------------
 app/display/gimpdisplayoptions.h |    6 ++++--
 2 files changed, 19 insertions(+), 17 deletions(-)
---
diff --git a/app/display/gimpdisplayoptions.c b/app/display/gimpdisplayoptions.c
index 41a0cc4..5cff716 100644
--- a/app/display/gimpdisplayoptions.c
+++ b/app/display/gimpdisplayoptions.c
@@ -41,9 +41,9 @@ enum
 {
   PROP_0,
   PROP_SHOW_MENUBAR,
+  PROP_SHOW_STATUSBAR,
   PROP_SHOW_RULERS,
   PROP_SHOW_SCROLLBARS,
-  PROP_SHOW_STATUSBAR,
   PROP_SHOW_SELECTION,
   PROP_SHOW_LAYER_BOUNDARY,
   PROP_SHOW_GUIDES,
@@ -105,6 +105,10 @@ gimp_display_options_class_init (GimpDisplayOptionsClass *klass)
                                     "show-menubar", SHOW_MENUBAR_BLURB,
                                     TRUE,
                                     GIMP_PARAM_STATIC_STRINGS);
+  GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_SHOW_STATUSBAR,
+                                    "show-statusbar", SHOW_STATUSBAR_BLURB,
+                                    TRUE,
+                                    GIMP_PARAM_STATIC_STRINGS);
   GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_SHOW_RULERS,
                                     "show-rulers", SHOW_RULERS_BLURB,
                                     TRUE,
@@ -113,10 +117,6 @@ gimp_display_options_class_init (GimpDisplayOptionsClass *klass)
                                     "show-scrollbars", SHOW_SCROLLBARS_BLURB,
                                     TRUE,
                                     GIMP_PARAM_STATIC_STRINGS);
-  GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_SHOW_STATUSBAR,
-                                    "show-statusbar", SHOW_STATUSBAR_BLURB,
-                                    TRUE,
-                                    GIMP_PARAM_STATIC_STRINGS);
   GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_SHOW_SELECTION,
                                     "show-selection", SHOW_SELECTION_BLURB,
                                     TRUE,
@@ -163,6 +163,10 @@ gimp_display_options_fullscreen_class_init (GimpDisplayOptionsFullscreenClass *k
                                     "show-menubar", SHOW_MENUBAR_BLURB,
                                     FALSE,
                                     GIMP_PARAM_STATIC_STRINGS);
+  GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_SHOW_STATUSBAR,
+                                    "show-statusbar", SHOW_STATUSBAR_BLURB,
+                                    FALSE,
+                                    GIMP_PARAM_STATIC_STRINGS);
   GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_SHOW_RULERS,
                                     "show-rulers", SHOW_RULERS_BLURB,
                                     FALSE,
@@ -171,10 +175,6 @@ gimp_display_options_fullscreen_class_init (GimpDisplayOptionsFullscreenClass *k
                                     "show-scrollbars", SHOW_SCROLLBARS_BLURB,
                                     FALSE,
                                     GIMP_PARAM_STATIC_STRINGS);
-  GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_SHOW_STATUSBAR,
-                                    "show-statusbar", SHOW_STATUSBAR_BLURB,
-                                    FALSE,
-                                    GIMP_PARAM_STATIC_STRINGS);
   GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_SHOW_SELECTION,
                                     "show-selection", SHOW_SELECTION_BLURB,
                                     FALSE,
@@ -263,15 +263,15 @@ gimp_display_options_set_property (GObject      *object,
     case PROP_SHOW_MENUBAR:
       options->show_menubar = g_value_get_boolean (value);
       break;
+    case PROP_SHOW_STATUSBAR:
+      options->show_statusbar = g_value_get_boolean (value);
+      break;
     case PROP_SHOW_RULERS:
       options->show_rulers = g_value_get_boolean (value);
       break;
     case PROP_SHOW_SCROLLBARS:
       options->show_scrollbars = g_value_get_boolean (value);
       break;
-    case PROP_SHOW_STATUSBAR:
-      options->show_statusbar = g_value_get_boolean (value);
-      break;
     case PROP_SHOW_SELECTION:
       options->show_selection = g_value_get_boolean (value);
       break;
@@ -313,15 +313,15 @@ gimp_display_options_get_property (GObject    *object,
     case PROP_SHOW_MENUBAR:
       g_value_set_boolean (value, options->show_menubar);
       break;
+    case PROP_SHOW_STATUSBAR:
+      g_value_set_boolean (value, options->show_statusbar);
+      break;
     case PROP_SHOW_RULERS:
       g_value_set_boolean (value, options->show_rulers);
       break;
     case PROP_SHOW_SCROLLBARS:
       g_value_set_boolean (value, options->show_scrollbars);
       break;
-    case PROP_SHOW_STATUSBAR:
-      g_value_set_boolean (value, options->show_statusbar);
-      break;
     case PROP_SHOW_SELECTION:
       g_value_set_boolean (value, options->show_selection);
       break;
diff --git a/app/display/gimpdisplayoptions.h b/app/display/gimpdisplayoptions.h
index b99753b..ef9bd18 100644
--- a/app/display/gimpdisplayoptions.h
+++ b/app/display/gimpdisplayoptions.h
@@ -39,11 +39,13 @@ struct _GimpDisplayOptions
 {
   GObject                parent_instance;
 
-  /*  GimpDisplayShell options  */
+  /*  GimpImageWindow options  */
   gboolean               show_menubar;
+  gboolean               show_statusbar;
+
+  /*  GimpDisplayShell options  */
   gboolean               show_rulers;
   gboolean               show_scrollbars;
-  gboolean               show_statusbar;
 
   /*  GimpCanvas options  */
   gboolean               show_selection;