[gnumeric] add introspection workaround (_new_) #688060

[Andreas J. Guelzow <guelzow src gnome org>]

commit 01fcb4c6a8e187306f3fc2362e927bd62a4af695
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Sat Nov 10 17:34:15 2012 -0700

    add introspection workaround (_new_) #688060
    
    2012-11-10  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* src/gnumeric-conf.h: updated
    	* src/gnumeric-conf.c: updated
    	* schemas/org.gnome.gnumeric.dialogs.gschema.xml.in.in: change path
    	to avoid introspection bug
    	* component/gnumeric.c (go_plugin_init): adjust for changed
    	autogenerated function name
    	* src/gnm-plugin.c (gnm_plugins_init): ditto
    
    2012-11-10  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* dialog-plugin-manager.c (cb_pm_checkbutton_install_new_toggled):
    	adjust for changed autogenerated function name
    	(pm_dialog_init): ditto

 ChangeLog                                          |   10 ++++++++
 component/gnumeric.c                               |    2 +-
 .../org.gnome.gnumeric.dialogs.gschema.xml.in.in   |    2 +-
 src/dialogs/ChangeLog                              |    6 +++++
 src/dialogs/dialog-plugin-manager.c                |    6 ++--
 src/gnm-plugin.c                                   |    2 +-
 src/gnumeric-conf.c                                |   24 ++++++++++----------
 src/gnumeric-conf.h                                |    6 ++--
 8 files changed, 37 insertions(+), 21 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 49d277f..e891172 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2012-11-10  Andreas J. Guelzow <aguelzow pyrshep ca>
 
+	* src/gnumeric-conf.h: updated
+	* src/gnumeric-conf.c: updated
+	* schemas/org.gnome.gnumeric.dialogs.gschema.xml.in.in: change path
+	to avoid introspection bug
+	* component/gnumeric.c (go_plugin_init): adjust for changed
+	autogenerated function name
+	* src/gnm-plugin.c (gnm_plugins_init): ditto
+
+2012-11-10  Andreas J. Guelzow <aguelzow pyrshep ca>
+
 	* src/gnumeric-conf.h: updated using adjusted tools/handle-conf-options
 	* src/gnumeric-conf.c: updated using adjusted tools/handle-conf-options
 
diff --git a/component/gnumeric.c b/component/gnumeric.c
index c82f9bc..5182c9f 100644
--- a/component/gnumeric.c
+++ b/component/gnumeric.c
@@ -328,7 +328,7 @@ go_plugin_init (GOPlugin *plugin, G_GNUC_UNUSED GOCmdContext *cc)
 			gnm_conf_get_plugins_file_states (),
 			gnm_conf_get_plugins_active (),
 			dir_list,
-			gnm_conf_get_plugins_activate_new (),
+			gnm_conf_get_plugins_activate_newplugins (),
 			gnm_plugin_loader_module_get_type ());
 }
 
diff --git a/schemas/org.gnome.gnumeric.dialogs.gschema.xml.in.in b/schemas/org.gnome.gnumeric.dialogs.gschema.xml.in.in
index 8d41a6f..2f06215 100644
--- a/schemas/org.gnome.gnumeric.dialogs.gschema.xml.in.in
+++ b/schemas/org.gnome.gnumeric.dialogs.gschema.xml.in.in
@@ -44,7 +44,7 @@
     </key>
   </schema>
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.gnumeric.plugins" path="/org/gnome/gnumeric/plugins/">
-    <key name="activate-new" type="b">
+    <key name="activate-newplugins" type="b">
       <default>true</default>
       <_summary>Activate New Plugins</_summary>
       <_description>This variable determines whether to activate every new encountered plugin.</_description>
diff --git a/src/dialogs/ChangeLog b/src/dialogs/ChangeLog
index 28f5a06..93a8e2f 100644
--- a/src/dialogs/ChangeLog
+++ b/src/dialogs/ChangeLog
@@ -1,5 +1,11 @@
 2012-11-10  Andreas J. Guelzow <aguelzow pyrshep ca>
 
+	* dialog-plugin-manager.c (cb_pm_checkbutton_install_new_toggled):
+	adjust for changed autogenerated function name
+	(pm_dialog_init): ditto
+
+2012-11-10  Andreas J. Guelzow <aguelzow pyrshep ca>
+
 	* dialog-stf-export.c (stf_export_dialog_finish): save all settings
 
 2012-11-04  Andreas J. Guelzow <aguelzow pyrshep ca>
diff --git a/src/dialogs/dialog-plugin-manager.c b/src/dialogs/dialog-plugin-manager.c
index 750bf42..8081601 100644
--- a/src/dialogs/dialog-plugin-manager.c
+++ b/src/dialogs/dialog-plugin-manager.c
@@ -9,7 +9,7 @@
  *   Tom Dyas (tdyas romulus rutgers edu)
  *  New plugin manager:
  *   Zbigniew Chyla (cyba gnome pl)
- *   Andreas J. Guelzow (aguelzow taliesin ca)
+ *   Andreas J. Guelzow (aguelzow pyrshep ca)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -200,7 +200,7 @@ static void
 cb_pm_checkbutton_install_new_toggled (GtkCheckButton *checkbutton,
 				       G_GNUC_UNUSED PluginManagerGUI *pm_gui)
 {
-	gnm_conf_set_plugins_activate_new (
+	gnm_conf_set_plugins_activate_newplugins (
 		gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbutton)));
 }
 
@@ -516,7 +516,7 @@ pm_dialog_init (PluginManagerGUI *pm_gui)
 		G_CALLBACK (cb_pm_checkbutton_install_new_toggled), pm_gui);
 
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pm_gui->checkbutton_install_new),
-				      gnm_conf_get_plugins_activate_new ());
+				      gnm_conf_get_plugins_activate_newplugins ());
 
 	/* initialize plugin list */
 	gtk_list_store_clear (pm_gui->model_plugins);
diff --git a/src/gnm-plugin.c b/src/gnm-plugin.c
index 02a4ce0..7fe82b0 100644
--- a/src/gnm-plugin.c
+++ b/src/gnm-plugin.c
@@ -964,6 +964,6 @@ gnm_plugins_init (GOCmdContext *context)
 			 gnm_conf_get_plugins_file_states (),
 			 gnm_conf_get_plugins_active (),
 			 dir_list,
-			 gnm_conf_get_plugins_activate_new (),
+			 gnm_conf_get_plugins_activate_newplugins (),
 			 gnm_plugin_loader_module_get_type ());
 }
diff --git a/src/gnumeric-conf.c b/src/gnumeric-conf.c
index d3a589d..bd024c0 100644
--- a/src/gnumeric-conf.c
+++ b/src/gnumeric-conf.c
@@ -2341,33 +2341,33 @@ gnm_conf_get_plugin_lpsolve_lpsolve_path_node (void)
 	return get_watch_node (&watch_plugin_lpsolve_lpsolve_path);
 }
 
-static struct cb_watch_bool watch_plugins_activate_new = {
-	0, "plugins/activate-new",
+static struct cb_watch_bool watch_plugins_activate_newplugins = {
+	0, "plugins/activate-newplugins",
 	"Activate New Plugins",
 	"This variable determines whether to activate every new encountered plugin.",
 	TRUE,
 };
 
 gboolean
-gnm_conf_get_plugins_activate_new (void)
+gnm_conf_get_plugins_activate_newplugins (void)
 {
-	if (!watch_plugins_activate_new.handler)
-		watch_bool (&watch_plugins_activate_new);
-	return watch_plugins_activate_new.var;
+	if (!watch_plugins_activate_newplugins.handler)
+		watch_bool (&watch_plugins_activate_newplugins);
+	return watch_plugins_activate_newplugins.var;
 }
 
 void
-gnm_conf_set_plugins_activate_new (gboolean x)
+gnm_conf_set_plugins_activate_newplugins (gboolean x)
 {
-	if (!watch_plugins_activate_new.handler)
-		watch_bool (&watch_plugins_activate_new);
-	set_bool (&watch_plugins_activate_new, x);
+	if (!watch_plugins_activate_newplugins.handler)
+		watch_bool (&watch_plugins_activate_newplugins);
+	set_bool (&watch_plugins_activate_newplugins, x);
 }
 
 GOConfNode *
-gnm_conf_get_plugins_activate_new_node (void)
+gnm_conf_get_plugins_activate_newplugins_node (void)
 {
-	return get_watch_node (&watch_plugins_activate_new);
+	return get_watch_node (&watch_plugins_activate_newplugins);
 }
 
 static struct cb_watch_string_list watch_plugins_active = {
diff --git a/src/gnumeric-conf.h b/src/gnumeric-conf.h
index 098329c..798c9f7 100644
--- a/src/gnumeric-conf.h
+++ b/src/gnumeric-conf.h
@@ -253,9 +253,9 @@ 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 *x);
 
-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 x);
+GOConfNode *gnm_conf_get_plugins_activate_newplugins_node (void);
+gboolean gnm_conf_get_plugins_activate_newplugins (void);
+void gnm_conf_set_plugins_activate_newplugins (gboolean x);
 
 GOConfNode *gnm_conf_get_plugins_active_node (void);
 GSList *gnm_conf_get_plugins_active (void);