Skip to content
Snippets Groups Projects
Commit fda5db26 authored by Tristan Matthews's avatar Tristan Matthews
Browse files

* #7886: For now, wrap calls to old GThread API with GTK_CHECK_VERSION macros

parent 1b1cfdca
No related branches found
No related tags found
No related merge requests found
...@@ -54,9 +54,11 @@ main(int argc, char *argv[]) ...@@ -54,9 +54,11 @@ main(int argc, char *argv[])
if (g_strcmp0(argv[i], "--debug") == 0) if (g_strcmp0(argv[i], "--debug") == 0)
set_log_level(LOG_DEBUG); set_log_level(LOG_DEBUG);
#if !GTK_CHECK_VERSION(2,32,0)
g_thread_init(NULL); g_thread_init(NULL);
gdk_threads_init(); gdk_threads_init();
gdk_threads_enter(); gdk_threads_enter();
#endif
// Start GTK application // Start GTK application
gtk_init(&argc, &argv); gtk_init(&argc, &argv);
...@@ -127,7 +129,9 @@ main(int argc, char *argv[]) ...@@ -127,7 +129,9 @@ main(int argc, char *argv[])
shortcuts_destroy_bindings(); shortcuts_destroy_bindings();
OUT: OUT:
#if !GTK_CHECK_VERSION(2,32,0)
gdk_threads_leave(); gdk_threads_leave();
#endif
return error != NULL; return error != NULL;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment