diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c index dde5eea..132de74 100644 --- a/source/ubinstall-gtk.c +++ b/source/ubinstall-gtk.c @@ -1000,7 +1000,7 @@ void *on_config_save(void *data){ if (!main_config.save_done){ yon_debug_output("%s\n","Entered installation page change"); on_setup_system_configuration(widgets); - g_thread_new("success func",(GThreadFunc)on_install_success,widgets); + // g_thread_new("success func",(GThreadFunc)on_install_success,widgets); } yon_debug_output("%s\n","Exit installation"); @@ -1200,11 +1200,11 @@ void on_page_changed(GtkWidget *,GtkWidget *,int page, main_window *widgets){ } } -void *on_install_success(main_window *widgets){ +gboolean on_install_success(main_window *widgets){ gtk_label_set_text(GTK_LABEL(widgets->InstallationLabel),""); gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_COMPLETION); - return NULL; + return 0; } void *on_install_error(main_window *widgets){ @@ -1219,30 +1219,30 @@ void *on_setup_system_configuration(void * data){ main_window *widgets = (main_window*)data; if (widgets){}; int size; - config_str all_parameters = yon_config_get_selection_by_key(&size, - user_name_parameter, - user_gecos_parameter, - user_password_parameter, - root_password_parameter, - autologin_parameter, - xkbmodel_parameter, - xkblayout_parameter, - xkbvariant_parameter, - xkboptions_parameter, - hostname_parameter, - zone_parameter, - lang_parameter, - locale_parameter, + config_str all_parameters = yon_char_parsed_new(&size, + config(user_name_parameter), + config(user_gecos_parameter), + config(user_password_parameter), + config(root_password_parameter), + config(autologin_parameter), + config(xkbmodel_parameter), + config(xkblayout_parameter), + config(xkbvariant_parameter), + config(xkboptions_parameter), + config(hostname_parameter), + config(zone_parameter), + config(lang_parameter), + config(locale_parameter), NULL); if (all_parameters){ char *parameter_string = yon_char_parsed_to_string(all_parameters,size," "); char *command = set_user_config_command(parameter_string); if (system(yon_debug_output("%s\n",command))){}; - yon_char_parsed_free(all_parameters,size); - free(command); - if (parameter_string) free(parameter_string); + // yon_char_parsed_free(all_parameters,size); + // free(command); + // if (parameter_string) free(parameter_string); } - g_thread_new("success func",(GThreadFunc)on_install_success,widgets); + g_idle_add((GSourceFunc)on_install_success,widgets); return NULL; } diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h index 4d4b003..454face 100755 --- a/source/ubinstall-gtk.h +++ b/source/ubinstall-gtk.h @@ -468,6 +468,6 @@ void on_autohostname_sensitiveness_check(GtkWidget *, main_window *widgets); void on_autohostname_check(GtkWidget *, main_window *widgets); void on_hostname_entry_changed (GtkWidget *, main_window *widgets); -void *on_install_success(main_window *widgets); +gboolean on_install_success(main_window *widgets); void *on_install_error(main_window *widgets); \ No newline at end of file