diff --git a/source/ubinstall-gtk-components.c b/source/ubinstall-gtk-components.c index 50184cc..196115b 100644 --- a/source/ubinstall-gtk-components.c +++ b/source/ubinstall-gtk-components.c @@ -94,7 +94,7 @@ int yon_os_components_save(main_window *widgets){ config_str modules = NULL; for(iter = list;iter;iter=iter->next){ os_row *row = g_object_get_data(iter->data,"kernel_row"); - char *target = row->name; + char *target = row->source; int status = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(row->InstallCheck)); if (status){ yon_char_parsed_add_or_create_if_exists(modules,&size,target); @@ -177,6 +177,7 @@ void *yon_modules_list_load(main_window *widgets){ void yon_os_row_setup(os_row *row, char *name, char *version,char *tags, char *description,char *source, char *size){ row->name = yon_char_new(name); + row->source = yon_char_new(source); char *description_full = yon_char_new(description); if (yon_char_is_empty(source)||yon_char_check_begins_with(source,"(local)/")){ @@ -219,29 +220,6 @@ void yon_modules_missed_func(main_window *widgets){ yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),MAIN_COMPONENTS_NOT_FOUND_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); } -void *yon_os_components_setup(main_window *widgets){ - int base_size; - config_str base = yon_config_load(get_modules_command,&base_size); - for (int i=0;iversion = parsed[1]; - row->name = parsed[0]; - row->tags = yon_char_replace(parsed[2]," ",", "); - row->description = parsed[3]; - row->widgets=widgets; - g_idle_add((GSourceFunc)yon_os_component_insert,row); - } - g_idle_add((GSourceFunc)yon_spinner_switch_off,widgets->OSSpinner); - if (!base_size){ - g_idle_add_once((GSourceOnceFunc)yon_modules_missed_func,widgets); - return NULL; - } - yon_char_parsed_free(base,base_size); - return NULL; -} void yon_os_components_init(main_window *widgets){ int size = 0; diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h index 74063db..d3e5aea 100755 --- a/source/ubinstall-gtk.h +++ b/source/ubinstall-gtk.h @@ -1001,6 +1001,7 @@ typedef struct GtkWidget *SizeLabel; char *name; + char *source; char *modules; char *version; char *tags; @@ -1386,7 +1387,6 @@ void yon_set_locales_list(main_window *widgets); void on_installer_language_changed(GtkWidget *self, GtkTreePath *, GtkTreeViewColumn *, main_window *widgets); gboolean on_country_filter(GtkTreeModel *self, GtkTreeIter *iter, main_window *widgets); gboolean yon_os_component_insert(struct row_data *row_input); -void *yon_os_components_setup(main_window *widgets); gboolean yon_spinner_switch_off(GtkSpinner *target); // void on_advanced_added(GtkWidget *, char *, main_window *); // void on_advanced_new(GtkWidget *, main_window *);