summaryrefslogtreecommitdiff
path: root/gtk/gtkmain.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2012-07-28 14:52:40 +0200
committerMatthias Clasen <mclasen@redhat.com>2012-07-30 18:01:47 +0200
commit8d0e88bac77c81bbe3e9ae62639bbc9629c195dd (patch)
treeb6b4a836f1597c881fc466db66691a8f1f692a86 /gtk/gtkmain.c
parent144a5687c9c5eae603ce7a105812daffed862fc1 (diff)
downloadgtk+-8d0e88bac77c81bbe3e9ae62639bbc9629c195dd.tar.gz
gtk: Don't use GDK_THREADS_ENTER/LEAVE macros internally
These are just wrappers for the functions, and we want to deprecate them. Stopping to use them internally is a good first step.
Diffstat (limited to 'gtk/gtkmain.c')
-rw-r--r--gtk/gtkmain.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 596a3fb34d..cce6416b6d 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -1158,9 +1158,9 @@ gtk_main (void)
if (g_main_loop_is_running (main_loops->data))
{
- GDK_THREADS_LEAVE ();
+ gdk_threads_leave ();
g_main_loop_run (loop);
- GDK_THREADS_ENTER ();
+ gdk_threads_enter ();
gdk_flush ();
}
@@ -1235,9 +1235,9 @@ gtk_events_pending (void)
{
gboolean result;
- GDK_THREADS_LEAVE ();
+ gdk_threads_leave ();
result = g_main_context_pending (NULL);
- GDK_THREADS_ENTER ();
+ gdk_threads_enter ();
return result;
}
@@ -1258,9 +1258,9 @@ gtk_events_pending (void)
gboolean
gtk_main_iteration (void)
{
- GDK_THREADS_LEAVE ();
+ gdk_threads_leave ();
g_main_context_iteration (NULL, TRUE);
- GDK_THREADS_ENTER ();
+ gdk_threads_enter ();
if (main_loops)
return !g_main_loop_is_running (main_loops->data);
@@ -1282,9 +1282,9 @@ gtk_main_iteration (void)
gboolean
gtk_main_iteration_do (gboolean blocking)
{
- GDK_THREADS_LEAVE ();
+ gdk_threads_leave ();
g_main_context_iteration (NULL, blocking);
- GDK_THREADS_ENTER ();
+ gdk_threads_enter ();
if (main_loops)
return !g_main_loop_is_running (main_loops->data);