diff options
author | Friedrich Beckmann <friedrich.beckmann@gmx.de> | 2020-06-18 21:08:28 +0200 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2020-06-18 16:42:54 -0400 |
commit | a614716d0fd2fa6c157ba35ea5013468a2b93a19 (patch) | |
tree | df33572b03cb8dcf5f4b06340849feb65c641667 /gtk/gtkapplication-quartz.c | |
parent | 94f246240dd0b1abe962a10b91d19bd4e7ce1e47 (diff) | |
download | gtk+-a614716d0fd2fa6c157ba35ea5013468a2b93a19.tar.gz |
quartz: gtk-application - inhibit openFiles events from cmdline
When an application is started via cmdline, then openFiles events
from MacOS are generated although gtkapplication already interprets
the cmdline arguments and opens suitable arguments as files. So they
would be opened twice. Depending on the exact situation the
openFiles event can also be issued before the startup signal
is given. Depending on the application this can result in a crash
due to unexpected behaviour. I took this idea from the
gedit-app-osx.m file. Also from Jesse van den Kieboom.
See:
https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2098#note_842975
https://gitlab.gnome.org/GNOME/gtk/-/commit/a3ad7fa80f764fb7bcbe
https://gitlab.gnome.org/GNOME/gedit/-/blob/master/gedit/gedit-app-osx.m#L592
Diffstat (limited to 'gtk/gtkapplication-quartz.c')
-rw-r--r-- | gtk/gtkapplication-quartz.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/gtk/gtkapplication-quartz.c b/gtk/gtkapplication-quartz.c index 90ab1705f0..d59a19b1e2 100644 --- a/gtk/gtkapplication-quartz.c +++ b/gtk/gtkapplication-quartz.c @@ -325,6 +325,13 @@ gtk_application_impl_quartz_uninhibit (GtkApplicationImpl *impl, static void gtk_application_impl_quartz_init (GtkApplicationImplQuartz *quartz) { + /* This is required so that Cocoa is not going to parse the + command line arguments by itself and generate OpenFile events. + We already parse the command line ourselves, so this is needed + to prevent opening files twice, etc. */ + [[NSUserDefaults standardUserDefaults] setObject:@"NO" + forKey:@"NSTreatUnknownArgumentsAsOpen"]; + quartz->combined = g_menu_new (); } |