From b20bc46c9521f9be99f5bf99f3382d5deb69921a Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Wed, 11 Mar 2026 16:19:00 +0600 Subject: [PATCH] Install packages by groups loading fix; Kernel addons page save fix --- source/ubinstall-gtk-components.c | 2 +- source/ubinstall-gtk-kernel.c | 2 +- source/ubinstall-gtk-packages.c | 10 ++++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/source/ubinstall-gtk-components.c b/source/ubinstall-gtk-components.c index 30a254b..5e42f36 100644 --- a/source/ubinstall-gtk-components.c +++ b/source/ubinstall-gtk-components.c @@ -52,7 +52,7 @@ int yon_kernel_addon_save(main_window *widgets){ for(GList *iter = list;iter;iter = iter->next){ kernel_addon_row *row = g_object_get_data(G_OBJECT(iter->data),"kernel_row"); if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(row->InstallCheck))){ - yon_config_append_element(packages_parameter,row->modules," "); + yon_config_append_element(packages_parameter,row->modules,","); } } diff --git a/source/ubinstall-gtk-kernel.c b/source/ubinstall-gtk-kernel.c index 51cd994..5f5484c 100644 --- a/source/ubinstall-gtk-kernel.c +++ b/source/ubinstall-gtk-kernel.c @@ -395,7 +395,7 @@ void yon_kernel_addon_setup(main_window *widgets){ int modules_size; config_str modules_parsed = NULL; if (!yon_char_is_empty(modules)){ - modules_parsed = yon_char_parse(modules,&modules_size," "); + modules_parsed = yon_char_parse(modules,&modules_size,","); } int size; diff --git a/source/ubinstall-gtk-packages.c b/source/ubinstall-gtk-packages.c index 9d18826..40f02b3 100644 --- a/source/ubinstall-gtk-packages.c +++ b/source/ubinstall-gtk-packages.c @@ -68,6 +68,8 @@ GtkTreeIter *yon_subcategory_check(GtkTreeStore *target, GtkTreeIter *parent_ite void yon_packages_tab_init(main_window *widgets){ gtk_tree_store_clear(widgets->PackagesList); int size; + char *config_packages = config(packages_parameter); + config_str packages = yon_resource_open_file(groups_list_path,&size); for (int i=1;iPackagesList,&package_iter,subcategory_iter); char *full_string = yon_char_unite("",parsed[2],"\n",_(parsed[3]),NULL); - gtk_tree_store_set(widgets->PackagesList,&package_iter,0,0,1,parsed[2],2,full_string,3,1,-1); + gtk_tree_store_set(widgets->PackagesList,&package_iter,0,!!yon_char_check_element(config_packages,parsed[2],","),1,parsed[2],2,full_string,3,1,-1); free(full_string); gtk_tree_iter_free(subcategory_iter); } else { @@ -90,14 +92,14 @@ void yon_packages_tab_init(main_window *widgets){ gtk_tree_store_set(widgets->PackagesList,&subcatiter,1,parsed[1],2,_(parsed[3]),3,0,-1); gtk_tree_store_append(widgets->PackagesList,&package_iter,&subcatiter); char *full_string = yon_char_unite("",parsed[2],"\n",_(parsed[3]),NULL); - gtk_tree_store_set(widgets->PackagesList,&package_iter,0,0,1,parsed[2],2,full_string,3,1,-1); + gtk_tree_store_set(widgets->PackagesList,&package_iter,0,!!yon_char_check_element(config_packages,parsed[2],","),1,parsed[2],2,full_string,3,1,-1); free(full_string); } } else { GtkTreeIter package_iter; gtk_tree_store_append(widgets->PackagesList,&package_iter,category_iter); char *full_string = yon_char_unite("",parsed[2],"\n",_(parsed[3]),NULL); - gtk_tree_store_set(widgets->PackagesList,&package_iter,0,0,1,parsed[2],2,full_string,3,1,-1); + gtk_tree_store_set(widgets->PackagesList,&package_iter,0,!!yon_char_check_element(config_packages,parsed[2],","),1,parsed[2],2,full_string,3,1,-1); free(full_string); } gtk_tree_iter_free(category_iter); @@ -121,7 +123,7 @@ void yon_packages_tab_init(main_window *widgets){ gtk_tree_store_set(widgets->PackagesList,&catiter,1,parsed[0],2,_(parsed[0]),3,0,-1); gtk_tree_store_append(widgets->PackagesList,&package_iter,&catiter); char *full_string = yon_char_unite("",parsed[2],"\n",_(parsed[3]),NULL); - gtk_tree_store_set(widgets->PackagesList,&package_iter,0,0,1,parsed[2],2,full_string,3,1,-1); + gtk_tree_store_set(widgets->PackagesList,&package_iter,0,!!yon_char_check_element(config_packages,parsed[2],","),1,parsed[2],2,full_string,3,1,-1); free(full_string); } }