diff --git a/source/ubinstall-gtk-install-start.c b/source/ubinstall-gtk-install-start.c
index 083de62..19caa72 100644
--- a/source/ubinstall-gtk-install-start.c
+++ b/source/ubinstall-gtk-install-start.c
@@ -2,8 +2,7 @@
int yon_installation_start(main_window *widgets){
gtk_widget_show(gtk_widget_get_parent(widgets->InstallationProgress));
- // return !pthread_create(&main_config.install_thread,NULL,on_config_save,widgets);
- on_config_terminal_save(widgets);
+ return !pthread_create(&main_config.install_thread,NULL,on_config_save,widgets);
return 1;
}
@@ -12,7 +11,7 @@ void yon_quick_install(GtkWidget *self, main_window *widgets){
main_config.save_configured=1;
gtk_widget_hide(self);
gtk_widget_show(gtk_widget_get_parent(widgets->InstallationProgress));
- // pthread_create(&main_config.install_thread,NULL,on_config_save,widgets);
+ pthread_create(&main_config.install_thread,NULL,on_config_save,widgets);
gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_INSTALLATION);
if (!yon_char_is_empty(main_config.config_load_path)){
char *command = quick_install_command(main_config.config_load_path);
diff --git a/source/ubinstall-gtk-page-switch.c b/source/ubinstall-gtk-page-switch.c
index 403f566..e0d4fbe 100644
--- a/source/ubinstall-gtk-page-switch.c
+++ b/source/ubinstall-gtk-page-switch.c
@@ -588,8 +588,7 @@ void yon_page_init(main_window *widgets, enum YON_PAGES page){
g_mutex_lock(&main_config.install_mutex);
if (main_config.install_complete){
g_mutex_unlock(&main_config.install_mutex);
- // g_thread_new("install_thread",(GThreadFunc)on_setup_system_configuration,widgets);
- on_config_terminal_setup_system_configuration(widgets);
+ g_thread_new("install_thread",(GThreadFunc)on_setup_system_configuration,widgets);
} else {
g_mutex_unlock(&main_config.install_mutex);
}
@@ -651,11 +650,7 @@ void on_page_cancel_clicked(GtkWidget *, main_window *widgets){
data->action_text=INTERRUPT_TEXT_LABEL;
data->title=WARNING_TITLE_LABEL;
if (yon_confirmation_dialog_call(widgets->MainWindow,data)==GTK_RESPONSE_ACCEPT ){
- g_signal_handlers_block_by_func(G_OBJECT(widgets->install_terminal),on_config_install_success,widgets);
- gtk_widget_destroy(widgets->install_terminal);
- widgets->install_terminal = NULL;
- yon_install_terminal_recreate(widgets);
- // pthread_cancel(main_config.install_thread);
+ pthread_cancel(main_config.install_thread);
kill(main_config.install_thread,SIGKILL);
g_signal_handlers_disconnect_by_func(G_OBJECT(widgets->install_info_monitor),yon_installation_progress_update,widgets);
g_file_monitor_cancel(widgets->install_info_monitor);
diff --git a/source/ubinstall-gtk-saving.c b/source/ubinstall-gtk-saving.c
index b62e680..f5f0efd 100644
--- a/source/ubinstall-gtk-saving.c
+++ b/source/ubinstall-gtk-saving.c
@@ -170,34 +170,15 @@ void on_config_install_success(GtkWidget *, int state, main_window *widgets){
}
g_mutex_unlock(&main_config.install_mutex);
if ((!main_config.save_done)&&main_config.save_configured){
- // on_setup_system_configuration(widgets);
- on_config_terminal_setup_system_configuration(widgets);
+ on_setup_system_configuration(widgets);
} else if (main_config.save_done&&main_config.save_configured){
g_idle_add((GSourceFunc)on_install_success,widgets);
} else {
main_config.save_done=1;
- gtk_widget_hide(widgets->install_terminal_window->Window);
}
}
-void on_config_terminal_save(main_window *widgets){
- g_idle_add((GSourceFunc)yon_progress_bar_start,widgets);
- if (!main_config.dry_run){
- char *command = yon_debug_output("%s\n",save_config_command);
- yon_debug_output("%s\n","Entered installation");
- yon_terminal_integrated_start(widgets->install_terminal,command);
- if (main_config.debug_mode){
- gtk_widget_show(widgets->install_terminal_window->Window);
- }
- main_config.install_thread = 1;
- } else {
- yon_launch("ubconfig --source system get /");
- }
- return;
-}
-
-
void *on_config_save(void *data){
main_window *widgets = (main_window*)data;
@@ -219,9 +200,7 @@ void *on_config_save(void *data){
main_config.install_complete=1;
g_mutex_unlock(&main_config.install_mutex);
if ((!main_config.save_done)&&main_config.save_configured){
- // on_setup_system_configuration(widgets);
- on_config_terminal_setup_system_configuration(widgets);
- // on_page_next_clicked(NULL,widgets);
+ on_setup_system_configuration(widgets);
}
} else {
yon_launch("ubconfig --source system get /");
@@ -229,27 +208,6 @@ void *on_config_save(void *data){
return 0;
}
-
-void on_config_terminal_setup_system_configuration(main_window *widgets){
- g_idle_add((GSourceFunc)yon_progress_bar_start,widgets);
- if (!main_config.dry_run){
- char *command = yon_debug_output("%s\n",set_user_config_command);
- yon_debug_output("%s\n","Entered configuration");
- yon_terminal_integrated_start(widgets->install_terminal,command);
- g_mutex_lock(&main_config.install_mutex);
- main_config.install_thread=1;
- g_mutex_unlock(&main_config.install_mutex);
- if (main_config.debug_mode){
- gtk_widget_show(widgets->install_terminal_window->Window);
- }
-
- } else {
- yon_launch("ubconfig --source system get /");
- yon_launch(ubinstall_dry_run_command);
- }
- return;
-}
-
void *on_setup_system_configuration(void * data){
yon_debug_output("%s\n","Entered thread");
main_window *widgets = (main_window*)data;
diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c
index b4775ac..338b8e4 100644
--- a/source/ubinstall-gtk.c
+++ b/source/ubinstall-gtk.c
@@ -254,11 +254,7 @@ void on_reboot_accepted(main_window *widgets){
if (yon_confirmation_dialog_call(widgets->MainWindow,data)==GTK_RESPONSE_ACCEPT){
g_mutex_lock(&main_config.install_mutex);
if (main_config.install_thread){
- g_signal_handlers_block_by_func(G_OBJECT(widgets->install_terminal),on_config_install_success,widgets);
- gtk_widget_destroy(widgets->install_terminal);
- widgets->install_terminal = NULL;
- yon_install_terminal_recreate(widgets);
- // pthread_cancel((pthread_t)main_config.install_thread);
+ pthread_cancel((pthread_t)main_config.install_thread);
g_mutex_unlock(&main_config.install_mutex);
}
main_config.exit_accepted=1;
@@ -271,23 +267,10 @@ void on_reboot_accepted(main_window *widgets){
}
}
-void yon_install_terminal_recreate(main_window *widgets){
-
- widgets->install_terminal = vte_terminal_new();
-
- gtk_box_pack_start(GTK_BOX(widgets->install_terminal_window->MainBox),widgets->install_terminal,1,1,0);
- gtk_widget_show(widgets->install_terminal);
- g_signal_connect(G_OBJECT(widgets->install_terminal),"child-exited",G_CALLBACK(on_config_install_success),widgets);
-}
-
void on_exit_accepted(main_window *widgets){
g_mutex_lock(&main_config.install_mutex);
if (main_config.install_thread){
- g_signal_handlers_block_by_func(G_OBJECT(widgets->install_terminal),on_config_install_success,widgets);
- gtk_widget_destroy(widgets->install_terminal);
- widgets->install_terminal = NULL;
- yon_install_terminal_recreate(widgets);
- // pthread_cancel((pthread_t)main_config.install_thread);
+ pthread_cancel((pthread_t)main_config.install_thread);
g_mutex_unlock(&main_config.install_mutex);
}
if (!main_config.configure_mode)
@@ -749,8 +732,6 @@ void yon_main_window_create(main_window *widgets){
widgets->NextInstallationSliderImage = yon_gtk_builder_get_widget(builder,"NextInstallationSliderImage");
widgets->PrevInstallationSliderImage = yon_gtk_builder_get_widget(builder,"PrevInstallationSliderImage");
- widgets->install_terminal_window = yon_window_new();
- widgets->install_terminal = vte_terminal_new();
widgets->network_connections = NULL;
widgets->pacmanchosen = g_hash_table_new_full(g_str_hash,g_str_equal,free,NULL);
@@ -767,11 +748,6 @@ void yon_main_window_create(main_window *widgets){
g_signal_connect(G_OBJECT(widgets->db_lock_monitor),"changed",G_CALLBACK(yon_db_unlock_update),widgets);
}
- yon_gtk_widget_block_destruction(widgets->install_terminal_window->Window);
- gtk_box_pack_start(GTK_BOX(widgets->install_terminal_window->MainBox),widgets->install_terminal,1,1,0);
- gtk_widget_show(widgets->install_terminal);
- g_signal_connect(G_OBJECT(widgets->install_terminal),"child-exited",G_CALLBACK(on_config_install_success),widgets);
-
g_signal_connect(G_OBJECT(widgets->MainWindow),"delete-event",G_CALLBACK(on_yon_exit),widgets);
GtkWidget *menu = yon_gtk_builder_get_widget(builder,"menu2");
diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h
index 96950fd..f279cfc 100755
--- a/source/ubinstall-gtk.h
+++ b/source/ubinstall-gtk.h
@@ -856,9 +856,6 @@ typedef struct
GFileMonitor *db_lock_monitor;
- yon_window *install_terminal_window;
- GtkWidget *install_terminal;
-
} main_window;
enum ADVANCED_PART_TYPE
@@ -1645,7 +1642,4 @@ void yon_status_thread_update_active(main_window *widgets);
void *yon_status_thread_update(main_window *widgets);
void yon_db_lock_update(GFileMonitor *,GFile *,GFile *,GFileMonitorEvent ,main_window *widgets);
void yon_db_unlock_update(GFileMonitor *,GFile *,GFile *,GFileMonitorEvent ,main_window *widgets);
-void on_config_install_success(GtkWidget *self, int state, main_window *widgets);
-void on_config_terminal_save(main_window *widgets);
-void yon_install_terminal_recreate(main_window *widgets);
-void on_config_terminal_setup_system_configuration(main_window *widgets);
\ No newline at end of file
+void on_config_install_success(GtkWidget *self, int state, main_window *widgets);
\ No newline at end of file
diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade
index fe4b481..d1ea92e 100644
--- a/ubinstall-gtk.glade
+++ b/ubinstall-gtk.glade
@@ -5914,22 +5914,22 @@ Select a different installation sources.