diff options
| author | Alexander Kurtakov <akurtako@redhat.com> | 2013-02-07 17:43:57 +0200 |
|---|---|---|
| committer | Alexander Kurtakov <akurtako@redhat.com> | 2013-02-07 18:20:34 +0200 |
| commit | e3dfc9047c9d1823ecdd14c048572a05554c0021 (patch) | |
| tree | 127e5b617ca22506f422dbb3256cc2edcf05d68d /bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java | |
| parent | fa723f28f2f267e5615bfd54cf2b83f638a4dc96 (diff) | |
| download | eclipse.platform.swt-e3dfc9047c9d1823ecdd14c048572a05554c0021.tar.gz eclipse.platform.swt-e3dfc9047c9d1823ecdd14c048572a05554c0021.tar.xz eclipse.platform.swt-e3dfc9047c9d1823ecdd14c048572a05554c0021.zip | |
Do not use g_thread_init on Glib newer than 2.32.
It is already called internally by glib so no need to call it
explicitly. This also allows us to keep compiling with
G_DISABLE_DEPRECATED.
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java')
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java index c44405748d..67f10158ce 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java @@ -912,9 +912,11 @@ protected void create (DeviceData data) { } void createDisplay (DeviceData data) { - /* Required for g_main_context_wakeup */ - if (!OS.g_thread_supported ()) { - OS.g_thread_init (0); + if (OS.GLIB_VERSION < OS.VERSION(2, 32, 0)) { + /* Required for g_main_context_wakeup */ + if (!OS.g_thread_supported()) { + OS.g_thread_init(0); + } } if (OS.GTK_VERSION < OS.VERSION(2, 24, 0)) { OS.gtk_set_locale(); |