[vte] build: Bump gtk min-req version to 3.6



commit 569620226390668c4e90c4bbd85bc09de755bd87
Author: Egmont Koblinger <egmont gmail com>
Date:   Wed Sep 18 14:16:10 2019 +0200

    build: Bump gtk min-req version to 3.6
    
    Also drop gdk_threads_enter/leave() calls.
    
    https://gitlab.gnome.org/GNOME/vte/issues/172

 meson.build |  2 +-
 src/vte.cc  | 55 +------------------------------------------------------
 2 files changed, 2 insertions(+), 55 deletions(-)
---
diff --git a/meson.build b/meson.build
index ca613d93..bb2bba21 100644
--- a/meson.build
+++ b/meson.build
@@ -32,7 +32,7 @@ project(
 # Requirements
 
 gtk3_req_version          = '3.20.0'
-gtk3_min_req_version      = '3.4'
+gtk3_min_req_version      = '3.6'
 gtk3_max_allowed_version  = '3.20'
 gtk4_req_version          = '4.0.0'
 
diff --git a/src/vte.cc b/src/vte.cc
index 654dc498..1734d34f 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -761,16 +761,8 @@ Terminal::queue_cursor_moved()
 static gboolean
 emit_eof_idle_cb(VteTerminal *terminal)
 {
-        G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-       gdk_threads_enter ();
-        G_GNUC_END_IGNORE_DEPRECATIONS;
-
         _vte_terminal_get_impl(terminal)->emit_eof();
 
-        G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-       gdk_threads_leave ();
-        G_GNUC_END_IGNORE_DEPRECATIONS;
-
         return G_SOURCE_REMOVE;
 }
 
@@ -4150,15 +4142,7 @@ out:
                  */
 
                if (!is_processing()) {
-                        G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-                       gdk_threads_enter ();
-                        G_GNUC_END_IGNORE_DEPRECATIONS;
-
                        add_process_timeout(this);
-
-                        G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-                       gdk_threads_leave ();
-                        G_GNUC_END_IGNORE_DEPRECATIONS;
                }
                m_pty_input_active = len != 0;
                m_input_bytes = bytes;
@@ -4189,20 +4173,7 @@ out:
 
        /* If we detected an eof condition, signal one. */
        if (eof) {
-               /* potential deadlock ... */
-               if (!is_processing()) {
-                        G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-                       gdk_threads_enter ();
-                        G_GNUC_END_IGNORE_DEPRECATIONS;
-
-                       pty_channel_eof();
-
-                        G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-                       gdk_threads_leave ();
-                        G_GNUC_END_IGNORE_DEPRECATIONS;
-               } else {
-                       pty_channel_eof();
-               }
+                pty_channel_eof();
 
                again = FALSE;
        }
@@ -10817,10 +10788,6 @@ process_timeout (gpointer data)
        GList *l, *next;
        gboolean again;
 
-        G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-       gdk_threads_enter();
-        G_GNUC_END_IGNORE_DEPRECATIONS;
-
        in_process_timeout = TRUE;
 
        _vte_debug_print (VTE_DEBUG_WORK, "<");
@@ -10859,10 +10826,6 @@ process_timeout (gpointer data)
 
        in_process_timeout = FALSE;
 
-        G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-       gdk_threads_leave();
-        G_GNUC_END_IGNORE_DEPRECATIONS;
-
        if (again) {
                /* Force us to relinquish the CPU as the child is running
                 * at full tilt and making us run to keep up...
@@ -10912,10 +10875,6 @@ update_repeat_timeout (gpointer data)
        GList *l, *next;
        bool again;
 
-        G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-       gdk_threads_enter();
-        G_GNUC_END_IGNORE_DEPRECATIONS;
-
        in_update_timeout = TRUE;
 
        _vte_debug_print (VTE_DEBUG_WORK, "[");
@@ -10963,10 +10922,6 @@ update_repeat_timeout (gpointer data)
 
        in_update_timeout = FALSE;
 
-        G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-       gdk_threads_leave();
-        G_GNUC_END_IGNORE_DEPRECATIONS;
-
        if (again) {
                /* Force us to relinquish the CPU as the child is running
                 * at full tilt and making us run to keep up...
@@ -10985,10 +10940,6 @@ update_timeout (gpointer data)
 {
        GList *l, *next;
 
-        G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-       gdk_threads_enter();
-        G_GNUC_END_IGNORE_DEPRECATIONS;
-
        in_update_timeout = TRUE;
 
        _vte_debug_print (VTE_DEBUG_WORK, "{");
@@ -11023,10 +10974,6 @@ update_timeout (gpointer data)
                                    NULL);
        in_update_timeout = FALSE;
 
-        G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-       gdk_threads_leave();
-        G_GNUC_END_IGNORE_DEPRECATIONS;
-
        return FALSE;
 }
 


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