r15173 - gnucash/branches/2.0 - When progress bar is showing, do not make menus and toolbars

[Derek Atkins]

Author: warlord
Date: 2006-12-02 21:02:28 -0500 (Sat, 02 Dec 2006)
New Revision: 15173
Trac: http://svn.gnucash.org/trac/changeset/15173

Modified:
   gnucash/branches/2.0/
   gnucash/branches/2.0/ChangeLog
   gnucash/branches/2.0/src/gnome-utils/gnc-main-window.c
Log:
	When progress bar is showing, do not make menus and toolbars
	insensitive, but rather the underlying action groups. This way even
	keyboard accelerators will not make sneaking calls while saving.

Merge from r15162



Property changes on: gnucash/branches/2.0
___________________________________________________________________
Name: svk:merge
   - 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/2.0:697
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/branches/2.0:13657
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13282
   + 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/2.0:697
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/branches/2.0:13658
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13282

Modified: gnucash/branches/2.0/ChangeLog
===================================================================
--- gnucash/branches/2.0/ChangeLog	2006-12-03 02:02:11 UTC (rev 15172)
+++ gnucash/branches/2.0/ChangeLog	2006-12-03 02:02:28 UTC (rev 15173)
@@ -1,3 +1,9 @@
+2006-11-29  Andreas Köhler  <andi5.py at gmx.net>
+
+	When progress bar is showing, do not make menus and toolbars
+	insensitive, but rather the underlying action groups. This way even
+	keyboard accelerators will not make sneaking calls while saving.
+
 2006-11-29  Christian Stimming  <stimming at tuhh.de>
 
 	Replace 'static inline' by 'static' for functions that are used by

Modified: gnucash/branches/2.0/src/gnome-utils/gnc-main-window.c
===================================================================
--- gnucash/branches/2.0/src/gnome-utils/gnc-main-window.c	2006-12-03 02:02:11 UTC (rev 15172)
+++ gnucash/branches/2.0/src/gnome-utils/gnc-main-window.c	2006-12-03 02:02:28 UTC (rev 15173)
@@ -3348,21 +3348,17 @@
 {
 	GncMainWindow *window;
 	GncMainWindowPrivate *priv;
-	GList *winp, *tmp;
-	GSList *widgetp, *toplevels;
+	GList *groupp, *groups, *winp, *tmp;
 	GtkWidget *close_button;
 
 	for (winp = active_windows; winp; winp = g_list_next(winp)) {
 	  window = winp->data;
 	  priv = GNC_MAIN_WINDOW_GET_PRIVATE(window);
-	  toplevels = gtk_ui_manager_get_toplevels(window->ui_merge,
-						   GTK_UI_MANAGER_MENUBAR |
-						   GTK_UI_MANAGER_TOOLBAR |
-						   GTK_UI_MANAGER_POPUP);
-	  for (widgetp = toplevels; widgetp; widgetp = g_slist_next(widgetp)) {
-	    gtk_widget_set_sensitive (widgetp->data, sensitive);
+
+	  groups = gtk_ui_manager_get_action_groups(window->ui_merge);
+	  for (groupp = groups; groupp; groupp = g_list_next(groupp)) {
+	    gtk_action_group_set_sensitive(GTK_ACTION_GROUP(groupp->data), sensitive);
 	  }
-	  g_slist_free(toplevels);
 
 	  for (tmp = priv->installed_pages; tmp; tmp = g_list_next(tmp)) {
 	    close_button = g_object_get_data(tmp->data, PLUGIN_PAGE_CLOSE_BUTTON);