diff --git a/source/ubl-settings-kernel.c b/source/ubl-settings-kernel.c index ea75fbb..a22a59e 100644 --- a/source/ubl-settings-kernel.c +++ b/source/ubl-settings-kernel.c @@ -766,7 +766,6 @@ void on_module_install_clicked(GtkWidget *self,dictionary *dict){ kernels_tab *tab = yon_dictionary_get_data(dict->first->next,kernels_tab*); char *action_text = NULL; dialog_window *window = yon_dialog_window_new(); - yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window); g_signal_connect(G_OBJECT(window->AcceptButton),"clicked",G_CALLBACK(on_module_install_accept),dict); if (self == tab->update_module_button){ @@ -806,7 +805,7 @@ void on_module_install_clicked(GtkWidget *self,dictionary *dict){ int cur_size; config_str parsed = yon_char_parse(additions[j],&cur_size,";"); if (!strcmp(parsed[1],tab->module_requirements[i])) - gtk_list_store_set(window->liststore1,&iter,1,parsed[1],2,parsed[3],-1); + gtk_list_store_set(window->liststore1,&iter,1,parsed[1],2,parsed[3],4,1,-1); yon_char_parsed_free(parsed,cur_size); } } @@ -823,11 +822,9 @@ void on_package_install_clicked(GtkWidget *self,dictionary *dict){ if (self == tab->update_module_button){ if (!gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))){ - yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),self==tab->update_package_button?UPDATE_PACKAGE_TITLE_LABEL:INSTALL_PACKAGE_TITLE_LABEL,icon_path,"dialog"); action_text = KERNEL_PACKAGE_UPDATE_CONFIRMATION_LABEL(tab->name); gtk_label_set_text(GTK_LABEL(window->HeadLabel),UPDATE_PACKAGE_TITLE_LABEL); } else { - yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),self==tab->update_package_button?UPDATE_PACKAGE_TITLE_LABEL:INSTALL_PACKAGE_TITLE_LABEL,icon_path,"additions_dialog"); action_text = ADDITION_PACKAGE_UPDATE_CONFIRMATION_LABEL(tab->name); gtk_label_set_text(GTK_LABEL(window->HeadLabel),UPDATE_ADDITION_PACKAGE_TITLE_LABEL); } @@ -846,9 +843,11 @@ void on_package_install_clicked(GtkWidget *self,dictionary *dict){ yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window); if (gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))){ + yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),self==tab->update_package_button?UPDATE_PACKAGE_TITLE_LABEL:INSTALL_PACKAGE_TITLE_LABEL,icon_path,"additions_dialog"); gtk_widget_hide(window->DependencesFrame); gtk_box_set_child_packing(GTK_BOX(gtk_widget_get_parent(window->DependencesFrame)),gtk_widget_get_parent(gtk_widget_get_parent(window->TopicLabel)),1,1,0,GTK_PACK_START); } else { + yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),self==tab->update_package_button?UPDATE_PACKAGE_TITLE_LABEL:INSTALL_PACKAGE_TITLE_LABEL,icon_path,"dialog"); int size; config_str additions = yon_resource_open_file(kernels_addon_path,&size); GtkTreeIter iter; @@ -861,7 +860,7 @@ void on_package_install_clicked(GtkWidget *self,dictionary *dict){ gtk_list_store_set(window->liststore1,&iter,2,parsed[3],-1); yon_char_parsed_free(parsed,cur_size); } - gtk_list_store_set(window->liststore1,&iter,0,1,1,tab->package_requirements[i],-1); + gtk_list_store_set(window->liststore1,&iter,0,1,1,tab->package_requirements[i],4,1,-1); } yon_char_parsed_free(additions,size); @@ -931,7 +930,7 @@ void on_module_remove_clicked(GtkWidget *self,dictionary *dict){ config_str additions = yon_resource_open_file(kernels_addon_path,&size); GtkTreeIter itar; char *target_depends = yon_package_dependent_get(tab->module); - if (target_depends&&strcmp(target_depends,tab->package)){ + if (target_depends&&strcmp(target_depends,tab->package)&&strstr(target_depends," ")){ free(yon_char_divide_search(target_depends," ",-1)); gtk_list_store_append(window->liststore1,&itar); gtk_list_store_set(window->liststore1,&itar,0,1,1,target_depends,-1); diff --git a/ubl-settings-kernel-dialog.glade b/ubl-settings-kernel-dialog.glade index 753b4a1..7dea458 100644 --- a/ubl-settings-kernel-dialog.glade +++ b/ubl-settings-kernel-dialog.glade @@ -13,6 +13,8 @@ + + @@ -116,6 +118,7 @@ + 4 0