AUDIT: r20717 - gnucash/trunk/src/gnome-utils - Disable quartz accelerators to avoid hang in bundle during shutdown. (The g_idle_add apparently caused a deadlock between multiple g_main_loop instances.)
John Ralls
jralls at code.gnucash.org
Sat May 28 17:53:03 EDT 2011
Author: jralls
Date: 2011-05-28 17:53:03 -0400 (Sat, 28 May 2011)
New Revision: 20717
Trac: http://svn.gnucash.org/trac/changeset/20717
Modified:
gnucash/trunk/src/gnome-utils/gnc-main-window.c
gnucash/trunk/src/gnome-utils/ui/osx_accel_map
Log:
Disable quartz accelerators to avoid hang in bundle during shutdown. (The g_idle_add apparently caused a deadlock between multiple g_main_loop instances.)
BP
Modified: gnucash/trunk/src/gnome-utils/gnc-main-window.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-main-window.c 2011-05-28 21:52:54 UTC (rev 20716)
+++ gnucash/trunk/src/gnome-utils/gnc-main-window.c 2011-05-28 21:53:03 UTC (rev 20717)
@@ -3452,6 +3452,8 @@
menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (menu));
gtk_widget_hide(menu);
gtk_osxapplication_set_menu_bar (theApp, GTK_MENU_SHELL (menu));
+ if (gtk_osxapplication_use_quartz_accelerators(theApp))
+ gtk_osxapplication_set_use_quartz_accelerators(theApp, FALSE);
item = gtk_ui_manager_get_widget (window->ui_merge,
"/menubar/File/FileQuit");
@@ -3483,7 +3485,7 @@
"/menubar/Windows");
gtk_osxapplication_set_window_menu(theApp, GTK_MENU_ITEM(item));
g_signal_connect(theApp, "NSApplicationBlockTermination",
- G_CALLBACK(gtk_quartz_should_quit), window);
+ G_CALLBACK(gnc_quartz_should_quit), window);
}
#endif //MAC_INTEGRATION
Modified: gnucash/trunk/src/gnome-utils/ui/osx_accel_map
===================================================================
--- gnucash/trunk/src/gnome-utils/ui/osx_accel_map 2011-05-28 21:52:54 UTC (rev 20716)
+++ gnucash/trunk/src/gnome-utils/ui/osx_accel_map 2011-05-28 21:53:03 UTC (rev 20717)
@@ -211,7 +211,7 @@
; (gtk_accel_path "<Actions>/MenuAdditions/CashFlowAction" "")
; (gtk_accel_path "<Actions>/MainWindowActions/FileImportAction" "")
; (gtk_accel_path "<Actions>/gnc-plugin-business-actions/CustomerNewCustomerOpenAction" "")
-; (gtk_accel_path "<Actions>/MainWindowActions/FileQuitAction" "<Alt>q")
+ (gtk_accel_path "<Actions>/MainWindowActions/FileQuitAction" "<Meta>q")
; (gtk_accel_path "<Actions>/gnc-plugin-business-actions/TaxTablesOpenAction" "")
; (gtk_accel_path "<Actions>/MenuAdditions/AssetPiechartAction" "")
; (gtk_accel_path "<Actions>/MenuAdditions/SampleReportwithExamplesAction" "")
More information about the gnucash-changes
mailing list