[gnumeric] updated src/gnumeric-conf.[hc] with tools/handle-conf-options using corrected paths



commit e9649852e8ccf128b98e353c415ac501da80795b
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Sat Nov 10 11:28:14 2012 -0700

    updated src/gnumeric-conf.[hc] with tools/handle-conf-options using corrected paths
    
    2012-11-10  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* src/gnumeric-conf.h: updated using tools/handle-conf-options
    	* src/gnumeric-conf.c: updated using tools/handle-conf-options
    
    2012-11-10  Andreas J Guelzow <aguelzow pyrshep ca>
    
    	* handle-conf-options: fix paths

 ChangeLog                 |    5 ++
 src/gnumeric-conf.c       |  170 +--------------------------------------------
 src/gnumeric-conf.h       |   33 ++++-----
 tools/ChangeLog           |    4 +
 tools/handle-conf-options |   82 +++++++++++-----------
 5 files changed, 68 insertions(+), 226 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 19663c0..12e92db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-10  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* src/gnumeric-conf.h: updated using tools/handle-conf-options
+	* src/gnumeric-conf.c: updated using tools/handle-conf-options
+
 2012-11-10  Jean Brefort  <jean brefort normalesup org>
 
 	* src/sheet-object-image.c (gnm_soi_get_target_list): don't crash when
diff --git a/src/gnumeric-conf.c b/src/gnumeric-conf.c
index 0c35d1c..0af93ef 100644
--- a/src/gnumeric-conf.c
+++ b/src/gnumeric-conf.c
@@ -731,12 +731,6 @@ static struct cb_watch_string_list watch_autocorrect_first_letter_list = {
 	"The autocorrect engine does not capitalize the first letter of words following strings in this list.",
 };
 
-
-/**
- * gnm_conf_get_autocorrect_first_letter_list:
- *
- * Returns: (element-type char) (transfer none): the default #GtkPageSetup.
- **/
 GSList *
 gnm_conf_get_autocorrect_first_letter_list (void)
 {
@@ -745,11 +739,6 @@ gnm_conf_get_autocorrect_first_letter_list (void)
 	return watch_autocorrect_first_letter_list.var;
 }
 
-/**
- * gnm_conf_set_autocorrect_first_letter_list:
- * @l: (element-type char): list of strings.
- *
- **/
 void
 gnm_conf_set_autocorrect_first_letter_list (GSList *x)
 {
@@ -799,11 +788,6 @@ static struct cb_watch_string_list watch_autocorrect_init_caps_list = {
 	"The autocorrect engine does not correct the initial caps for words in this list.",
 };
 
-/**
- * gnm_conf_get_autocorrect_init_caps_list:
- *
- * Returns: (element-type char) (transfer none):
- **/
 GSList *
 gnm_conf_get_autocorrect_init_caps_list (void)
 {
@@ -812,11 +796,6 @@ gnm_conf_get_autocorrect_init_caps_list (void)
 	return watch_autocorrect_init_caps_list.var;
 }
 
-/**
- * gnm_conf_set_autocorrect_init_caps_list:
- * @l: (element-type char): list of strings.
- *
- **/
 void
 gnm_conf_set_autocorrect_init_caps_list (GSList *x)
 {
@@ -895,12 +874,6 @@ static struct cb_watch_string_list watch_autoformat_extra_dirs = {
 	"This list contains all extra directories containing autoformat templates.",
 };
 
-
-/**
- * gnm_conf_get_autoformat_extra_dirs:
- *
- * Returns: (element-type char) (transfer none):
- **/
 GSList *
 gnm_conf_get_autoformat_extra_dirs (void)
 {
@@ -909,11 +882,6 @@ gnm_conf_get_autoformat_extra_dirs (void)
 	return watch_autoformat_extra_dirs.var;
 }
 
-/**
- * gnm_conf_set_autoformat_extra_dirs:
- * @l: (element-type char): list of strings.
- *
- **/
 void
 gnm_conf_set_autoformat_extra_dirs (GSList *x)
 {
@@ -1140,12 +1108,6 @@ static struct cb_watch_string_list watch_core_file_save_extension_check_disabled
 	"This list contains the ids of the file savers for which the extension check is disabled.",
 };
 
-
-/**
- * gnm_conf_get_core_file_save_extension_check_disabled:
- *
- * Returns: (element-type char) (transfer none):
- **/
 GSList *
 gnm_conf_get_core_file_save_extension_check_disabled (void)
 {
@@ -1154,11 +1116,6 @@ gnm_conf_get_core_file_save_extension_check_disabled (void)
 	return watch_core_file_save_extension_check_disabled.var;
 }
 
-/**
- * gnm_conf_set_core_file_save_extension_check_disabled:
- * @l: (element-type char): list of strings.
- *
- **/
 void
 gnm_conf_set_core_file_save_extension_check_disabled (GSList *x)
 {
@@ -1270,9 +1227,7 @@ static struct cb_watch_bool watch_core_gui_editing_autocomplete = {
 gboolean
 gnm_conf_get_core_gui_editing_autocomplete (void)
 {
-	/* testing for node_pool since this is called from
-	 workbook_view_class_init(), fixes criticals during intospÃction build */
-	if (node_pool && !watch_core_gui_editing_autocomplete.handler)
+	if (!watch_core_gui_editing_autocomplete.handler)
 		watch_bool (&watch_core_gui_editing_autocomplete);
 	return watch_core_gui_editing_autocomplete.var;
 }
@@ -2225,12 +2180,6 @@ static struct cb_watch_string_list watch_functionselector_recentfunctions = {
 	"The function selector keeps a list of recently used functions. This is that list.",
 };
 
-
-/**
- * gnm_conf_get_functionselector_recentfunctions:
- *
- * Returns: (element-type char) (transfer none):
- **/
 GSList *
 gnm_conf_get_functionselector_recentfunctions (void)
 {
@@ -2239,11 +2188,6 @@ gnm_conf_get_functionselector_recentfunctions (void)
 	return watch_functionselector_recentfunctions.var;
 }
 
-/**
- * gnm_conf_set_functionselector_recentfunctions:
- * @l: (element-type char): list of strings.
- *
- **/
 void
 gnm_conf_set_functionselector_recentfunctions (GSList *x)
 {
@@ -2371,7 +2315,7 @@ gnm_conf_set_plugins_activate_new (gboolean x)
 }
 
 GOConfNode *
-gnm_conf_get_plugins_activate_nEw_node (void)
+gnm_conf_get_plugins_activate_new_node (void)
 {
 	return get_watch_node (&watch_plugins_activate_new);
 }
@@ -2382,12 +2326,6 @@ static struct cb_watch_string_list watch_plugins_active = {
 	"This list contains all plugins that are supposed to be automatically activated.",
 };
 
-
-/**
- * gnm_conf_get_plugins_active:
- *
- * Returns: (element-type char) (transfer none):
- **/
 GSList *
 gnm_conf_get_plugins_active (void)
 {
@@ -2396,11 +2334,6 @@ gnm_conf_get_plugins_active (void)
 	return watch_plugins_active.var;
 }
 
-/**
- * gnm_conf_set_plugins_active:
- * @l: (element-type char): list of strings.
- *
- **/
 void
 gnm_conf_set_plugins_active (GSList *x)
 {
@@ -2421,12 +2354,6 @@ static struct cb_watch_string_list watch_plugins_extra_dirs = {
 	"This list contains all extra directories containing plugins.",
 };
 
-
-/**
- * gnm_conf_get_plugins_extra_dirs:
- *
- * Returns: (element-type char) (transfer none):
- **/
 GSList *
 gnm_conf_get_plugins_extra_dirs (void)
 {
@@ -2435,11 +2362,6 @@ gnm_conf_get_plugins_extra_dirs (void)
 	return watch_plugins_extra_dirs.var;
 }
 
-/**
- * gnm_conf_set_plugins_extra_dirs:
- * @l: (element-type char): list of strings.
- *
- **/
 void
 gnm_conf_set_plugins_extra_dirs (GSList *x)
 {
@@ -2460,12 +2382,6 @@ static struct cb_watch_string_list watch_plugins_file_states = {
 	"This list contains all plugin file states.",
 };
 
-
-/**
- * gnm_conf_get_plugins_file_states:
- *
- * Returns: (element-type char) (transfer none):
- **/
 GSList *
 gnm_conf_get_plugins_file_states (void)
 {
@@ -2474,11 +2390,6 @@ gnm_conf_get_plugins_file_states (void)
 	return watch_plugins_file_states.var;
 }
 
-/**
- * gnm_conf_set_plugins_file_states:
- * @l: (element-type char): list of strings.
- *
- **/
 void
 gnm_conf_set_plugins_file_states (GSList *x)
 {
@@ -2499,12 +2410,6 @@ static struct cb_watch_string_list watch_plugins_known = {
 	"This list contains all known plugins.",
 };
 
-
-/**
- * gnm_conf_get_plugins_known:
- *
- * Returns: (element-type char) (transfer none):
- **/
 GSList *
 gnm_conf_get_plugins_known (void)
 {
@@ -2513,11 +2418,6 @@ gnm_conf_get_plugins_known (void)
 	return watch_plugins_known.var;
 }
 
-/**
- * gnm_conf_set_plugins_known:
- * @l: (element-type char): list of strings.
- *
- **/
 void
 gnm_conf_set_plugins_known (GSList *x)
 {
@@ -2654,12 +2554,6 @@ static struct cb_watch_string_list watch_printsetup_footer = {
 	"The default page footer for new documents that can be modified using the\n	page setup dialog.",
 };
 
-
-/**
- * gnm_conf_get_printsetup_footer:
- *
- * Returns: (element-type char) (transfer none):
- **/
 GSList *
 gnm_conf_get_printsetup_footer (void)
 {
@@ -2668,11 +2562,6 @@ gnm_conf_get_printsetup_footer (void)
 	return watch_printsetup_footer.var;
 }
 
-/**
- * gnm_conf_set_printsetup_footer:
- * @l: (element-type char): list of strings.
- *
- **/
 void
 gnm_conf_set_printsetup_footer (GSList *x)
 {
@@ -2693,12 +2582,6 @@ static struct cb_watch_string_list watch_printsetup_gtk_setting = {
 	"The configuration of GTKPrintSetting. Do not edit this variable.",
 };
 
-
-/**
- * gnm_conf_get_printsetup_gtk_setting:
- *
- * Returns: (element-type char) (transfer none):
- **/
 GSList *
 gnm_conf_get_printsetup_gtk_setting (void)
 {
@@ -2707,11 +2590,6 @@ gnm_conf_get_printsetup_gtk_setting (void)
 	return watch_printsetup_gtk_setting.var;
 }
 
-/**
- * gnm_conf_set_printsetup_gtk_setting:
- * @l: (element-type char): list of strings.
- *
- **/
 void
 gnm_conf_set_printsetup_gtk_setting (GSList *x)
 {
@@ -2732,12 +2610,6 @@ static struct cb_watch_string_list watch_printsetup_header = {
 	"The default page header for new documents that can be modified using the\n	page setup dialog.",
 };
 
-
-/**
- * gnm_conf_get_printsetup_header:
- *
- * Returns: (element-type char) (transfer none):
- **/
 GSList *
 gnm_conf_get_printsetup_header (void)
 {
@@ -2746,11 +2618,6 @@ gnm_conf_get_printsetup_header (void)
 	return watch_printsetup_header.var;
 }
 
-/**
- * gnm_conf_set_printsetup_header:
- * @l: (element-type char): list of strings.
- *
- **/
 void
 gnm_conf_set_printsetup_header (GSList *x)
 {
@@ -2888,12 +2755,6 @@ static struct cb_watch_string_list watch_printsetup_hf_left = {
 	"Please use the Print Setup dialog to edit this value.",
 };
 
-
-/**
- * gnm_conf_get_printsetup_hf_left:
- *
- * Returns: (element-type char) (transfer none):
- **/
 GSList *
 gnm_conf_get_printsetup_hf_left (void)
 {
@@ -2902,11 +2763,6 @@ gnm_conf_get_printsetup_hf_left (void)
 	return watch_printsetup_hf_left.var;
 }
 
-/**
- * gnm_conf_set_printsetup_hf_left:
- * @l: (element-type char): list of strings.
- *
- **/
 void
 gnm_conf_set_printsetup_hf_left (GSList *x)
 {
@@ -2927,12 +2783,6 @@ static struct cb_watch_string_list watch_printsetup_hf_middle = {
 	"Please use the Print Setup dialog to edit this value.",
 };
 
-
-/**
- * gnm_conf_get_printsetup_hf_middle:
- *
- * Returns: (element-type char) (transfer none):
- **/
 GSList *
 gnm_conf_get_printsetup_hf_middle (void)
 {
@@ -2941,11 +2791,6 @@ gnm_conf_get_printsetup_hf_middle (void)
 	return watch_printsetup_hf_middle.var;
 }
 
-/**
- * gnm_conf_set_printsetup_hf_middle:
- * @l: (element-type char): list of strings.
- *
- **/
 void
 gnm_conf_set_printsetup_hf_middle (GSList *x)
 {
@@ -2966,12 +2811,6 @@ static struct cb_watch_string_list watch_printsetup_hf_right = {
 	"Please use the Print Setup dialog to edit this value.",
 };
 
-
-/**
- * gnm_conf_get_printsetup_hf_right:
- *
- * Returns: (element-type char) (transfer none):
- **/
 GSList *
 gnm_conf_get_printsetup_hf_right (void)
 {
@@ -2980,11 +2819,6 @@ gnm_conf_get_printsetup_hf_right (void)
 	return watch_printsetup_hf_right.var;
 }
 
-/**
- * gnm_conf_set_printsetup_hf_right:
- * @l: (element-type char): list of strings.
- *
- **/
 void
 gnm_conf_set_printsetup_hf_right (GSList *x)
 {
diff --git a/src/gnumeric-conf.h b/src/gnumeric-conf.h
index 8e77183..b6a894f 100644
--- a/src/gnumeric-conf.h
+++ b/src/gnumeric-conf.h
@@ -39,7 +39,7 @@ void gnm_conf_set_autocorrect_first_letter (gboolean);
 
 GOConfNode *gnm_conf_get_autocorrect_first_letter_list_node (void);
 GSList *gnm_conf_get_autocorrect_first_letter_list (void);
-void gnm_conf_set_autocorrect_first_letter_list (GSList *l);
+void gnm_conf_set_autocorrect_first_letter_list (GSList *);
 
 GOConfNode *gnm_conf_get_autocorrect_init_caps_node (void);
 gboolean gnm_conf_get_autocorrect_init_caps (void);
@@ -47,7 +47,7 @@ void gnm_conf_set_autocorrect_init_caps (gboolean);
 
 GOConfNode *gnm_conf_get_autocorrect_init_caps_list_node (void);
 GSList *gnm_conf_get_autocorrect_init_caps_list (void);
-void gnm_conf_set_autocorrect_init_caps_list (GSList *l);
+void gnm_conf_set_autocorrect_init_caps_list (GSList *);
 
 GOConfNode *gnm_conf_get_autocorrect_names_of_days_node (void);
 gboolean gnm_conf_get_autocorrect_names_of_days (void);
@@ -59,7 +59,7 @@ void gnm_conf_set_autocorrect_replace (gboolean);
 
 GOConfNode *gnm_conf_get_autoformat_extra_dirs_node (void);
 GSList *gnm_conf_get_autoformat_extra_dirs (void);
-void gnm_conf_set_autoformat_extra_dirs (GSList *l);
+void gnm_conf_set_autoformat_extra_dirs (GSList *);
 
 GOConfNode *gnm_conf_get_autoformat_sys_dir_node (void);
 const char *gnm_conf_get_autoformat_sys_dir (void);
@@ -91,7 +91,7 @@ void gnm_conf_set_core_file_save_def_overwrite (gboolean);
 
 GOConfNode *gnm_conf_get_core_file_save_extension_check_disabled_node (void);
 GSList *gnm_conf_get_core_file_save_extension_check_disabled (void);
-void gnm_conf_set_core_file_save_extension_check_disabled (GSList *l);
+void gnm_conf_set_core_file_save_extension_check_disabled (GSList *);
 
 GOConfNode *gnm_conf_get_core_file_save_single_sheet_node (void);
 gboolean gnm_conf_get_core_file_save_single_sheet (void);
@@ -239,7 +239,7 @@ void gnm_conf_set_functionselector_num_of_recent (int);
 
 GOConfNode *gnm_conf_get_functionselector_recentfunctions_node (void);
 GSList *gnm_conf_get_functionselector_recentfunctions (void);
-void gnm_conf_set_functionselector_recentfunctions (GSList *l);
+void gnm_conf_set_functionselector_recentfunctions (GSList *);
 
 GOConfNode *gnm_conf_get_plugin_glpk_glpsol_path_node (void);
 const char *gnm_conf_get_plugin_glpk_glpsol_path (void);
@@ -253,26 +253,25 @@ GOConfNode *gnm_conf_get_plugin_lpsolve_lpsolve_path_node (void);
 const char *gnm_conf_get_plugin_lpsolve_lpsolve_path (void);
 void gnm_conf_set_plugin_lpsolve_lpsolve_path (const char *);
 
-/* capitalized E to make introspection happy */
-GOConfNode *gnm_conf_get_plugins_activate_nEw_node (void);
+GOConfNode *gnm_conf_get_plugins_activate_new_node (void);
 gboolean gnm_conf_get_plugins_activate_new (void);
 void gnm_conf_set_plugins_activate_new (gboolean);
 
 GOConfNode *gnm_conf_get_plugins_active_node (void);
 GSList *gnm_conf_get_plugins_active (void);
-void gnm_conf_set_plugins_active (GSList *l);
+void gnm_conf_set_plugins_active (GSList *);
 
 GOConfNode *gnm_conf_get_plugins_extra_dirs_node (void);
 GSList *gnm_conf_get_plugins_extra_dirs (void);
-void gnm_conf_set_plugins_extra_dirs (GSList *l);
+void gnm_conf_set_plugins_extra_dirs (GSList *);
 
 GOConfNode *gnm_conf_get_plugins_file_states_node (void);
 GSList *gnm_conf_get_plugins_file_states (void);
-void gnm_conf_set_plugins_file_states (GSList *l);
+void gnm_conf_set_plugins_file_states (GSList *);
 
 GOConfNode *gnm_conf_get_plugins_known_node (void);
 GSList *gnm_conf_get_plugins_known (void);
-void gnm_conf_set_plugins_known (GSList *l);
+void gnm_conf_set_plugins_known (GSList *);
 
 GOConfNode *gnm_conf_get_printsetup_across_then_down_node (void);
 gboolean gnm_conf_get_printsetup_across_then_down (void);
@@ -292,15 +291,15 @@ void gnm_conf_set_printsetup_center_vertically (gboolean);
 
 GOConfNode *gnm_conf_get_printsetup_footer_node (void);
 GSList *gnm_conf_get_printsetup_footer (void);
-void gnm_conf_set_printsetup_footer (GSList *l);
+void gnm_conf_set_printsetup_footer (GSList *);
 
 GOConfNode *gnm_conf_get_printsetup_gtk_setting_node (void);
 GSList *gnm_conf_get_printsetup_gtk_setting (void);
-void gnm_conf_set_printsetup_gtk_setting (GSList *l);
+void gnm_conf_set_printsetup_gtk_setting (GSList *);
 
 GOConfNode *gnm_conf_get_printsetup_header_node (void);
 GSList *gnm_conf_get_printsetup_header (void);
-void gnm_conf_set_printsetup_header (GSList *l);
+void gnm_conf_set_printsetup_header (GSList *);
 
 GOConfNode *gnm_conf_get_printsetup_hf_font_bold_node (void);
 gboolean gnm_conf_get_printsetup_hf_font_bold (void);
@@ -320,15 +319,15 @@ void gnm_conf_set_printsetup_hf_font_size (double);
 
 GOConfNode *gnm_conf_get_printsetup_hf_left_node (void);
 GSList *gnm_conf_get_printsetup_hf_left (void);
-void gnm_conf_set_printsetup_hf_left (GSList *l);
+void gnm_conf_set_printsetup_hf_left (GSList *);
 
 GOConfNode *gnm_conf_get_printsetup_hf_middle_node (void);
 GSList *gnm_conf_get_printsetup_hf_middle (void);
-void gnm_conf_set_printsetup_hf_middle (GSList *l);
+void gnm_conf_set_printsetup_hf_middle (GSList *);
 
 GOConfNode *gnm_conf_get_printsetup_hf_right_node (void);
 GSList *gnm_conf_get_printsetup_hf_right (void);
-void gnm_conf_set_printsetup_hf_right (GSList *l);
+void gnm_conf_set_printsetup_hf_right (GSList *);
 
 GOConfNode *gnm_conf_get_printsetup_margin_bottom_node (void);
 double gnm_conf_get_printsetup_margin_bottom (void);
diff --git a/tools/ChangeLog b/tools/ChangeLog
index 29df771..f0cc182 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-10  Andreas J Guelzow <aguelzow pyrshep ca>
+
+	* handle-conf-options: fix paths
+
 2012-09-06  Morten Welinder <terra gnome org>
 
 	* Release 1.11.6
diff --git a/tools/handle-conf-options b/tools/handle-conf-options
index ad3b143..a55a5fd 100644
--- a/tools/handle-conf-options
+++ b/tools/handle-conf-options
@@ -160,12 +160,12 @@ sub walk_gsetting_tree {
 # -----------------------------------------------------------------------------
 
 my %extra_attributes =
-    ('/apps/gnumeric/core/gui/editing/enter_moves_dir' => {
+    ('/org/gnome/gnumeric/core/gui/editing/enter_moves_dir' => {
 	'gtype' => 'GO_TYPE_DIRECTION',
 	'default' => 'GO_DIRECTION_DOWN',  # Should match schema
      },
 
-     '/apps/gnumeric/printsetup/preferred-unit' => {
+     '/org/gnome/gnumeric/printsetup/preferred-unit' => {
 	 'gtype' => 'GTK_TYPE_UNIT',
 	 'default' => 'GTK_UNIT_MM',  # Should match schema
      },
@@ -176,186 +176,186 @@ my %extra_attributes =
 	 'default' => 'GTK_TOOLBAR_ICONS',  # Should match schema
      },
 
-     '/apps/gnumeric/core/gui/editing/recalclag' => {
+     '/org/gnome/gnumeric/core/gui/editing/recalclag' => {
 	 'min' => -5000,
 	 'max' => 5000
      },
 
-     '/apps/gnumeric/core/gui/editing/autocomplete-min-chars' => {
+     '/org/gnome/gnumeric/core/gui/editing/autocomplete-min-chars' => {
 	 'min' => 1,
 	 'max' => 10
      },
 
-     '/apps/gnumeric/core/gui/toolbars/format-position' => {
+     '/org/gnome/gnumeric/core/gui/toolbars/format-position' => {
 	 'gtype' => 'GTK_TYPE_POSITION',
 	 'min' => 0,
 	 'max' => 3,
      },
 
-     '/apps/gnumeric/core/gui/toolbars/longformat-position' => {
+     '/org/gnome/gnumeric/core/gui/toolbars/longformat-position' => {
 	 'gtype' => 'GTK_TYPE_POSITION',
 	 'min' => 0,
 	 'max' => 3,
      },
 
-     '/apps/gnumeric/core/gui/toolbars/object-position' => {
+     '/org/gnome/gnumeric/core/gui/toolbars/object-position' => {
 	 'gtype' => 'GTK_TYPE_POSITION',
 	 'min' => 0,
 	 'max' => 3,
      },
 
-     '/apps/gnumeric/core/gui/toolbars/standard-position' => {
+     '/org/gnome/gnumeric/core/gui/toolbars/standard-position' => {
 	 'gtype' => 'GTK_TYPE_POSITION',
 	 'min' => 0,
 	 'max' => 3,
      },
 
-     '/apps/gnumeric/core/sort/dialog/max-initial-clauses' => {
+     '/org/gnome/gnumeric/core/sort/dialog/max-initial-clauses' => {
 	 'min' => 0,
 	 'max' => 256,
      },
 
-     '/apps/gnumeric/core/workbook/n-cols' => {
+     '/org/gnome/gnumeric/core/workbook/n-cols' => {
 	 'min' => 'GNM_MIN_COLS',
 	 'max' => 'GNM_MAX_COLS',
      },
 
-     '/apps/gnumeric/core/workbook/n-rows' => {
+     '/org/gnome/gnumeric/core/workbook/n-rows' => {
 	 'min' => 'GNM_MIN_ROWS',
 	 'max' => 'GNM_MAX_ROWS',
      },
 
-     '/apps/gnumeric/core/workbook/n-sheet' => {
+     '/org/gnome/gnumeric/core/workbook/n-sheet' => {
 	 'min' => 1,
 	 'max' => 64,
      },
 
-     '/apps/gnumeric/core/workbook/autosave_time' => {
+     '/org/gnome/gnumeric/core/workbook/autosave_time' => {
 	 'min' => 0,
 	 'max' => '365 * 24 * 60 * 60',
      },
 
-     '/apps/gnumeric/core/xml/compression-level' => {
+     '/org/gnome/gnumeric/core/xml/compression-level' => {
 	 'min' => 0,
 	 'max' => 9,
      },
 
-     '/apps/gnumeric/functionselector/num-of-recent' => {
+     '/org/gnome/gnumeric/functionselector/num-of-recent' => {
 	 'min' => 0,
 	 'max' => 40,
      },
 
-     '/apps/gnumeric/printsetup/paper-orientation' => {
+     '/org/gnome/gnumeric/printsetup/paper-orientation' => {
 	 'min' => 'GTK_PAGE_ORIENTATION_PORTRAIT',
 	 'max' => 'GTK_PAGE_ORIENTATION_REVERSE_LANDSCAPE',
      },
 
-     '/apps/gnumeric/printsetup/scale-height' => {
+     '/org/gnome/gnumeric/printsetup/scale-height' => {
 	 'min' => 0,
 	 'max' => 100,
      },
 
-     '/apps/gnumeric/printsetup/scale-width' => {
+     '/org/gnome/gnumeric/printsetup/scale-width' => {
 	 'min' => 0,
 	 'max' => 100,
      },
 
-     '/apps/gnumeric/undo/max_descriptor_width' => {
+     '/org/gnome/gnumeric/undo/max_descriptor_width' => {
 	 'min' => 5,
 	 'max' => 256,
      },
 
-     '/apps/gnumeric/undo/maxnum' => {
+     '/org/gnome/gnumeric/undo/maxnum' => {
 	 'min' => 0,
 	 'max' => 10000,
      },
 
-     '/apps/gnumeric/undo/size' => {
+     '/org/gnome/gnumeric/undo/size' => {
 	'min' => 1,
 	'max' => 1000000
      },
 
-     '/apps/gnumeric/core/defaultfont/size' => {
+     '/org/gnome/gnumeric/core/defaultfont/size' => {
 	 'min' => 1,
 	 'max' => 100,
      },
 
-     '/apps/gnumeric/core/gui/screen/horizontaldpi' => {
+     '/org/gnome/gnumeric/core/gui/screen/horizontaldpi' => {
 	 'min' => 10,
 	 'max' => 1000,
      },
 
-     '/apps/gnumeric/core/gui/screen/verticaldpi' => {
+     '/org/gnome/gnumeric/core/gui/screen/verticaldpi' => {
 	 'min' => 10,
 	 'max' => 1000,
      },
 
-     '/apps/gnumeric/core/gui/window/x' => {
+     '/org/gnome/gnumeric/core/gui/window/x' => {
 	 'min' => 0.1,
 	 'max' => 1,
      },
 
-     '/apps/gnumeric/core/gui/window/y' => {
+     '/org/gnome/gnumeric/core/gui/window/y' => {
 	 'min' => 0.1,
 	 'max' => 1,
      },
 
-     '/apps/gnumeric/core/gui/window/zoom' => {
+     '/org/gnome/gnumeric/core/gui/window/zoom' => {
 	 'min' => 0.1,
 	 'max' => 5,
      },
 
-     '/apps/gnumeric/printsetup/hf-font-size' => {
+     '/org/gnome/gnumeric/printsetup/hf-font-size' => {
 	 'min' => 1,
 	 'max' => 100,
      },
 
-     '/apps/gnumeric/printsetup/margin-bottom' => {
+     '/org/gnome/gnumeric/printsetup/margin-bottom' => {
 	 'min' => 0,
 	 'max' => 10000,
      },
 
-     '/apps/gnumeric/printsetup/margin-gtk-bottom' => {
+     '/org/gnome/gnumeric/printsetup/margin-gtk-bottom' => {
 	 'min' => 0,
 	 'max' => 720,
      },
 
-     '/apps/gnumeric/printsetup/margin-gtk-left' => {
+     '/org/gnome/gnumeric/printsetup/margin-gtk-left' => {
 	 'min' => 0,
 	 'max' => 720,
      },
 
-     '/apps/gnumeric/printsetup/margin-gtk-right' => {
+     '/org/gnome/gnumeric/printsetup/margin-gtk-right' => {
 	 'min' => 0,
 	 'max' => 720,
      },
 
-     '/apps/gnumeric/printsetup/margin-gtk-top' => {
+     '/org/gnome/gnumeric/printsetup/margin-gtk-top' => {
 	 'min' => 0,
 	 'max' => 720,
      },
 
-     '/apps/gnumeric/printsetup/margin-top' => {
+     '/org/gnome/gnumeric/printsetup/margin-top' => {
 	 'min' => 0,
 	 'max' => 10000,
      },
 
-     '/apps/gnumeric/printsetup/scale-percentage-value' => {
+     '/org/gnome/gnumeric/printsetup/scale-percentage-value' => {
 	 'min' => 1,
 	 'max' => 500,
      },
 
-     '/apps/gnumeric/searchreplace/scope' => {
+     '/org/gnome/gnumeric/searchreplace/scope' => {
 	 'min' => 0,
 	 'max' => 2,
      },
 
-     '/apps/gnumeric/searchreplace/error-behaviour' => {
+     '/org/gnome/gnumeric/searchreplace/error-behaviour' => {
 	 'min' => 0,
 	 'max' => 4,
      },
 
-     '/apps/gnumeric/searchreplace/regex' => {
+     '/org/gnome/gnumeric/searchreplace/regex' => {
 	 'min' => 0,
 	 'max' => 2,
      },
@@ -364,7 +364,7 @@ my %extra_attributes =
 foreach my $key (keys %extra_attributes) {
     my $newkey = $key;
     if ($newkey eq '/apps/gnome-settings/gnumeric/toolbar_style') {
-	$newkey = '/apps/gnumeric/toolbar-style';
+	$newkey = '/org/gnome/gnumeric/toolbar-style';
     } else {
 	$newkey = lc $newkey;
 	$newkey =~ s/_/-/g;
@@ -444,14 +444,14 @@ sub create_hcfile {
 	my $ctypes = "$ctype "; $ctypes =~ s/\*\s/\*/;
 
 	my $var = $key;
-	$var =~ s{^/apps/gnumeric/}{};
+	$var =~ s{^/org/gnome/gnumeric/}{};
 	$var =~ s{^/apps/gnome-settings/gnumeric/}{};
 	$var =~ s{[^a-zA-Z0-9_]}{_}g;
 
 	my $watch_name = "watch_$var";
 
 	my $needs_conf = 0;
-	if ($key =~ s{/apps/gnumeric/}{}) {
+	if ($key =~ s{/org/gnome/gnumeric/}{}) {
 	    my $dir = $key; $dir =~ s{/[^/]+$}{};
 	    $dirs{$dir} = 1;
 	    $needs_conf = 1;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]