diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2012-07-28 14:52:40 +0200 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2012-07-30 18:01:47 +0200 |
| commit | 8d0e88bac77c81bbe3e9ae62639bbc9629c195dd (patch) | |
| tree | b6b4a836f1597c881fc466db66691a8f1f692a86 /gtk/gtkclipboard.c | |
| parent | 144a5687c9c5eae603ce7a105812daffed862fc1 (diff) | |
| download | gtk+-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/gtkclipboard.c')
| -rw-r--r-- | gtk/gtkclipboard.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/gtk/gtkclipboard.c b/gtk/gtkclipboard.c index 368b413fac..e0b736f9c1 100644 --- a/gtk/gtkclipboard.c +++ b/gtk/gtkclipboard.c @@ -1410,9 +1410,9 @@ gtk_clipboard_wait_for_contents (GtkClipboard *clipboard, if (g_main_loop_is_running (results.loop)) { - GDK_THREADS_LEAVE (); + gdk_threads_leave (); g_main_loop_run (results.loop); - GDK_THREADS_ENTER (); + gdk_threads_enter (); } g_main_loop_unref (results.loop); @@ -1463,9 +1463,9 @@ gtk_clipboard_wait_for_text (GtkClipboard *clipboard) if (g_main_loop_is_running (results.loop)) { - GDK_THREADS_LEAVE (); + gdk_threads_leave (); g_main_loop_run (results.loop); - GDK_THREADS_ENTER (); + gdk_threads_enter (); } g_main_loop_unref (results.loop); @@ -1531,9 +1531,9 @@ gtk_clipboard_wait_for_rich_text (GtkClipboard *clipboard, if (g_main_loop_is_running (results.loop)) { - GDK_THREADS_LEAVE (); + gdk_threads_leave (); g_main_loop_run (results.loop); - GDK_THREADS_ENTER (); + gdk_threads_enter (); } g_main_loop_unref (results.loop); @@ -1591,9 +1591,9 @@ gtk_clipboard_wait_for_image (GtkClipboard *clipboard) if (g_main_loop_is_running (results.loop)) { - GDK_THREADS_LEAVE (); + gdk_threads_leave (); g_main_loop_run (results.loop); - GDK_THREADS_ENTER (); + gdk_threads_enter (); } g_main_loop_unref (results.loop); @@ -1646,9 +1646,9 @@ gtk_clipboard_wait_for_uris (GtkClipboard *clipboard) if (g_main_loop_is_running (results.loop)) { - GDK_THREADS_LEAVE (); + gdk_threads_leave (); g_main_loop_run (results.loop); - GDK_THREADS_ENTER (); + gdk_threads_enter (); } g_main_loop_unref (results.loop); @@ -2132,9 +2132,9 @@ gtk_clipboard_store (GtkClipboard *clipboard) if (g_main_loop_is_running (clipboard->store_loop)) { - GDK_THREADS_LEAVE (); + gdk_threads_leave (); g_main_loop_run (clipboard->store_loop); - GDK_THREADS_ENTER (); + gdk_threads_enter (); } g_main_loop_unref (clipboard->store_loop); |