[gtk: 1/2] move [NSApplication sharedApplication] after _gdk_quartz_events_init() to avoid initialization issue
- From: Alex Samorukov <asamorukov src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk: 1/2] move [NSApplication sharedApplication] after _gdk_quartz_events_init() to avoid initialization issue
- Date: Wed, 8 Jan 2020 14:10:55 +0000 (UTC)
commit d131c8d0e7f2ca8390b364a9712936812e6657d7
Author: Alex Samorukov <samm net-art cz>
Date: Wed Jan 8 14:10:06 2020 +0000
move [NSApplication sharedApplication] after _gdk_quartz_events_init() to avoid initialization issues
(cherry picked from commit 46c2451c5a3cd42aa5a94935bfc850a484288ff3)
gdk/quartz/gdkdisplay-quartz.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/gdk/quartz/gdkdisplay-quartz.c b/gdk/quartz/gdkdisplay-quartz.c
index 3420801978..5b4b3c99ed 100644
--- a/gdk/quartz/gdkdisplay-quartz.c
+++ b/gdk/quartz/gdkdisplay-quartz.c
@@ -55,9 +55,6 @@ _gdk_quartz_display_open (const gchar *display_name)
if (_gdk_display != NULL)
return NULL;
- /* Initialize application */
- [NSApplication sharedApplication];
-
_gdk_display = g_object_new (gdk_quartz_display_get_type (), NULL);
_gdk_device_manager = _gdk_device_manager_new (_gdk_display);
@@ -67,6 +64,8 @@ _gdk_quartz_display_open (const gchar *display_name)
_gdk_quartz_events_init ();
+ /* Initialize application */
+ [NSApplication sharedApplication];
#if 0
/* FIXME: Remove the #if 0 when we have these functions */
_gdk_quartz_dnd_init ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]