diff --git a/source/ubinstall-gtk-components.c b/source/ubinstall-gtk-components.c index f3165f4..d3c13cc 100644 --- a/source/ubinstall-gtk-components.c +++ b/source/ubinstall-gtk-components.c @@ -1,5 +1,6 @@ #include "ubinstall-gtk.h" + int yon_kernel_save(main_window *widgets){ GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->KernelListBox)); char *install_modules = ""; @@ -44,22 +45,21 @@ int yon_kernel_save(main_window *widgets){ int yon_kernel_addon_save(main_window *widgets){ // yon_kernel_save(widgets); + char *parameter = config(modules_extra_parameter); GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->KernelAddonListBox)); - char *install_modules = ""; + char *install_modules = yon_char_new(parameter); for(GList *iter = list;iter;iter = iter->next){ kernel_row *row = g_object_get_data(G_OBJECT(iter->data),"kernel_row"); if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(row->InstallCheck))){ - char *temp = yon_char_unite(install_modules,!yon_char_is_empty(install_modules)?" ":"",row->modules,NULL); + char *temp = yon_char_append_element(install_modules,row->modules," "); if (!yon_char_is_empty(install_modules)) free(install_modules); install_modules = temp; } } if (!yon_char_is_empty(install_modules)){ - char *parameter = config(modules_extra_parameter); - char *parameter_new = yon_char_unite(!yon_char_is_empty(parameter)?parameter:"",!yon_char_is_empty(parameter)?" ":"",install_modules,NULL); - yon_config_register(modules_extra_parameter,modules_extra_parameter_command,parameter_new); - free(parameter_new); + yon_config_register(modules_extra_parameter,modules_extra_parameter_command,install_modules); + free(install_modules); } if (!main_config.configure_mode){ int size; @@ -222,7 +222,6 @@ void yon_os_components_init(main_window *widgets){ } int yon_software_save(main_window *widgets){ - GtkTreeIter iter; GtkTreeModel *model = GTK_TREE_MODEL(widgets->AdditionalSoftwareList); int size = 0;