diff --git a/source/ubl-settings-system.c b/source/ubl-settings-system.c index 1a3bd02..63e39be 100644 --- a/source/ubl-settings-system.c +++ b/source/ubl-settings-system.c @@ -494,13 +494,10 @@ void on_domain_connect(GtkWidget *self, dictionary *dict){ domain_info_window *dialog = yon_information_window_new(); gtk_window_set_title(GTK_WINDOW(dialog->Window),DOMAIN_CONNECTING_LABEL); gtk_label_set_text(GTK_LABEL(dialog->HeadLabel),DOMAIN_CONNECTING_LABEL); - yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_connect_command(adress,login,password,final),NULL,NULL); - if (main_config.debug_mode){ - printf("%s\n",domain_connect_command(adress,login,password,final)); + yon_debug_output(domain_connect_command(adress,login,password,final)); int size_; - config_str test = yon_config_load(domain_connect_command(adress,login,password,final),&size_); - printf("%s\n",yon_char_parsed_to_string(test,size_,"\n")); - } + 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); gtk_entry_set_text(GTK_ENTRY(widgets->DomainEntry),adress); gtk_widget_show(dialog->Window); } @@ -509,26 +506,22 @@ void on_status_clicked(GtkWidget *self, connection_window *window){ domain_info_window *dialog = yon_information_window_new(); char *target = (char*)gtk_entry_get_text(GTK_ENTRY(window->AdressEntry)); if (!yon_char_is_empty(target)){ - yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_info(target),NULL,NULL); - if (main_config.debug_mode){ - printf("%s\n",domain_info(target)); + + yon_debug_output(domain_info(target)); int size_; config_str test = yon_config_load(domain_info(target),&size_); - printf("%s\n",yon_char_parsed_to_string(test,size_,"\n")); - } + vte_terminal_feed(VTE_TERMINAL(dialog->ExecuteTerminal),yon_char_parsed_to_string(test,size_,""),-1); + } gtk_widget_show(dialog->Window); } void on_find_domains_clicked(GtkWidget *self, connection_window *window){ domain_info_window *dialog = yon_information_window_new(); - yon_terminal_integrated_start(dialog->ExecuteTerminal,domains_seek_command,NULL,NULL); - if (main_config.debug_mode){ - printf("%s\n",domains_seek_command); + yon_debug_output(domains_seek_command); int size_; config_str test = yon_config_load(domains_seek_command,&size_); - printf("%s\n",yon_char_parsed_to_string(test,size_,"\n")); - } + vte_terminal_feed(VTE_TERMINAL(dialog->ExecuteTerminal),yon_char_parsed_to_string(test,size_,""),-1); gtk_widget_show(dialog->Window); } @@ -539,13 +532,10 @@ void on_main_window_domain_status_clicked(GtkWidget *self, GtkEntryIconPosition if (!yon_char_is_empty(target)){ domain_info_window *window = yon_information_window_new(); gtk_widget_show(window->Window); - yon_terminal_integrated_start(window->ExecuteTerminal,get_domain_info_command,NULL,NULL); - if (main_config.debug_mode){ - printf("%s\n",get_domain_info_command); + yon_debug_output(get_domain_info_command); int size_; config_str test = yon_config_load(get_domain_info_command,&size_); - printf("%s\n",yon_char_parsed_to_string(test,size_,"\n")); - } + vte_terminal_feed(VTE_TERMINAL(window->ExecuteTerminal),yon_char_parsed_to_string(test,size_,""),-1); } } } @@ -612,13 +602,10 @@ void on_domain_disconnect(GtkWidget *self, dictionary *dict){ // config_str parsed = yon_config_load(domain_disconnect_command(adress,login,password),&size); domain_info_window *dialog = yon_information_window_new(); gtk_widget_show(dialog->Window); - yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_disconnect_command(adress,login,password),NULL,NULL); - if (main_config.debug_mode){ - printf("%s\n",domain_disconnect_command(adress,login,password)); + yon_debug_output(domain_disconnect_command(adress,login,password)); int size_; config_str test = yon_config_load(domain_disconnect_command(adress,login,password),&size_); - printf("%s\n",yon_char_parsed_to_string(test,size_,"\n")); - } + vte_terminal_feed(VTE_TERMINAL(dialog->ExecuteTerminal),yon_char_parsed_to_string(test,size_,""),-1); gtk_entry_set_text(GTK_ENTRY(widgets->DomainEntry),adress); on_subwindow_close(window->Window); }