Fixed key encryption combo box #126

Merged
asmeron merged 3 commits from YanTheKaller/ubl-settings-repomanager:master into master 3 months ago

@ -12,4 +12,7 @@
<gresource prefix="/com/ublinux/css">
<file>ubl-settings-repomanager.css</file>
</gresource>
<gresource prefix="/com/ublinux/csv">
<file>crypt-key.csv</file>
</gresource>
</gresources>

@ -38,6 +38,7 @@ set(DEPENDFILES
../ubl-settings-repomanager-repo-block.glade
../gresource.xml
../ubl-settings-repomanager.css
../crypt-key.csv
)
file(COPY ${DEPENDFILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})

@ -95,7 +95,7 @@ key_creation_window *yon_key_creation_window_new(){
g_signal_connect(G_OBJECT(window->AddButton),"clicked",G_CALLBACK(on_key_generate_accept),window);
int size;
config_str encription_keys = yon_file_open(key_encription_path,&size);
config_str encription_keys = yon_resource_open_file(key_encription_path,&size);
window->expire_time=0;
for (int i=1;i<size;i++){

@ -444,6 +444,7 @@ int main(int argc, char *argv[]){
yon_ubl_setup_arguments(argc,argv,&unfound,&size,NULL);
gtk_init(&argc,&argv);
template_main_window *widgets = yon_ubl_window_setup();
yon_window_remove_exit_config_check(widgets);
gtk_widget_hide(gtk_menu_get_attach_widget(GTK_MENU(gtk_widget_get_parent(widgets->SaveMenuItem))));
gtk_widget_hide(gtk_menu_get_attach_widget(GTK_MENU(gtk_widget_get_parent(widgets->LoadGlobalMenuItem))));
widgets = (template_main_window*)yon_main_window_complete((main_window*)widgets);

@ -55,7 +55,7 @@
#define package_linked_icon "com.ublinux.ubl-settings-repomanager.package-linked-symbolic"
#define package_unlinked_icon "com.ublinux.ubl-settings-repomanager.package-unlinked-symbolic"
#define key_encription_path "/usr/share/ubl-settings-repomanager/csv/crypt-key.csv"
#define key_encription_path "resource:///com/ublinux/csv/crypt-key.csv"
typedef char* string;
#define create_storage_command(path,name,sign) yon_char_unite("repo-manager add --only-db --force-replace -r '",name,"' -d '", path,"'",!yon_char_is_empty(sign)?" -S ":NULL,sign,NULL)

Loading…
Cancel
Save