From 349f1d7559b6cc5fbf20662421f1c356ee6c2faf Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Mon, 28 Jul 2025 15:17:07 +0600
Subject: [PATCH 1/3] Fixed key encryption combo box

---
 gresource.xml                         | 3 +++
 source/CMakeLists.txt                 | 1 +
 source/ubl-settings-repomanager-key.c | 2 +-
 source/ubl-settings-repomanager.h     | 2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/gresource.xml b/gresource.xml
index 9c5c8bb..027019c 100644
--- a/gresource.xml
+++ b/gresource.xml
@@ -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>
\ No newline at end of file
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index c690837..aafb4c3 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -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})
diff --git a/source/ubl-settings-repomanager-key.c b/source/ubl-settings-repomanager-key.c
index 01dfd76..b9510bb 100644
--- a/source/ubl-settings-repomanager-key.c
+++ b/source/ubl-settings-repomanager-key.c
@@ -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++){
diff --git a/source/ubl-settings-repomanager.h b/source/ubl-settings-repomanager.h
index 272722f..01b286c 100644
--- a/source/ubl-settings-repomanager.h
+++ b/source/ubl-settings-repomanager.h
@@ -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)
-- 
2.35.1


From dc6c47dabbf1beed60638d16c67af36caaf02f3b Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Tue, 29 Jul 2025 09:43:52 +0600
Subject: [PATCH 2/3] Removed exit config checking

---
 source/ubl-settings-repomanager.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/source/ubl-settings-repomanager.c b/source/ubl-settings-repomanager.c
index cf690b1..81f5bc7 100644
--- a/source/ubl-settings-repomanager.c
+++ b/source/ubl-settings-repomanager.c
@@ -425,6 +425,7 @@ main_window *yon_main_window_complete(main_window *widgets){
         gtk_window_set_title(GTK_WINDOW(widgets->Window),TITLE_LABEL);
 
         gtk_tree_view_set_search_entry(GTK_TREE_VIEW(widgets->RepoFileTree),GTK_ENTRY(widgets->SearchEntry));
+        yon_window_remove_exit_config_check((template_main_window*)widgets);
 
         /* Widget registration for config monitoring | Регистрация виджетов для мониторинга конфига */
         /* Localisation | Локализация */
-- 
2.35.1


From 82a42441bcaa0aeae4008d2612edf699814d2c93 Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Tue, 29 Jul 2025 10:22:44 +0600
Subject: [PATCH 3/3] Fixed exit config check

---
 source/ubl-settings-repomanager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/ubl-settings-repomanager.c b/source/ubl-settings-repomanager.c
index 81f5bc7..f6f4d0f 100644
--- a/source/ubl-settings-repomanager.c
+++ b/source/ubl-settings-repomanager.c
@@ -425,7 +425,6 @@ main_window *yon_main_window_complete(main_window *widgets){
         gtk_window_set_title(GTK_WINDOW(widgets->Window),TITLE_LABEL);
 
         gtk_tree_view_set_search_entry(GTK_TREE_VIEW(widgets->RepoFileTree),GTK_ENTRY(widgets->SearchEntry));
-        yon_window_remove_exit_config_check((template_main_window*)widgets);
 
         /* Widget registration for config monitoring | Регистрация виджетов для мониторинга конфига */
         /* Localisation | Локализация */
@@ -445,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);
-- 
2.35.1