[Gnucash-changes] Update for the new function names.

David Hampton hampton at cvs.gnucash.org
Sat Jun 4 21:05:35 EDT 2005


Log Message:
-----------
Update for the new function names.

Tags:
----
gnucash-gnome2-dev

Modified Files:
--------------
    gnucash/src/gnome:
        gnc-plugin-page-account-tree.c
        gnc-plugin-page-register.c
    gnucash/src/import-export/hbci:
        gnc-plugin-hbci.c
    gnucash/src/report/report-gnome:
        gnc-plugin-page-report.c
    gnucash/src/report/stylesheets:
        gnc-plugin-stylesheets.c

Revision Data
-------------
Index: gnc-plugin-page-register.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/Attic/gnc-plugin-page-register.c,v
retrieving revision 1.1.2.21
retrieving revision 1.1.2.22
diff -Lsrc/gnome/gnc-plugin-page-register.c -Lsrc/gnome/gnc-plugin-page-register.c -u -r1.1.2.21 -r1.1.2.22
--- src/gnome/gnc-plugin-page-register.c
+++ src/gnome/gnc-plugin-page-register.c
@@ -481,7 +481,7 @@
 					    G_CALLBACK(gnc_plugin_page_register_cmd_style_changed),
 					    plugin_page);
 
-	gnc_gnome_utils_init_short_names (action_group, short_labels);
+	gnc_plugin_init_short_names (action_group, short_labels);
 	gnc_plugin_page_register_init_values (action_group);
 
 	priv->ui_description = g_strdup("gnc-plugin-page-register-ui.xml");
@@ -541,8 +541,8 @@
 
 	priv = page->priv;
 	account = gnc_plugin_page_register_get_account (page);
-	gnc_gnome_utils_update_actions(priv->action_group, actions_requiring_account,
-				 "sensitive", account != NULL);
+	gnc_plugin_update_actions(priv->action_group, actions_requiring_account,
+				  "sensitive", account != NULL);
 
 	sr = gnc_ledger_display_get_split_register(priv->ledger);
 	action = gtk_action_group_get_action (priv->action_group,
@@ -630,10 +630,9 @@
 	priv = register_page->priv;
 
 	priv->ui_merge = ui_merge;
-	priv->merge_id =
-	  gnc_menu_merge_add_actions (priv->ui_merge,
-				      priv->action_group,
-				      priv->ui_description);
+	priv->merge_id = gnc_plugin_add_actions (priv->ui_merge,
+						 priv->action_group,
+						 priv->ui_description);
 }
 	
 static void
Index: gnc-plugin-page-account-tree.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/Attic/gnc-plugin-page-account-tree.c,v
retrieving revision 1.1.2.40
retrieving revision 1.1.2.41
diff -Lsrc/gnome/gnc-plugin-page-account-tree.c -Lsrc/gnome/gnc-plugin-page-account-tree.c -u -r1.1.2.40 -r1.1.2.41
--- src/gnome/gnc-plugin-page-account-tree.c
+++ src/gnome/gnc-plugin-page-account-tree.c
@@ -350,7 +350,7 @@
 				      gnc_plugin_page_account_tree_actions,
 				      gnc_plugin_page_account_tree_n_actions,
 				      plugin_page);
-	gnc_gnome_utils_init_short_names (action_group, short_labels);
+	gnc_plugin_init_short_names (action_group, short_labels);
 
 	
 	/* get the options and the window ID */ 
@@ -582,9 +582,9 @@
 
 	priv->ui_merge = ui_merge;
 	priv->merge_id =
-	  gnc_menu_merge_add_actions (priv->ui_merge,
-				      priv->action_group,
-				      "gnc-plugin-page-account-tree-ui.xml");
+	  gnc_plugin_add_actions (priv->ui_merge,
+				  priv->action_group,
+				  "gnc-plugin-page-account-tree-ui.xml");
 	LEAVE(" ");
 }
 	
@@ -685,12 +685,9 @@
 						   GncPluginPageAccountTree *page)
 {
 	GtkActionGroup *action_group;
-	GtkAction *action;
 	GtkTreeView *view;
 	Account *account = NULL;
-	GValue value = { 0 };
 	gboolean sensitive;
-	gint i;
 
 	g_return_if_fail(GNC_IS_PLUGIN_PAGE_ACCOUNT_TREE(page));
 
@@ -705,15 +702,9 @@
 		/* Check here for placeholder accounts, etc. */
 	}
 
-	g_value_init (&value, G_TYPE_BOOLEAN);
-	g_value_set_boolean (&value, sensitive);
 	action_group = page->priv->action_group;
-	for (i = 0; actions_requiring_account[i]; i++) {
-	  	action = gtk_action_group_get_action (action_group,
-						      actions_requiring_account[i]);
-		g_object_set_property (G_OBJECT(action), "sensitive", &value);
-	}
-
+	gnc_plugin_update_actions (action_group, actions_requiring_account,
+				   "sensitive", sensitive);
 	g_signal_emit (page, plugin_page_signals[ACCOUNT_SELECTED], 0, account);
 }
 	
Index: gnc-plugin-hbci.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/hbci/Attic/gnc-plugin-hbci.c,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -Lsrc/import-export/hbci/gnc-plugin-hbci.c -Lsrc/import-export/hbci/gnc-plugin-hbci.c -u -r1.1.2.3 -r1.1.2.4
--- src/import-export/hbci/gnc-plugin-hbci.c
+++ src/import-export/hbci/gnc-plugin-hbci.c
@@ -321,8 +321,8 @@
 
   window = GNC_MAIN_WINDOW(plugin_page->window);
   action_group = gnc_main_window_get_action_group(window, PLUGIN_ACTIONS_NAME);
-  gnc_gnome_utils_update_actions(action_group, need_account_actions,
-				 "sensitive", account != NULL);
+  gnc_plugin_update_actions(action_group, need_account_actions,
+			    "sensitive", account != NULL);
 }
 
 /** A new page has been added to a main window.  Connect a signal to
@@ -361,12 +361,12 @@
   g_return_if_fail(action_group != NULL);
 
   /* Reset everything to known state */
-  gnc_gnome_utils_update_actions(action_group, need_account_actions,
-				 "sensitive", FALSE);
-  gnc_gnome_utils_update_actions(action_group, account_tree_actions,
-				 "visible", FALSE);
-  gnc_gnome_utils_update_actions(action_group, register_actions,
-				 "visible", FALSE);
+  gnc_plugin_update_actions(action_group, need_account_actions,
+			    "sensitive", FALSE);
+  gnc_plugin_update_actions(action_group, account_tree_actions,
+			    "visible", FALSE);
+  gnc_plugin_update_actions(action_group, register_actions,
+			    "visible", FALSE);
 
   /* Any page selected? */
   if (page == NULL) {
@@ -378,19 +378,19 @@
   page_name = gnc_plugin_page_get_name(page);
   if (strcmp(page_name, GNC_PLUGIN_PAGE_ACCOUNT_TREE_NAME) == 0) {
     DEBUG("account tree page");
-    gnc_gnome_utils_update_actions(action_group, account_tree_actions,
-				   "visible", TRUE);
+    gnc_plugin_update_actions(action_group, account_tree_actions,
+			      "visible", TRUE);
   } else if (strcmp(page_name, GNC_PLUGIN_PAGE_REGISTER_NAME) == 0) {
     DEBUG("register page");
-    gnc_gnome_utils_update_actions(action_group, register_actions,
-				   "visible", TRUE);
+    gnc_plugin_update_actions(action_group, register_actions,
+			      "visible", TRUE);
   }
 
   /* Only make items sensitive is an account can be determined */
   account = main_window_to_account (window);
   if (account) {
-    gnc_gnome_utils_update_actions(action_group, need_account_actions,
-				   "sensitive", TRUE);
+    gnc_plugin_update_actions(action_group, need_account_actions,
+			      "sensitive", TRUE);
   }
   LEAVE(" ");
 }
Index: gnc-plugin-page-report.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/report/report-gnome/Attic/gnc-plugin-page-report.c,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -Lsrc/report/report-gnome/gnc-plugin-page-report.c -Lsrc/report/report-gnome/gnc-plugin-page-report.c -u -r1.1.2.7 -r1.1.2.8
--- src/report/report-gnome/gnc-plugin-page-report.c
+++ src/report/report-gnome/gnc-plugin-page-report.c
@@ -40,6 +40,7 @@
 #include "gnc-html-history.h"
 #include "gnc-html.h"
 #include "gnc-file-dialog.h"
+#include "gnc-plugin.h"
 #include "gnc-plugin-page-report.h"
 #include "gnc-report.h"
 #include "gnc-ui-util.h"
@@ -617,9 +618,9 @@
         DEBUG( "merge actions" );
         priv->ui_merge = ui_merge;
         priv->merge_id
-                = gnc_menu_merge_add_actions( priv->ui_merge,
-                                              priv->action_group,
-                                              "gnc-plugin-page-report-ui.xml" );
+                = gnc_plugin_add_actions( priv->ui_merge,
+					  priv->action_group,
+					  "gnc-plugin-page-report-ui.xml" );
         DEBUG( "done merging" );
 }
 
Index: gnc-plugin-stylesheets.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/report/stylesheets/Attic/gnc-plugin-stylesheets.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -Lsrc/report/stylesheets/gnc-plugin-stylesheets.c -Lsrc/report/stylesheets/gnc-plugin-stylesheets.c -u -r1.1.2.2 -r1.1.2.3
--- src/report/stylesheets/gnc-plugin-stylesheets.c
+++ src/report/stylesheets/gnc-plugin-stylesheets.c
@@ -228,8 +228,8 @@
   g_return_if_fail(action_group != NULL);
 
   /* Reset everything to known state */
-  gnc_gnome_utils_update_actions(action_group, account_tree_actions,
-				 "visible", FALSE);
+  gnc_plugin_update_actions(action_group, account_tree_actions,
+			    "visible", FALSE);
 
   /* Any page selected? */
   if (page == NULL) {
@@ -241,8 +241,8 @@
   page_name = gnc_plugin_page_get_name(page);
   if (strcmp(page_name, GNC_PLUGIN_PAGE_ACCOUNT_TREE_NAME) == 0) {
     DEBUG("account tree page");
-    gnc_gnome_utils_update_actions(action_group, account_tree_actions,
-				   "visible", TRUE);
+    gnc_plugin_update_actions(action_group, account_tree_actions,
+			      "visible", TRUE);
   }
 
   LEAVE(" ");


More information about the gnucash-changes mailing list