Applications
/
ubl-settings-repomanager
10
0
Fork 1
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

Command fix for deprecated keys

Browse Source
pull/7/head
Ivan Dmitrievich Yartsev 2 years ago
parent 4a849a874f
commit 6e4381f33e
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File

18
source/ubl-settings-repomanager.c
Unescape View File

@ -336,9 +336,6 @@ void on_tree_selection_changed(GtkWidget *self,main_window *widgets){
gtk_widget_set_sensitive(widgets->DeleteButton,1);
gtk_widget_set_sensitive(widgets->AddPackageButton,1);
gtk_widget_set_sensitive(widgets->RemovePackageButton,0);
// if (main_config.lock_root==1){
// gtk_widget_set_sensitive(widgets->SignButton,0);
// }
} else if (depth == 1){
gtk_widget_set_sensitive(widgets->CreateButton,1);
gtk_widget_set_sensitive(widgets->LoadFromLocalButton,1);
@ -346,9 +343,6 @@ void on_tree_selection_changed(GtkWidget *self,main_window *widgets){
gtk_widget_set_sensitive(widgets->DeleteButton,0);
gtk_widget_set_sensitive(widgets->AddPackageButton,1);
gtk_widget_set_sensitive(widgets->RemovePackageButton,1);
// if (main_config.lock_root==1){
// gtk_widget_set_sensitive(widgets->SignButton,0);
// }
}
}
}
@ -362,7 +356,6 @@ void on_repo_add_new(GtkWidget *self, dictionary *dict){
char *name=NULL;
name = window->path;
// window->path = yon_char_divide(yon_char_new(name),yon_char_find_last(window->path, '/'));
if (!name||strcmp(name,"")!=0){
GtkTreeIter *iter = yon_repo_append(widgets, name, YON_REPO_LINE_REPO_TYPE);
gtk_tree_store_set(main_config.tree_store,iter,0,folder_added,2,window->path,3,1,-1);
@ -445,6 +438,7 @@ void on_repo_sign(GtkWidget *self, main_window *widgets){
config_str ret = yon_config_load(get_gpg_keys_command,&size);
for (int i=0;i<size;i++){
ret[i] = yon_char_divide_search(ret[i],"\n",-1);
if (!strstr(ret[i],"]")&&!strstr(ret[i],"["))
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(window->KeysCombo),ret[i]);
}
dictionary *dict = yon_dictionary_new_with_data("",widgets);
@ -566,7 +560,6 @@ void yon_repo_remove_package(main_window *widgets){
if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->RepoTree)),&model,&iter)){
GtkTreeIter iterparent;
if (gtk_tree_model_iter_parent(model,&iterparent,&iter)){
// gtk_tree_store_remove(main_config.tree_store,&iter);
int status = 0;
gtk_tree_model_get(GTK_TREE_MODEL(main_config.tree_store),&iter,3,&status,-1);
if (status != 1){
@ -691,9 +684,6 @@ main_window *setup_window(){
widgets->LoadLocalMenuItem = yon_gtk_builder_get_widget(builder,"LoadLocalConfigurationMenuItem");
widgets->LeftBox = yon_gtk_builder_get_widget(builder,"HeaderLeftBox");
// widgets->DocumentationMenuItem = yon_gtk_builder_get_widget(builder,"DocumentationMenuItem");
// widgets->AboutMenuItem = yon_gtk_builder_get_widget(builder,"AboutMenuItem");
widgets->GeneralTabLabel = yon_gtk_builder_get_widget(builder,"GeneralTabLabel");
widgets->PublicationTabLabel = yon_gtk_builder_get_widget(builder,"PublicationTabLabel");
widgets->CreateButton = yon_gtk_builder_get_widget(builder,"CreateButton");
@ -733,8 +723,8 @@ main_window *setup_window(){
widgets->SaveButton = yon_gtk_builder_get_widget(builder,"mainSaveButton");
main_config.tree_store = GTK_TREE_STORE(gtk_builder_get_object(builder,"RepoStore"));
widgets->DocumentationMenuItem = yon_ubl_menu_item_documentation_new(DOCUMENTATION_LABEL); // yon_gtk_builder_get_widget(builder,"DocumentationMenuItem");
widgets->AboutMenuItem = yon_ubl_menu_item_about_new(ABOUT_LABEL); // yon_gtk_builder_get_widget(builder,"AboutMenuItem");
widgets->DocumentationMenuItem = yon_ubl_menu_item_documentation_new(DOCUMENTATION_LABEL);
widgets->AboutMenuItem = yon_ubl_menu_item_about_new(ABOUT_LABEL);
gtk_window_set_title(GTK_WINDOW(widgets->Window),TITLE_LABEL);
@ -878,8 +868,6 @@ int main(int argc, char *argv[]){
gtk_paned_set_position(GTK_PANED(widgets->MovePaned),400);
on_load();
// if (getuid()!=0)
// yon_ubl_status_box_render(ROOT_WARNING_LABEL,BACKGROUND_IMAGE_FAIL_TYPE);
GtkCssProvider *css=gtk_css_provider_new();
gtk_css_provider_load_from_resource(css,CssPath);
gtk_style_context_add_provider_for_screen(gdk_screen_get_default(),

2
source/ubl-settings-repomanager.h
Unescape View File

@ -42,7 +42,7 @@ typedef char* string;
#define get_package_info_command(filename) yon_char_unite("LC_ALL=EN pacman -Q --info --file ",filename," ||sed -e 's/ */ /g' -e 's/ : /:/g' -e 's/\\n/ /g'",NULL)
#define get_saved_package_info_command(path,filename) yon_char_unite("LC_ALL=EN pacman -Q --info --file $(find \"",path,"\" -name *",filename,"* -not -name *.sig |head -n 1)|sed -e 's/ */ /g' -e 's/ : /:/g' -e 's/\\n/ /g'",NULL)
#define get_gpg_keys_command yon_char_unite(yon_ubl_check_root()==1 ? yon_char_unite("su - ",yon_ubl_root_user_get()," -c \"gpg --list-signatures\"",NULL):"gpg --list-signatures"," | grep '^sig 3' |grep -Ev \"[|]\" | cut -d' ' -f10,11,13- | sort -u |sed -e 's/[0-9]*-[0-9]*-[0-9]* //g'",NULL)
#define get_gpg_keys_command yon_char_unite(yon_ubl_check_root()==1 ? yon_char_unite("su - ",yon_ubl_root_user_get()," -c \"gpg --list-signatures\"",NULL):"gpg --list-signatures"," | grep '^sig 3' | cut -d' ' -f10,11,13- | sort -u |sed -e 's/[0-9]*-[0-9]*-[0-9]* //g'",NULL)
string version_application;

Write Preview
Loading…
Cancel
Save