From 80abe8a3a77e20bcb65d871702ce5f22253d7297 Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Tue, 27 Feb 2024 12:02:18 +0600
Subject: [PATCH] VTE library fixes

---
 source/CMakeLists.txt        | 4 +---
 source/libublsettings-gtk3.c | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index af6f806..457ab14 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -41,10 +41,8 @@ ${GTK_LIBRARIES}
 ublsettings
 pthread)
 
-if (VTE291)
-list(APPEND LIBRARIES ${VTE291_LIBRARIES})
 add_definitions(-DVTE_INCLUDE)
-endif()
+list(APPEND LIBRARIES ${VTE291_LIBRARIES})
 
 if (WEBKIT_LIBRARIES_FOUND)
 list(APPEND LIBRARIES ${WEBKIT_LIBRARIES})
diff --git a/source/libublsettings-gtk3.c b/source/libublsettings-gtk3.c
index 0c92053..060a516 100644
--- a/source/libublsettings-gtk3.c
+++ b/source/libublsettings-gtk3.c
@@ -5,7 +5,6 @@
 static render_data render;
 
 // vte section
-#ifdef VTE_INCLUDE
 
 static void child_ready(VteTerminal *terminal, GPid pid, GError *error, gpointer user_data)
 {
@@ -70,7 +69,7 @@ void yon_terminal_integrated_start(GtkWidget *terminal, char* command, void *end
     vte_terminal_set_size(VTE_TERMINAL(terminal),10,15);
     VtePty *pty = vte_pty_new_sync(VTE_PTY_DEFAULT,NULL,NULL);
     vte_terminal_set_pty(VTE_TERMINAL(terminal),pty);
-    char *install_command=yon_char_unite("clear;tput cup 0 0 && tput ed; ",command,"  ; sleep 5; stty -echo; unset PS1","\n",NULL); 
+    char *install_command=yon_char_unite("clear;tput cup 0 0 && tput ed && ",command,"  ; sleep 5; stty -echo; unset PS1","\n",NULL); 
     if(endwork_function)
         g_signal_connect(G_OBJECT(terminal), "child-exited", G_CALLBACK(endwork_function), endwork_function_argument);
      vte_terminal_spawn_async(VTE_TERMINAL(terminal),
@@ -101,7 +100,6 @@ void yon_terminal_integrated_start(GtkWidget *terminal, char* command, void *end
         vte_terminal_set_scroll_on_keystroke(VTE_TERMINAL(terminal), TRUE);
         gtk_widget_show_all(terminal);
     }
-#endif
     // Window config section
 
     #define check_window_config_setup if(__yon_window_config_target_window)
-- 
2.35.1