From 6b0d693f1efa3a22bc6b378f507ffda3274cb334 Mon Sep 17 00:00:00 2001 From: John Ralls Date: Sat, 28 May 2011 21:53:03 +0000 Subject: [PATCH] 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 git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20717 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/gnome-utils/gnc-main-window.c | 4 +++- src/gnome-utils/ui/osx_accel_map | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gnome-utils/gnc-main-window.c b/src/gnome-utils/gnc-main-window.c index 9cca42f733..29326d29e7 100644 --- a/src/gnome-utils/gnc-main-window.c +++ b/src/gnome-utils/gnc-main-window.c @@ -3452,6 +3452,8 @@ gnc_quartz_set_menu(GncMainWindow* window) 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 @@ gnc_quartz_set_menu(GncMainWindow* window) "/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 diff --git a/src/gnome-utils/ui/osx_accel_map b/src/gnome-utils/ui/osx_accel_map index 4793007df3..1ecb7ab466 100644 --- a/src/gnome-utils/ui/osx_accel_map +++ b/src/gnome-utils/ui/osx_accel_map @@ -211,7 +211,7 @@ ; (gtk_accel_path "/MenuAdditions/CashFlowAction" "") ; (gtk_accel_path "/MainWindowActions/FileImportAction" "") ; (gtk_accel_path "/gnc-plugin-business-actions/CustomerNewCustomerOpenAction" "") -; (gtk_accel_path "/MainWindowActions/FileQuitAction" "q") + (gtk_accel_path "/MainWindowActions/FileQuitAction" "q") ; (gtk_accel_path "/gnc-plugin-business-actions/TaxTablesOpenAction" "") ; (gtk_accel_path "/MenuAdditions/AssetPiechartAction" "") ; (gtk_accel_path "/MenuAdditions/SampleReportwithExamplesAction" "")