[gnumeric] Conf: cleanup.

From: Morten Welinder <mortenw src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnumeric] Conf: cleanup.
Date: Wed, 26 Oct 2011 19:59:34 +0000 (UTC)
commit 90d36263ea9a24166079f235897eaae01c1f4ae6
Author: Morten Welinder <terra gnome org>
Date:   Wed Oct 26 15:59:16 2011 -0400

    Conf: cleanup.

 ChangeLog                                    |    9 +
 schemas/gnumeric-general.schemas.in          |   32 ++--
 schemas/org.gnome.gnumeric.gschema.xml.in.in |   18 +-
 src/gnumeric-gconf.c                         |  240 +++++++++++++-------------
 src/gnumeric-gconf.h                         |   48 +++---
 tools/handle-conf-options                    |    8 +-
 6 files changed, 182 insertions(+), 173 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 9796c0a..d3fcff2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-10-26  Morten Welinder  <terra gnome org>
+
+	* schemas/gnumeric-general.schemas.in,
+	schemas/org.gnome.gnumeric.gschema.xml.in.in: Rename keys for
+	toolbars.
+
+	* schemas/org.gnome.gnumeric.gschema.xml.in.in: Fix default for
+	long-format-toolbar's visibility.
+
 2011-10-26  Jean Brefort  <jean brefort normalesup org>
 
 	* src/gnm-so-filled.c (gnm_so_filled_draw_cairo): make things build again
diff --git a/schemas/gnumeric-general.schemas.in b/schemas/gnumeric-general.schemas.in
index f76e6f0..e7caaf9 100644
--- a/schemas/gnumeric-general.schemas.in
+++ b/schemas/gnumeric-general.schemas.in
@@ -168,8 +168,8 @@
         </locale>
       </schema>
       <schema>
-        <key>/schemas/apps/gnumeric/core/gui/toolbars/StandardToolbar</key>
-        <applyto>/apps/gnumeric/core/gui/toolbars/StandardToolbar</applyto>
+        <key>/schemas/apps/gnumeric/core/gui/toolbars/standard-visible</key>
+        <applyto>/apps/gnumeric/core/gui/toolbars/standard-visible</applyto>
         <owner>Gnumeric</owner>
         <type>bool</type>
 	<default>TRUE</default>
@@ -179,8 +179,8 @@
         </locale>
       </schema>
       <schema>
-        <key>/schemas/apps/gnumeric/core/gui/toolbars/StandardToolbar-position</key>
-        <applyto>/apps/gnumeric/core/gui/toolbars/StandardToolbar-position</applyto>
+        <key>/schemas/apps/gnumeric/core/gui/toolbars/standard-position</key>
+        <applyto>/apps/gnumeric/core/gui/toolbars/standard-position</applyto>
         <owner>Gnumeric</owner>
         <type>int</type>
 	<default>2</default>
@@ -190,8 +190,8 @@
         </locale>
       </schema>
       <schema>
-        <key>/schemas/apps/gnumeric/core/gui/toolbars/FormatToolbar</key>
-        <applyto>/apps/gnumeric/core/gui/toolbars/FormatToolbar</applyto>
+        <key>/schemas/apps/gnumeric/core/gui/toolbars/format-visible</key>
+        <applyto>/apps/gnumeric/core/gui/toolbars/format-visible</applyto>
         <owner>Gnumeric</owner>
         <type>bool</type>
 	<default>TRUE</default>
@@ -201,8 +201,8 @@
         </locale>
       </schema>
       <schema>
-        <key>/schemas/apps/gnumeric/core/gui/toolbars/FormatToolbar-position</key>
-        <applyto>/apps/gnumeric/core/gui/toolbars/FormatToolbar-position</applyto>
+        <key>/schemas/apps/gnumeric/core/gui/toolbars/format-position</key>
+        <applyto>/apps/gnumeric/core/gui/toolbars/format-position</applyto>
         <owner>Gnumeric</owner>
         <type>int</type>
 	<default>2</default>
@@ -212,8 +212,8 @@
         </locale>
       </schema>
       <schema>
-        <key>/schemas/apps/gnumeric/core/gui/toolbars/LongFormatToolbar</key>
-        <applyto>/apps/gnumeric/core/gui/toolbars/LongFormatToolbar</applyto>
+        <key>/schemas/apps/gnumeric/core/gui/toolbars/longformat-visible</key>
+        <applyto>/apps/gnumeric/core/gui/toolbars/longformat-visible</applyto>
         <owner>Gnumeric</owner>
         <type>bool</type>
 	<default>FALSE</default>
@@ -223,8 +223,8 @@
         </locale>
       </schema>
       <schema>
-        <key>/schemas/apps/gnumeric/core/gui/toolbars/LongFormatToolbar-position</key>
-        <applyto>/apps/gnumeric/core/gui/toolbars/LongFormatToolbar-position</applyto>
+        <key>/schemas/apps/gnumeric/core/gui/toolbars/longformat-position</key>
+        <applyto>/apps/gnumeric/core/gui/toolbars/longformat-position</applyto>
         <owner>Gnumeric</owner>
         <type>int</type>
 	<default>2</default>
@@ -234,8 +234,8 @@
         </locale>
       </schema>
       <schema>
-        <key>/schemas/apps/gnumeric/core/gui/toolbars/ObjectToolbar</key>
-        <applyto>/apps/gnumeric/core/gui/toolbars/ObjectToolbar</applyto>
+        <key>/schemas/apps/gnumeric/core/gui/toolbars/object-visible</key>
+        <applyto>/apps/gnumeric/core/gui/toolbars/object-visible</applyto>
         <owner>Gnumeric</owner>
         <type>bool</type>
 	<default>FALSE</default>
@@ -245,8 +245,8 @@
         </locale>
       </schema>
       <schema>
-        <key>/schemas/apps/gnumeric/core/gui/toolbars/ObjectToolbar-position</key>
-        <applyto>/apps/gnumeric/core/gui/toolbars/ObjectToolbar-position</applyto>
+        <key>/schemas/apps/gnumeric/core/gui/toolbars/object-position</key>
+        <applyto>/apps/gnumeric/core/gui/toolbars/object-position</applyto>
         <owner>Gnumeric</owner>
         <type>int</type>
 	<default>2</default>
diff --git a/schemas/org.gnome.gnumeric.gschema.xml.in.in b/schemas/org.gnome.gnumeric.gschema.xml.in.in
index 96a5a01..ae885f6 100644
--- a/schemas/org.gnome.gnumeric.gschema.xml.in.in
+++ b/schemas/org.gnome.gnumeric.gschema.xml.in.in
@@ -103,42 +103,42 @@
     </key>
   </schema>
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.gnumeric.core.gui.toolbars" path="/apps/gnumeric/core/gui/toolbars/">
-    <key name="standardtoolbar" type="b">
+    <key name="standard-visible" type="b">
       <default>true</default>
       <_summary>Standard toolbar visible</_summary>
       <_description>This variable determines whether the standard toolbar should be visible initially.</_description>
     </key>
-    <key name="standardtoolbar-position" type="i">
+    <key name="standard-position" type="i">
       <default>2</default>
       <_summary>Standard toolbar position</_summary>
       <_description>This variable determines where the standard toolbar should be shown.  0 is left, 1 is right, 2 is top.</_description>
     </key>
-    <key name="formattoolbar" type="b">
+    <key name="format-visible" type="b">
       <default>true</default>
       <_summary>Format toolbar visible</_summary>
       <_description>This variable determines whether the format toolbar should be visible initially.</_description>
     </key>
-    <key name="formattoolbar-position" type="i">
+    <key name="format-position" type="i">
       <default>2</default>
       <_summary>Format toolbar position</_summary>
       <_description>This variable determines where the format toolbar should be shown.  0 is left, 1 is right, 2 is top.</_description>
     </key>
-    <key name="longformattoolbar" type="b">
-      <default>true</default>
+    <key name="longformat-visible" type="b">
+      <default>false</default>
       <_summary>Long format toolbar visible</_summary>
       <_description>This variable determines whether the long format toolbar should be visible initially.</_description>
     </key>
-    <key name="longformattoolbar-position" type="i">
+    <key name="longformat-position" type="i">
       <default>2</default>
       <_summary>Long format toolbar position</_summary>
       <_description>This variable determines where the long format toolbar should be shown.  0 is left, 1 is right, 2 is top.</_description>
     </key>
-    <key name="objecttoolbar" type="b">
+    <key name="object-visible" type="b">
       <default>true</default>
       <_summary>Object toolbar visible</_summary>
       <_description>This variable determines whether the object toolbar should be visible initially.</_description>
     </key>
-    <key name="objecttoolbar-position" type="i">
+    <key name="object-position" type="i">
       <default>2</default>
       <_summary>Object toolbar position</_summary>
       <_description>This variable determines where the object toolbar should be shown.  0 is left, 1 is right, 2 is top.</_description>
diff --git a/src/gnumeric-gconf.c b/src/gnumeric-gconf.c
index 3d4090e..c588f40 100644
--- a/src/gnumeric-gconf.c
+++ b/src/gnumeric-gconf.c
@@ -529,10 +529,10 @@ gboolean
 gnm_conf_get_toolbar_visible (const char *name)
 {
 	TOOLBAR_TANGO
-		(return gnm_conf_get_core_gui_toolbars_ObjectToolbar ();,
-		 return gnm_conf_get_core_gui_toolbars_FormatToolbar ();,
-		 return gnm_conf_get_core_gui_toolbars_LongFormatToolbar ();,
-		 return gnm_conf_get_core_gui_toolbars_StandardToolbar (););
+		(return gnm_conf_get_core_gui_toolbars_object_visible ();,
+		 return gnm_conf_get_core_gui_toolbars_format_visible ();,
+		 return gnm_conf_get_core_gui_toolbars_longformat_visible ();,
+		 return gnm_conf_get_core_gui_toolbars_standard_visible (););
 
 	g_warning ("Unknown toolbar: %s", name);
 	return FALSE;
@@ -542,20 +542,20 @@ void
 gnm_conf_set_toolbar_visible (const char *name, gboolean x)
 {
 	TOOLBAR_TANGO
-		(gnm_conf_set_core_gui_toolbars_ObjectToolbar (x);,
-		 gnm_conf_set_core_gui_toolbars_FormatToolbar (x);,
-		 gnm_conf_set_core_gui_toolbars_LongFormatToolbar (x);,
-		 gnm_conf_set_core_gui_toolbars_StandardToolbar (x););
+		(gnm_conf_set_core_gui_toolbars_object_visible (x);,
+		 gnm_conf_set_core_gui_toolbars_format_visible (x);,
+		 gnm_conf_set_core_gui_toolbars_longformat_visible (x);,
+		 gnm_conf_set_core_gui_toolbars_standard_visible (x););
 }
 
 GtkPositionType
 gnm_conf_get_toolbar_position (const char *name)
 {
 	TOOLBAR_TANGO
-		(return gnm_conf_get_core_gui_toolbars_ObjectToolbar_position ();,
-		 return gnm_conf_get_core_gui_toolbars_FormatToolbar_position ();,
-		 return gnm_conf_get_core_gui_toolbars_LongFormatToolbar_position ();,
-		 return gnm_conf_get_core_gui_toolbars_StandardToolbar_position (););
+		(return gnm_conf_get_core_gui_toolbars_object_position ();,
+		 return gnm_conf_get_core_gui_toolbars_format_position ();,
+		 return gnm_conf_get_core_gui_toolbars_longformat_position ();,
+		 return gnm_conf_get_core_gui_toolbars_standard_position (););
 
 	g_warning ("Unknown toolbar: %s", name);
 	return GTK_POS_TOP;
@@ -565,10 +565,10 @@ void
 gnm_conf_set_toolbar_position (const char *name, GtkPositionType x)
 {
 	TOOLBAR_TANGO
-		(gnm_conf_set_core_gui_toolbars_ObjectToolbar_position (x);,
-		 gnm_conf_set_core_gui_toolbars_FormatToolbar_position (x);,
-		 gnm_conf_set_core_gui_toolbars_LongFormatToolbar_position (x);,
-		 gnm_conf_set_core_gui_toolbars_StandardToolbar_position (x););
+		(gnm_conf_set_core_gui_toolbars_object_position (x);,
+		 gnm_conf_set_core_gui_toolbars_format_position (x);,
+		 gnm_conf_set_core_gui_toolbars_longformat_position (x);,
+		 gnm_conf_set_core_gui_toolbars_standard_position (x););
 }
 
 #undef TOOLBAR_TANGO
@@ -1362,212 +1362,212 @@ gnm_conf_get_core_gui_screen_verticaldpi_node (void)
 	return get_node (watch_core_gui_screen_verticaldpi.key);
 }
 
-static struct cb_watch_bool watch_core_gui_toolbars_FormatToolbar = {
-	0, "core/gui/toolbars/FormatToolbar", TRUE,
+static struct cb_watch_int watch_core_gui_toolbars_format_position = {
+	0, "core/gui/toolbars/format-position", 0, 3, 2,
 };
 
-gboolean
-gnm_conf_get_core_gui_toolbars_FormatToolbar (void)
+GtkPositionType
+gnm_conf_get_core_gui_toolbars_format_position (void)
 {
-	if (!watch_core_gui_toolbars_FormatToolbar.handler)
-		watch_bool (&watch_core_gui_toolbars_FormatToolbar);
-	return watch_core_gui_toolbars_FormatToolbar.var;
+	if (!watch_core_gui_toolbars_format_position.handler)
+		watch_int (&watch_core_gui_toolbars_format_position);
+	return watch_core_gui_toolbars_format_position.var;
 }
 
 void
-gnm_conf_set_core_gui_toolbars_FormatToolbar (gboolean x)
+gnm_conf_set_core_gui_toolbars_format_position (GtkPositionType x)
 {
-	if (!watch_core_gui_toolbars_FormatToolbar.handler)
-		watch_bool (&watch_core_gui_toolbars_FormatToolbar);
-	set_bool (&watch_core_gui_toolbars_FormatToolbar, x);
+	if (!watch_core_gui_toolbars_format_position.handler)
+		watch_int (&watch_core_gui_toolbars_format_position);
+	set_int (&watch_core_gui_toolbars_format_position, x);
 }
 
 GOConfNode *
-gnm_conf_get_core_gui_toolbars_FormatToolbar_node (void)
+gnm_conf_get_core_gui_toolbars_format_position_node (void)
 {
-	return get_node (watch_core_gui_toolbars_FormatToolbar.key);
+	return get_node (watch_core_gui_toolbars_format_position.key);
 }
 
-static struct cb_watch_int watch_core_gui_toolbars_FormatToolbar_position = {
-	0, "core/gui/toolbars/FormatToolbar-position", 0, 3, 2,
+static struct cb_watch_bool watch_core_gui_toolbars_format_visible = {
+	0, "core/gui/toolbars/format-visible", TRUE,
 };
 
-GtkPositionType
-gnm_conf_get_core_gui_toolbars_FormatToolbar_position (void)
+gboolean
+gnm_conf_get_core_gui_toolbars_format_visible (void)
 {
-	if (!watch_core_gui_toolbars_FormatToolbar_position.handler)
-		watch_int (&watch_core_gui_toolbars_FormatToolbar_position);
-	return watch_core_gui_toolbars_FormatToolbar_position.var;
+	if (!watch_core_gui_toolbars_format_visible.handler)
+		watch_bool (&watch_core_gui_toolbars_format_visible);
+	return watch_core_gui_toolbars_format_visible.var;
 }
 
 void
-gnm_conf_set_core_gui_toolbars_FormatToolbar_position (GtkPositionType x)
+gnm_conf_set_core_gui_toolbars_format_visible (gboolean x)
 {
-	if (!watch_core_gui_toolbars_FormatToolbar_position.handler)
-		watch_int (&watch_core_gui_toolbars_FormatToolbar_position);
-	set_int (&watch_core_gui_toolbars_FormatToolbar_position, x);
+	if (!watch_core_gui_toolbars_format_visible.handler)
+		watch_bool (&watch_core_gui_toolbars_format_visible);
+	set_bool (&watch_core_gui_toolbars_format_visible, x);
 }
 
 GOConfNode *
-gnm_conf_get_core_gui_toolbars_FormatToolbar_position_node (void)
+gnm_conf_get_core_gui_toolbars_format_visible_node (void)
 {
-	return get_node (watch_core_gui_toolbars_FormatToolbar_position.key);
+	return get_node (watch_core_gui_toolbars_format_visible.key);
 }
 
-static struct cb_watch_bool watch_core_gui_toolbars_LongFormatToolbar = {
-	0, "core/gui/toolbars/LongFormatToolbar", FALSE,
+static struct cb_watch_int watch_core_gui_toolbars_longformat_position = {
+	0, "core/gui/toolbars/longformat-position", 0, 3, 2,
 };
 
-gboolean
-gnm_conf_get_core_gui_toolbars_LongFormatToolbar (void)
+GtkPositionType
+gnm_conf_get_core_gui_toolbars_longformat_position (void)
 {
-	if (!watch_core_gui_toolbars_LongFormatToolbar.handler)
-		watch_bool (&watch_core_gui_toolbars_LongFormatToolbar);
-	return watch_core_gui_toolbars_LongFormatToolbar.var;
+	if (!watch_core_gui_toolbars_longformat_position.handler)
+		watch_int (&watch_core_gui_toolbars_longformat_position);
+	return watch_core_gui_toolbars_longformat_position.var;
 }
 
 void
-gnm_conf_set_core_gui_toolbars_LongFormatToolbar (gboolean x)
+gnm_conf_set_core_gui_toolbars_longformat_position (GtkPositionType x)
 {
-	if (!watch_core_gui_toolbars_LongFormatToolbar.handler)
-		watch_bool (&watch_core_gui_toolbars_LongFormatToolbar);
-	set_bool (&watch_core_gui_toolbars_LongFormatToolbar, x);
+	if (!watch_core_gui_toolbars_longformat_position.handler)
+		watch_int (&watch_core_gui_toolbars_longformat_position);
+	set_int (&watch_core_gui_toolbars_longformat_position, x);
 }
 
 GOConfNode *
-gnm_conf_get_core_gui_toolbars_LongFormatToolbar_node (void)
+gnm_conf_get_core_gui_toolbars_longformat_position_node (void)
 {
-	return get_node (watch_core_gui_toolbars_LongFormatToolbar.key);
+	return get_node (watch_core_gui_toolbars_longformat_position.key);
 }
 
-static struct cb_watch_int watch_core_gui_toolbars_LongFormatToolbar_position = {
-	0, "core/gui/toolbars/LongFormatToolbar-position", 0, 3, 2,
+static struct cb_watch_bool watch_core_gui_toolbars_longformat_visible = {
+	0, "core/gui/toolbars/longformat-visible", FALSE,
 };
 
-GtkPositionType
-gnm_conf_get_core_gui_toolbars_LongFormatToolbar_position (void)
+gboolean
+gnm_conf_get_core_gui_toolbars_longformat_visible (void)
 {
-	if (!watch_core_gui_toolbars_LongFormatToolbar_position.handler)
-		watch_int (&watch_core_gui_toolbars_LongFormatToolbar_position);
-	return watch_core_gui_toolbars_LongFormatToolbar_position.var;
+	if (!watch_core_gui_toolbars_longformat_visible.handler)
+		watch_bool (&watch_core_gui_toolbars_longformat_visible);
+	return watch_core_gui_toolbars_longformat_visible.var;
 }
 
 void
-gnm_conf_set_core_gui_toolbars_LongFormatToolbar_position (GtkPositionType x)
+gnm_conf_set_core_gui_toolbars_longformat_visible (gboolean x)
 {
-	if (!watch_core_gui_toolbars_LongFormatToolbar_position.handler)
-		watch_int (&watch_core_gui_toolbars_LongFormatToolbar_position);
-	set_int (&watch_core_gui_toolbars_LongFormatToolbar_position, x);
+	if (!watch_core_gui_toolbars_longformat_visible.handler)
+		watch_bool (&watch_core_gui_toolbars_longformat_visible);
+	set_bool (&watch_core_gui_toolbars_longformat_visible, x);
 }
 
 GOConfNode *
-gnm_conf_get_core_gui_toolbars_LongFormatToolbar_position_node (void)
+gnm_conf_get_core_gui_toolbars_longformat_visible_node (void)
 {
-	return get_node (watch_core_gui_toolbars_LongFormatToolbar_position.key);
+	return get_node (watch_core_gui_toolbars_longformat_visible.key);
 }
 
-static struct cb_watch_bool watch_core_gui_toolbars_ObjectToolbar = {
-	0, "core/gui/toolbars/ObjectToolbar", FALSE,
+static struct cb_watch_int watch_core_gui_toolbars_object_position = {
+	0, "core/gui/toolbars/object-position", 0, 3, 2,
 };
 
-gboolean
-gnm_conf_get_core_gui_toolbars_ObjectToolbar (void)
+GtkPositionType
+gnm_conf_get_core_gui_toolbars_object_position (void)
 {
-	if (!watch_core_gui_toolbars_ObjectToolbar.handler)
-		watch_bool (&watch_core_gui_toolbars_ObjectToolbar);
-	return watch_core_gui_toolbars_ObjectToolbar.var;
+	if (!watch_core_gui_toolbars_object_position.handler)
+		watch_int (&watch_core_gui_toolbars_object_position);
+	return watch_core_gui_toolbars_object_position.var;
 }
 
 void
-gnm_conf_set_core_gui_toolbars_ObjectToolbar (gboolean x)
+gnm_conf_set_core_gui_toolbars_object_position (GtkPositionType x)
 {
-	if (!watch_core_gui_toolbars_ObjectToolbar.handler)
-		watch_bool (&watch_core_gui_toolbars_ObjectToolbar);
-	set_bool (&watch_core_gui_toolbars_ObjectToolbar, x);
+	if (!watch_core_gui_toolbars_object_position.handler)
+		watch_int (&watch_core_gui_toolbars_object_position);
+	set_int (&watch_core_gui_toolbars_object_position, x);
 }
 
 GOConfNode *
-gnm_conf_get_core_gui_toolbars_ObjectToolbar_node (void)
+gnm_conf_get_core_gui_toolbars_object_position_node (void)
 {
-	return get_node (watch_core_gui_toolbars_ObjectToolbar.key);
+	return get_node (watch_core_gui_toolbars_object_position.key);
 }
 
-static struct cb_watch_int watch_core_gui_toolbars_ObjectToolbar_position = {
-	0, "core/gui/toolbars/ObjectToolbar-position", 0, 3, 2,
+static struct cb_watch_bool watch_core_gui_toolbars_object_visible = {
+	0, "core/gui/toolbars/object-visible", FALSE,
 };
 
-GtkPositionType
-gnm_conf_get_core_gui_toolbars_ObjectToolbar_position (void)
+gboolean
+gnm_conf_get_core_gui_toolbars_object_visible (void)
 {
-	if (!watch_core_gui_toolbars_ObjectToolbar_position.handler)
-		watch_int (&watch_core_gui_toolbars_ObjectToolbar_position);
-	return watch_core_gui_toolbars_ObjectToolbar_position.var;
+	if (!watch_core_gui_toolbars_object_visible.handler)
+		watch_bool (&watch_core_gui_toolbars_object_visible);
+	return watch_core_gui_toolbars_object_visible.var;
 }
 
 void
-gnm_conf_set_core_gui_toolbars_ObjectToolbar_position (GtkPositionType x)
+gnm_conf_set_core_gui_toolbars_object_visible (gboolean x)
 {
-	if (!watch_core_gui_toolbars_ObjectToolbar_position.handler)
-		watch_int (&watch_core_gui_toolbars_ObjectToolbar_position);
-	set_int (&watch_core_gui_toolbars_ObjectToolbar_position, x);
+	if (!watch_core_gui_toolbars_object_visible.handler)
+		watch_bool (&watch_core_gui_toolbars_object_visible);
+	set_bool (&watch_core_gui_toolbars_object_visible, x);
 }
 
 GOConfNode *
-gnm_conf_get_core_gui_toolbars_ObjectToolbar_position_node (void)
+gnm_conf_get_core_gui_toolbars_object_visible_node (void)
 {
-	return get_node (watch_core_gui_toolbars_ObjectToolbar_position.key);
+	return get_node (watch_core_gui_toolbars_object_visible.key);
 }
 
-static struct cb_watch_bool watch_core_gui_toolbars_StandardToolbar = {
-	0, "core/gui/toolbars/StandardToolbar", TRUE,
+static struct cb_watch_int watch_core_gui_toolbars_standard_position = {
+	0, "core/gui/toolbars/standard-position", 0, 3, 2,
 };
 
-gboolean
-gnm_conf_get_core_gui_toolbars_StandardToolbar (void)
+GtkPositionType
+gnm_conf_get_core_gui_toolbars_standard_position (void)
 {
-	if (!watch_core_gui_toolbars_StandardToolbar.handler)
-		watch_bool (&watch_core_gui_toolbars_StandardToolbar);
-	return watch_core_gui_toolbars_StandardToolbar.var;
+	if (!watch_core_gui_toolbars_standard_position.handler)
+		watch_int (&watch_core_gui_toolbars_standard_position);
+	return watch_core_gui_toolbars_standard_position.var;
 }
 
 void
-gnm_conf_set_core_gui_toolbars_StandardToolbar (gboolean x)
+gnm_conf_set_core_gui_toolbars_standard_position (GtkPositionType x)
 {
-	if (!watch_core_gui_toolbars_StandardToolbar.handler)
-		watch_bool (&watch_core_gui_toolbars_StandardToolbar);
-	set_bool (&watch_core_gui_toolbars_StandardToolbar, x);
+	if (!watch_core_gui_toolbars_standard_position.handler)
+		watch_int (&watch_core_gui_toolbars_standard_position);
+	set_int (&watch_core_gui_toolbars_standard_position, x);
 }
 
 GOConfNode *
-gnm_conf_get_core_gui_toolbars_StandardToolbar_node (void)
+gnm_conf_get_core_gui_toolbars_standard_position_node (void)
 {
-	return get_node (watch_core_gui_toolbars_StandardToolbar.key);
+	return get_node (watch_core_gui_toolbars_standard_position.key);
 }
 
-static struct cb_watch_int watch_core_gui_toolbars_StandardToolbar_position = {
-	0, "core/gui/toolbars/StandardToolbar-position", 0, 3, 2,
+static struct cb_watch_bool watch_core_gui_toolbars_standard_visible = {
+	0, "core/gui/toolbars/standard-visible", TRUE,
 };
 
-GtkPositionType
-gnm_conf_get_core_gui_toolbars_StandardToolbar_position (void)
+gboolean
+gnm_conf_get_core_gui_toolbars_standard_visible (void)
 {
-	if (!watch_core_gui_toolbars_StandardToolbar_position.handler)
-		watch_int (&watch_core_gui_toolbars_StandardToolbar_position);
-	return watch_core_gui_toolbars_StandardToolbar_position.var;
+	if (!watch_core_gui_toolbars_standard_visible.handler)
+		watch_bool (&watch_core_gui_toolbars_standard_visible);
+	return watch_core_gui_toolbars_standard_visible.var;
 }
 
 void
-gnm_conf_set_core_gui_toolbars_StandardToolbar_position (GtkPositionType x)
+gnm_conf_set_core_gui_toolbars_standard_visible (gboolean x)
 {
-	if (!watch_core_gui_toolbars_StandardToolbar_position.handler)
-		watch_int (&watch_core_gui_toolbars_StandardToolbar_position);
-	set_int (&watch_core_gui_toolbars_StandardToolbar_position, x);
+	if (!watch_core_gui_toolbars_standard_visible.handler)
+		watch_bool (&watch_core_gui_toolbars_standard_visible);
+	set_bool (&watch_core_gui_toolbars_standard_visible, x);
 }
 
 GOConfNode *
-gnm_conf_get_core_gui_toolbars_StandardToolbar_position_node (void)
+gnm_conf_get_core_gui_toolbars_standard_visible_node (void)
 {
-	return get_node (watch_core_gui_toolbars_StandardToolbar_position.key);
+	return get_node (watch_core_gui_toolbars_standard_visible.key);
 }
 
 static struct cb_watch_double watch_core_gui_window_x = {
diff --git a/src/gnumeric-gconf.h b/src/gnumeric-gconf.h
index 92284d0..462a259 100644
--- a/src/gnumeric-gconf.h
+++ b/src/gnumeric-gconf.h
@@ -141,37 +141,37 @@ GOConfNode *gnm_conf_get_core_gui_screen_verticaldpi_node (void);
 double gnm_conf_get_core_gui_screen_verticaldpi (void);
 void gnm_conf_set_core_gui_screen_verticaldpi (double);
 
-GOConfNode *gnm_conf_get_core_gui_toolbars_FormatToolbar_node (void);
-gboolean gnm_conf_get_core_gui_toolbars_FormatToolbar (void);
-void gnm_conf_set_core_gui_toolbars_FormatToolbar (gboolean);
+GOConfNode *gnm_conf_get_core_gui_toolbars_format_position_node (void);
+GtkPositionType gnm_conf_get_core_gui_toolbars_format_position (void);
+void gnm_conf_set_core_gui_toolbars_format_position (GtkPositionType);
 
-GOConfNode *gnm_conf_get_core_gui_toolbars_FormatToolbar_position_node (void);
-GtkPositionType gnm_conf_get_core_gui_toolbars_FormatToolbar_position (void);
-void gnm_conf_set_core_gui_toolbars_FormatToolbar_position (GtkPositionType);
+GOConfNode *gnm_conf_get_core_gui_toolbars_format_visible_node (void);
+gboolean gnm_conf_get_core_gui_toolbars_format_visible (void);
+void gnm_conf_set_core_gui_toolbars_format_visible (gboolean);
 
-GOConfNode *gnm_conf_get_core_gui_toolbars_LongFormatToolbar_node (void);
-gboolean gnm_conf_get_core_gui_toolbars_LongFormatToolbar (void);
-void gnm_conf_set_core_gui_toolbars_LongFormatToolbar (gboolean);
+GOConfNode *gnm_conf_get_core_gui_toolbars_longformat_position_node (void);
+GtkPositionType gnm_conf_get_core_gui_toolbars_longformat_position (void);
+void gnm_conf_set_core_gui_toolbars_longformat_position (GtkPositionType);
 
-GOConfNode *gnm_conf_get_core_gui_toolbars_LongFormatToolbar_position_node (void);
-GtkPositionType gnm_conf_get_core_gui_toolbars_LongFormatToolbar_position (void);
-void gnm_conf_set_core_gui_toolbars_LongFormatToolbar_position (GtkPositionType);
+GOConfNode *gnm_conf_get_core_gui_toolbars_longformat_visible_node (void);
+gboolean gnm_conf_get_core_gui_toolbars_longformat_visible (void);
+void gnm_conf_set_core_gui_toolbars_longformat_visible (gboolean);
 
-GOConfNode *gnm_conf_get_core_gui_toolbars_ObjectToolbar_node (void);
-gboolean gnm_conf_get_core_gui_toolbars_ObjectToolbar (void);
-void gnm_conf_set_core_gui_toolbars_ObjectToolbar (gboolean);
+GOConfNode *gnm_conf_get_core_gui_toolbars_object_position_node (void);
+GtkPositionType gnm_conf_get_core_gui_toolbars_object_position (void);
+void gnm_conf_set_core_gui_toolbars_object_position (GtkPositionType);
 
-GOConfNode *gnm_conf_get_core_gui_toolbars_ObjectToolbar_position_node (void);
-GtkPositionType gnm_conf_get_core_gui_toolbars_ObjectToolbar_position (void);
-void gnm_conf_set_core_gui_toolbars_ObjectToolbar_position (GtkPositionType);
+GOConfNode *gnm_conf_get_core_gui_toolbars_object_visible_node (void);
+gboolean gnm_conf_get_core_gui_toolbars_object_visible (void);
+void gnm_conf_set_core_gui_toolbars_object_visible (gboolean);
 
-GOConfNode *gnm_conf_get_core_gui_toolbars_StandardToolbar_node (void);
-gboolean gnm_conf_get_core_gui_toolbars_StandardToolbar (void);
-void gnm_conf_set_core_gui_toolbars_StandardToolbar (gboolean);
+GOConfNode *gnm_conf_get_core_gui_toolbars_standard_position_node (void);
+GtkPositionType gnm_conf_get_core_gui_toolbars_standard_position (void);
+void gnm_conf_set_core_gui_toolbars_standard_position (GtkPositionType);
 
-GOConfNode *gnm_conf_get_core_gui_toolbars_StandardToolbar_position_node (void);
-GtkPositionType gnm_conf_get_core_gui_toolbars_StandardToolbar_position (void);
-void gnm_conf_set_core_gui_toolbars_StandardToolbar_position (GtkPositionType);
+GOConfNode *gnm_conf_get_core_gui_toolbars_standard_visible_node (void);
+gboolean gnm_conf_get_core_gui_toolbars_standard_visible (void);
+void gnm_conf_set_core_gui_toolbars_standard_visible (gboolean);
 
 GOConfNode *gnm_conf_get_core_gui_window_x_node (void);
 double gnm_conf_get_core_gui_window_x (void);
diff --git a/tools/handle-conf-options b/tools/handle-conf-options
index 4e0cfc9..3383ca3 100644
--- a/tools/handle-conf-options
+++ b/tools/handle-conf-options
@@ -181,25 +181,25 @@ my %extra_attributes =
 	 'max' => 5000
      },
 
-     '/apps/gnumeric/core/gui/toolbars/FormatToolbar-position' => {
+     '/apps/gnumeric/core/gui/toolbars/format-position' => {
 	 'gtype' => 'GTK_TYPE_POSITION',
 	 'min' => 0,
 	 'max' => 3,
      },
 
-     '/apps/gnumeric/core/gui/toolbars/LongFormatToolbar-position' => {
+     '/apps/gnumeric/core/gui/toolbars/longformat-position' => {
 	 'gtype' => 'GTK_TYPE_POSITION',
 	 'min' => 0,
 	 'max' => 3,
      },
 
-     '/apps/gnumeric/core/gui/toolbars/ObjectToolbar-position' => {
+     '/apps/gnumeric/core/gui/toolbars/object-position' => {
 	 'gtype' => 'GTK_TYPE_POSITION',
 	 'min' => 0,
 	 'max' => 3,
      },
 
-     '/apps/gnumeric/core/gui/toolbars/StandardToolbar-position' => {
+     '/apps/gnumeric/core/gui/toolbars/standard-position' => {
 	 'gtype' => 'GTK_TYPE_POSITION',
 	 'min' => 0,
 	 'max' => 3,
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]