IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Disable quartz accelerators to avoid hang in bundle during shutdown. (The g_idle_add apparently caused a deadlock between multiple g_main_loop instances.)

Browse Source 
BP

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20717 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
John Ralls 2011-05-28 21:53:03 +00:00
parent bdb0ff2acd
commit 6b0d693f1e
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gnome-utils/gnc-main-window.c
View File

@ -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

2
src/gnome-utils/ui/osx_accel_map
View File

@ -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" "")