summaryrefslogtreecommitdiff
path: root/gdk/x11/gdkeventsource.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2012-07-28 14:40:04 +0200
committerMatthias Clasen <mclasen@redhat.com>2012-07-30 18:01:47 +0200
commit144a5687c9c5eae603ce7a105812daffed862fc1 (patch)
treeebe281f8f50493b6bc13a4edadf33b5572298e8d /gdk/x11/gdkeventsource.c
parentf92a092bac8ff4664ab6944c3493bf61d7974bd9 (diff)
downloadgtk+-144a5687c9c5eae603ce7a105812daffed862fc1.tar.gz
gdk: 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 'gdk/x11/gdkeventsource.c')
-rw-r--r--gdk/x11/gdkeventsource.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/gdk/x11/gdkeventsource.c b/gdk/x11/gdkeventsource.c
index 615ff9a1d0..6b82611bfc 100644
--- a/gdk/x11/gdkeventsource.c
+++ b/gdk/x11/gdkeventsource.c
@@ -273,13 +273,13 @@ gdk_event_source_prepare (GSource *source,
GdkDisplay *display = ((GdkEventSource*) source)->display;
gboolean retval;
- GDK_THREADS_ENTER ();
+ gdk_threads_enter ();
*timeout = -1;
retval = (_gdk_event_queue_find_first (display) != NULL ||
gdk_check_xpending (display));
- GDK_THREADS_LEAVE ();
+ gdk_threads_leave ();
return retval;
}
@@ -290,7 +290,7 @@ gdk_event_source_check (GSource *source)
GdkEventSource *event_source = (GdkEventSource*) source;
gboolean retval;
- GDK_THREADS_ENTER ();
+ gdk_threads_enter ();
if (event_source->event_poll_fd.revents & G_IO_IN)
retval = (_gdk_event_queue_find_first (event_source->display) != NULL ||
@@ -298,7 +298,7 @@ gdk_event_source_check (GSource *source)
else
retval = FALSE;
- GDK_THREADS_LEAVE ();
+ gdk_threads_leave ();
return retval;
}
@@ -349,7 +349,7 @@ gdk_event_source_dispatch (GSource *source,
GdkDisplay *display = ((GdkEventSource*) source)->display;
GdkEvent *event;
- GDK_THREADS_ENTER ();
+ gdk_threads_enter ();
event = gdk_display_get_event (display);
@@ -360,7 +360,7 @@ gdk_event_source_dispatch (GSource *source,
gdk_event_free (event);
}
- GDK_THREADS_LEAVE ();
+ gdk_threads_leave ();
return TRUE;
}