[gimp] app: tabs position saved in sessionrc and only 1 HELP-ID is enough.

[Jehan Pagès <jehanp src gnome org>]

commit c15f9799c1bf392581380da7a0f12021cbdf34ca
Author: Jehan <jehan girinstud io>
Date:   Sat Oct 12 04:30:30 2013 +1300

    app: tabs position saved in sessionrc and only 1 HELP-ID is enough.
    
    The settings was saved both in sessionrc and gimprc!

 app/actions/windows-actions.c |    8 ++++----
 app/config/gimpguiconfig.c    |   11 ++++++-----
 app/config/gimprc-blurbs.h    |    3 ---
 app/widgets/gimphelp-ids.h    |    5 +----
 4 files changed, 11 insertions(+), 16 deletions(-)
---
diff --git a/app/actions/windows-actions.c b/app/actions/windows-actions.c
index db41972..a66be81 100644
--- a/app/actions/windows-actions.c
+++ b/app/actions/windows-actions.c
@@ -138,22 +138,22 @@ static const GimpRadioActionEntry windows_tabs_position_actions[] =
   { "windows-tabs-position-top", GTK_STOCK_GOTO_TOP,
     NC_("windows-tabs-position-action", "_Top"), NULL,
     NC_("windows-tabs-position-action", "Position the tabs to the top"),
-    GIMP_POSITION_TOP, GIMP_HELP_WINDOWS_TABS_POSITION_TOP },
+    GIMP_POSITION_TOP, GIMP_HELP_WINDOWS_TABS_POSITION },
 
   { "windows-tabs-position-bottom", GTK_STOCK_GOTO_BOTTOM,
     NC_("windows-tabs-position-action", "_Bottom"), NULL,
     NC_("windows-tabs-position-action", "Position the tabs to the bottom"),
-    GIMP_POSITION_BOTTOM, GIMP_HELP_WINDOWS_TABS_POSITION_BOTTOM },
+    GIMP_POSITION_BOTTOM, GIMP_HELP_WINDOWS_TABS_POSITION },
 
   { "windows-tabs-position-left", GTK_STOCK_GOTO_FIRST,
     NC_("windows-tabs-position-action", "_Left"), NULL,
     NC_("windows-tabs-position-action", "Position the tabs to the left"),
-    GIMP_POSITION_LEFT, GIMP_HELP_WINDOWS_TABS_POSITION_LEFT },
+    GIMP_POSITION_LEFT, GIMP_HELP_WINDOWS_TABS_POSITION },
 
   { "windows-tabs-position-right", GTK_STOCK_GOTO_LAST,
     NC_("windows-tabs-position-action", "_Right"), NULL,
     NC_("windows-tabs-position-action", "Position the tabs to the right"),
-    GIMP_POSITION_RIGHT, GIMP_HELP_WINDOWS_TABS_POSITION_RIGHT },
+    GIMP_POSITION_RIGHT, GIMP_HELP_WINDOWS_TABS_POSITION },
 };
 
 void
diff --git a/app/config/gimpguiconfig.c b/app/config/gimpguiconfig.c
index 4a9cd8f..2d9207b 100644
--- a/app/config/gimpguiconfig.c
+++ b/app/config/gimpguiconfig.c
@@ -267,11 +267,12 @@ gimp_gui_config_class_init (GimpGuiConfigClass *klass)
                                                          G_PARAM_READWRITE |
                                                          G_PARAM_CONSTRUCT |
                                                          GIMP_PARAM_STATIC_STRINGS));
-  GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_TABS_POSITION,
-                                 "tabs-position", WINDOWS_TABS_POSITION,
-                                 GIMP_TYPE_POSITION,
-                                 GIMP_POSITION_TOP,
-                                 GIMP_PARAM_STATIC_STRINGS);
+  g_object_class_install_property (object_class, PROP_TABS_POSITION,
+                                   g_param_spec_enum ("tabs-position", NULL, NULL,
+                                                      GIMP_TYPE_POSITION, GIMP_POSITION_TOP,
+                                                      G_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT |
+                                                      GIMP_PARAM_STATIC_STRINGS));
   g_object_class_install_property (object_class, PROP_LAST_TIP_SHOWN,
                                    g_param_spec_int ("last-tip-shown",
                                                      NULL, NULL,
diff --git a/app/config/gimprc-blurbs.h b/app/config/gimprc-blurbs.h
index d638e1a..6c2acd0 100644
--- a/app/config/gimprc-blurbs.h
+++ b/app/config/gimprc-blurbs.h
@@ -366,9 +366,6 @@ N_("Show a tooltip when the pointer hovers over an item.")
 #define SINGLE_WINDOW_MODE_BLURB \
 N_("Use GIMP in a single-window mode.")
 
-#define WINDOWS_TABS_POSITION \
-N_("Choose the position of the tabs.")
-
 #define HIDE_DOCKS_BLURB \
 N_("Hide docks and other windows, leaving only image windows.")
 
diff --git a/app/widgets/gimphelp-ids.h b/app/widgets/gimphelp-ids.h
index 55dda17..5ac07de 100644
--- a/app/widgets/gimphelp-ids.h
+++ b/app/widgets/gimphelp-ids.h
@@ -525,10 +525,7 @@
 
 #define GIMP_HELP_WINDOWS_SHOW_DOCK               "gimp-windows-show-dock"
 #define GIMP_HELP_WINDOWS_HIDE_DOCKS              "gimp-windows-hide-docks"
-#define GIMP_HELP_WINDOWS_TABS_POSITION_TOP       "gimp-windows-tabs-position-top"
-#define GIMP_HELP_WINDOWS_TABS_POSITION_BOTTOM    "gimp-windows-tabs-position-bottom"
-#define GIMP_HELP_WINDOWS_TABS_POSITION_LEFT      "gimp-windows-tabs-position-left"
-#define GIMP_HELP_WINDOWS_TABS_POSITION_RIGHT     "gimp-windows-tabs-position-right"
+#define GIMP_HELP_WINDOWS_TABS_POSITION           "gimp-windows-tabs-position"
 #define GIMP_HELP_WINDOWS_USE_SINGLE_WINDOW_MODE  "gimp-windows-use-single-window-mode"
 #define GIMP_HELP_WINDOWS_OPEN_RECENT_DOCK        "gimp-windows-open-recent-dock"