[vte/vte-next] Replace GDK_THREADS_ENTER/LEAVE with gdk_threads_enter/leave



commit 4a73e415b12d384e52e14b81273daeba2c69773c
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Aug 4 22:20:36 2012 -0400

    Replace GDK_THREADS_ENTER/LEAVE with gdk_threads_enter/leave
    
    Using the functions directly allows us to benefit from the
    new more gracious deprecation approach, and doesn't force
    a harsh build break due to undefined macros.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=681216

 src/vte.c |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/src/vte.c b/src/vte.c
index 2f78b2f..1ed388b 100644
--- a/src/vte.c
+++ b/src/vte.c
@@ -978,9 +978,9 @@ vte_buffer_emit_eof(VteBuffer *buffer)
 {
 	_vte_debug_print(VTE_DEBUG_SIGNALS,
 			"Emitting `eof'.\n");
-	GDK_THREADS_ENTER ();
+	gdk_threads_enter ();
 	g_signal_emit(buffer, buffer_signals[BUFFER_EOF], 0);
-	GDK_THREADS_LEAVE ();
+	gdk_threads_leave ();
 
 	return FALSE;
 }
@@ -3945,9 +3945,9 @@ out:
 			_vte_buffer_feed_chunks (buffer, chunks);
 		}
 		if (!vte_view_is_processing (terminal)) {
-			GDK_THREADS_ENTER ();
+			gdk_threads_enter ();
 			vte_view_add_process_timeout (terminal);
-			GDK_THREADS_LEAVE ();
+			gdk_threads_leave ();
 		}
 		buffer->pvt->pty_input_active = len != 0;
 		buffer->pvt->input_bytes = bytes;
@@ -3980,9 +3980,9 @@ out:
 	if (eof) {
 		/* potential deadlock ... */
 		if (!vte_view_is_processing (terminal)) {
-			GDK_THREADS_ENTER ();
+			gdk_threads_enter ();
 			vte_view_eof (channel, terminal);
-			GDK_THREADS_LEAVE ();
+			gdk_threads_leave ();
 		} else {
 			vte_view_eof (channel, terminal);
 		}
@@ -12737,7 +12737,7 @@ process_timeout (gpointer data)
 	GList *l, *next;
 	gboolean again;
 
-	GDK_THREADS_ENTER();
+	gdk_threads_enter();
 
 	in_process_timeout = TRUE;
 
@@ -12800,7 +12800,7 @@ process_timeout (gpointer data)
 
 	in_process_timeout = FALSE;
 
-	GDK_THREADS_LEAVE();
+	gdk_threads_leave();
 
 	if (again) {
 		/* Force us to relinquish the CPU as the child is running
@@ -12865,7 +12865,7 @@ update_repeat_timeout (gpointer data)
 	GList *l, *next;
 	gboolean again;
 
-	GDK_THREADS_ENTER();
+	gdk_threads_enter();
 
 	in_update_timeout = TRUE;
 
@@ -12939,7 +12939,7 @@ update_repeat_timeout (gpointer data)
 
 	in_update_timeout = FALSE;
 
-	GDK_THREADS_LEAVE();
+	gdk_threads_leave();
 
 	if (again) {
 		/* Force us to relinquish the CPU as the child is running
@@ -12960,7 +12960,7 @@ update_timeout (gpointer data)
 	GList *l, *next;
 	gboolean redraw = FALSE;
 
-	GDK_THREADS_ENTER();
+	gdk_threads_enter();
 
 	in_update_timeout = TRUE;
 
@@ -13026,7 +13026,7 @@ update_timeout (gpointer data)
 				    NULL);
 	in_update_timeout = FALSE;
 
-	GDK_THREADS_LEAVE();
+	gdk_threads_leave();
 
 	return FALSE;
 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]