From d643c3a7061b5dbaa8a1b7e89c1125a36bc156d0 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 22 Apr 2024 12:18:27 +0600 Subject: [PATCH] Returned terminal command executing --- source/ubl-settings-system.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/source/ubl-settings-system.c b/source/ubl-settings-system.c index ac02a32..0c3985d 100644 --- a/source/ubl-settings-system.c +++ b/source/ubl-settings-system.c @@ -495,8 +495,9 @@ void on_domain_connect(GtkWidget *self, dictionary *dict){ gtk_label_set_text(GTK_LABEL(dialog->HeadLabel),DOMAIN_CONNECTING_LABEL); yon_debug_output(domain_connect_command(adress,login,password,final)); int size_; - config_str test = yon_config_load(domain_disconnect_command(adress,login,password),&size_); - vte_terminal_feed(VTE_TERMINAL(dialog->ExecuteTerminal),yon_char_parsed_to_string(test,size_,""),-1); + // config_str test = yon_config_load(domain_disconnect_command(adress,login,password),&size_); + // vte_terminal_feed(VTE_TERMINAL(dialog->ExecuteTerminal),yon_char_parsed_to_string(test,size_,""),-1); + yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_disconnect_command(adress,login,password),NULL,NULL); gtk_entry_set_text(GTK_ENTRY(widgets->DomainEntry),adress); gtk_widget_show(dialog->Window); } @@ -508,8 +509,9 @@ void on_status_clicked(GtkWidget *self, connection_window *window){ yon_debug_output(domain_info(target)); int size_; - config_str test = yon_config_load(domain_info(target),&size_); - vte_terminal_feed(VTE_TERMINAL(dialog->ExecuteTerminal),yon_char_parsed_to_string(test,size_,""),-1); + // config_str test = yon_config_load(domain_info(target),&size_); + // vte_terminal_feed(VTE_TERMINAL(dialog->ExecuteTerminal),yon_char_parsed_to_string(test,size_,""),-1); + yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_info(target),NULL,NULL); } gtk_widget_show(dialog->Window); @@ -519,8 +521,9 @@ void on_find_domains_clicked(GtkWidget *self, connection_window *window){ domain_info_window *dialog = yon_information_window_new(); yon_debug_output(domains_seek_command); int size_; - config_str test = yon_config_load(domains_seek_command,&size_); - vte_terminal_feed(VTE_TERMINAL(dialog->ExecuteTerminal),yon_char_parsed_to_string(test,size_,""),-1); + // config_str test = yon_config_load(domains_seek_command,&size_); + // vte_terminal_feed(VTE_TERMINAL(dialog->ExecuteTerminal),yon_char_parsed_to_string(test,size_,""),-1); + yon_terminal_integrated_start(dialog->ExecuteTerminal,domains_seek_command,NULL,NULL); gtk_widget_show(dialog->Window); } @@ -533,8 +536,9 @@ void on_main_window_domain_status_clicked(GtkWidget *self, GtkEntryIconPosition gtk_widget_show(window->Window); yon_debug_output(get_domain_info_command); int size_; - config_str test = yon_config_load(get_domain_info_command,&size_); - vte_terminal_feed(VTE_TERMINAL(window->ExecuteTerminal),yon_char_parsed_to_string(test,size_,""),-1); + // config_str test = yon_config_load(get_domain_info_command,&size_); + // vte_terminal_feed(VTE_TERMINAL(window->ExecuteTerminal),yon_char_parsed_to_string(test,size_,""),-1); + yon_terminal_integrated_start(window->ExecuteTerminal,get_domain_info_command,NULL,NULL); } } } @@ -602,8 +606,9 @@ void on_domain_disconnect(GtkWidget *self, dictionary *dict){ gtk_widget_show(dialog->Window); yon_debug_output(domain_disconnect_command(adress,login,password)); int size_; - config_str test = yon_config_load(domain_disconnect_command(adress,login,password),&size_); - vte_terminal_feed(VTE_TERMINAL(dialog->ExecuteTerminal),yon_char_parsed_to_string(test,size_,""),-1); + // config_str test = yon_config_load(domain_disconnect_command(adress,login,password),&size_); + // vte_terminal_feed(VTE_TERMINAL(dialog->ExecuteTerminal),yon_char_parsed_to_string(test,size_,""),-1); + yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_disconnect_command(adress,login,password),NULL,NULL); gtk_entry_set_text(GTK_ENTRY(widgets->DomainEntry),adress); on_subwindow_close(window->Window); }