|
|
|
|
@ -335,32 +335,17 @@ void *on_config_save(void *data){
|
|
|
|
|
yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),INSTALLATION_ERROR,5,BACKGROUND_IMAGE_FAIL_TYPE);
|
|
|
|
|
};
|
|
|
|
|
main_config.install_thread=NULL;
|
|
|
|
|
yon_debug_output("Install set to: %s\n",yon_char_from_int(main_config.install_complete));
|
|
|
|
|
main_config.install_complete=1;
|
|
|
|
|
yon_debug_output("Install set to: %s\n",yon_char_from_int(main_config.install_complete));
|
|
|
|
|
yon_debug_output("Save state: %s\n",yon_char_from_int(main_config.save_done));
|
|
|
|
|
if (main_config.save_done){
|
|
|
|
|
gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_COMPLETION);
|
|
|
|
|
}
|
|
|
|
|
main_config.install_thread=(GThread*)0x0;
|
|
|
|
|
main_config.config_save_thread=NULL;
|
|
|
|
|
}
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void *yon_installation_start(main_window *widgets);
|
|
|
|
|
void *yon_installation_start(main_window *widgets){
|
|
|
|
|
if (!main_config.install_complete){
|
|
|
|
|
if (system(start_fast_install_command)){
|
|
|
|
|
}
|
|
|
|
|
gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_COMPLETION);
|
|
|
|
|
}
|
|
|
|
|
g_thread_exit(NULL);
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
gboolean yon_installation_progress_update(void *data);
|
|
|
|
|
gboolean yon_installation_progress_update(void *data){
|
|
|
|
|
main_window *widgets = (main_window*)data;
|
|
|
|
|
@ -515,12 +500,6 @@ void *on_setup_system_configuration(void * data){
|
|
|
|
|
free(command);
|
|
|
|
|
if (parameter_string) free(parameter_string);
|
|
|
|
|
}
|
|
|
|
|
main_config.save_done=1;
|
|
|
|
|
yon_debug_output("Save changed to: %s\n",yon_char_from_int(main_config.save_done));
|
|
|
|
|
|
|
|
|
|
yon_debug_output("Install state: %s\n",yon_char_from_int(main_config.install_complete));
|
|
|
|
|
if (main_config.install_complete)
|
|
|
|
|
gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_COMPLETION);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -834,6 +813,12 @@ void on_page_navigation_clicked(GtkWidget *self, main_window *widgets){
|
|
|
|
|
pthread_t tid;
|
|
|
|
|
pthread_create(&tid,NULL,on_setup_system_configuration,widgets);
|
|
|
|
|
}
|
|
|
|
|
main_config.save_done=1;
|
|
|
|
|
yon_debug_output("Save changed to: %s\n",yon_char_from_int(main_config.save_done));
|
|
|
|
|
|
|
|
|
|
yon_debug_output("Install state: %s\n",yon_char_from_int(main_config.install_complete));
|
|
|
|
|
if (main_config.install_complete)
|
|
|
|
|
gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_COMPLETION);
|
|
|
|
|
gtk_widget_set_sensitive(widgets->CancelInstallButton,0);
|
|
|
|
|
gtk_widget_set_sensitive(widgets->NextButton,0);
|
|
|
|
|
gtk_widget_set_sensitive(widgets->BackButton,0);
|
|
|
|
|
|