diff --git a/source/ubl-settings-repomanager-add-window.c b/source/ubl-settings-repomanager-add-window.c index dbc17c2..037fe6e 100644 --- a/source/ubl-settings-repomanager-add-window.c +++ b/source/ubl-settings-repomanager-add-window.c @@ -216,7 +216,7 @@ void on_add_package(GtkWidget *self, repo_add_window *window){ gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog->FileChooserWidget),filter); g_signal_connect(G_OBJECT(dialog->CancelButton),"clicked",G_CALLBACK(on_subwindow_close),NULL); g_signal_connect(G_OBJECT(dialog->ChooseButton),"clicked",G_CALLBACK(on_add_accept),dict); - g_signal_connect(G_OBJECT(dialog->FileChooserWidget),"file-activated",G_CALLBACK(on_file_chooser_file_activate),window); + g_signal_connect(G_OBJECT(dialog->FileChooserWidget),"file-activated",G_CALLBACK(on_file_chooser_file_activate),dict); } void on_remove_package(GtkWidget *self, repo_add_window *window){ @@ -296,6 +296,7 @@ void on_add_packages_accept(GtkWidget *self, dictionary *dict){ } yon_debug_output("%s\n",command); if (!system(command)){ + yon_window_config_add_instant_parameter(yon_char_unite(storage,"/",repo,"/",arch,NULL),"package_info",yon_char_parsed_to_string(packages,size,","),YON_TYPE_STRING); gtk_tree_view_set_model(GTK_TREE_VIEW(widgets->ReposTree),NULL); gtk_tree_store_clear(widgets->RepoList); yon_gtk_tree_store_copy_full(window->tree_copy,widgets->RepoList); diff --git a/source/ubl-settings-repomanager.c b/source/ubl-settings-repomanager.c index 9c495b2..bea008e 100644 --- a/source/ubl-settings-repomanager.c +++ b/source/ubl-settings-repomanager.c @@ -114,21 +114,8 @@ void on_file_chooser_entry_changed(GtkEntry *self, file_chooser_window *window){ if (!yon_char_is_empty(text)) free(pattern); } -void on_file_chooser_file_activate(GtkFileChooser *self, repo_add_window *window){ - GtkTreeIter iter; - GSList *list = gtk_file_chooser_get_filenames(self); - if (list){ - for (int i=0;iPackagesList,&iter); - gtk_list_store_set(window->PackagesList,&iter,1,filename,2,path,-1); - free(filename); - } - g_slist_free(list); - } - gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(self))); +void on_file_chooser_file_activate(GtkWidget *self, dictionary *dict){ + on_add_accept(self,dict); } file_chooser_window *yon_file_chooser_new(){ @@ -289,7 +276,7 @@ void on_move_add_package(GtkWidget *self, repo_add_window *window){ g_signal_connect(G_OBJECT(dialog->FileChooserWidget),"current-folder-changed",G_CALLBACK(on_folder_changed),dialog); g_signal_connect(G_OBJECT(dialog->ChooseButton),"clicked",G_CALLBACK(on_move_add_accept),dict); - g_signal_connect(G_OBJECT(dialog->FileChooserWidget),"file-activated",G_CALLBACK(on_file_chooser_file_activate),window); + g_signal_connect(G_OBJECT(dialog->FileChooserWidget),"file-activated",G_CALLBACK(on_file_chooser_file_activate),dict); gtk_widget_show(dialog->Window); } } @@ -464,7 +451,7 @@ void on_remove_add_package(GtkWidget *self, repo_add_window *window){ g_signal_connect(G_OBJECT(dialog->FileChooserWidget),"current-folder-changed",G_CALLBACK(on_folder_changed),dialog); g_signal_connect(G_OBJECT(dialog->ChooseButton),"clicked",G_CALLBACK(on_move_add_accept),dict); - g_signal_connect(G_OBJECT(dialog->FileChooserWidget),"file-activated",G_CALLBACK(on_file_chooser_file_activate),window); + g_signal_connect(G_OBJECT(dialog->FileChooserWidget),"file-activated",G_CALLBACK(on_file_chooser_file_activate),dict); gtk_widget_show(dialog->Window); } } diff --git a/source/ubl-settings-repomanager.h b/source/ubl-settings-repomanager.h index 88edd1d..f4c17a0 100644 --- a/source/ubl-settings-repomanager.h +++ b/source/ubl-settings-repomanager.h @@ -296,7 +296,7 @@ void on_add_target_arch_selection_changed(GtkWidget *target,repo_add_window *win void on_add_target_repo_selection_changed(GtkWidget *target,repo_add_window *window); config_str yon_tree_store_get_all_at_level(GtkTreeStore *target,GtkTreeIter *parent, int *size, int column, int level); gboolean yon_storage_filter_func(GtkTreeModel *model,GtkTreeIter *iter,gpointer data); -void on_file_chooser_file_activate(GtkFileChooser *self, repo_add_window *window); +void on_file_chooser_file_activate(GtkWidget *self, dictionary *dict); file_chooser_window *yon_file_chooser_new(); gboolean yon_storage_filter_func(GtkTreeModel *model,GtkTreeIter *iter,gpointer data); void on_storage_configure_clicked(GtkWidget *self, main_window *widgets);