From af7cb81e06491fcc20189c3dd80497aa74cee984 Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Thu, 22 May 2025 09:50:37 +0600
Subject: [PATCH] .csv-s are moved to binary file

---
 gresource.xml                 | 4 ++++
 source/CMakeLists.txt         | 2 ++
 source/ubl-settings-logging.c | 4 ++--
 source/ubl-settings-logging.h | 4 ++--
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/gresource.xml b/gresource.xml
index 23b9b6a..e05ccdb 100644
--- a/gresource.xml
+++ b/gresource.xml
@@ -19,4 +19,8 @@
   <gresource prefix="/com/ublinux/images">
     <file>ubl-settings-logging-banner.png</file>
   </gresource>
+  <gresource prefix="/com/ublinux/csv">
+    <file>journals_list.csv</file>
+    <file>logging_services.csv</file>
+  </gresource>
 </gresources>
\ No newline at end of file
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index c71eb86..f92bf0d 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -50,6 +50,8 @@ set(DEPENDFILES
                 ../gresource.xml
                 ../ubl-settings-logging-banner.png
                 ../ubl-settings-logging.css
+                ../journals_list.csv
+                ../logging_services.csv
         )
 
 file(COPY ${DEPENDFILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
diff --git a/source/ubl-settings-logging.c b/source/ubl-settings-logging.c
index 917dd05..5cd3262 100644
--- a/source/ubl-settings-logging.c
+++ b/source/ubl-settings-logging.c
@@ -3093,7 +3093,7 @@ void yon_main_window_complete(template_main_window **window){
         char *cname=NULL;
         char *cparams="";
         GtkTreeIter iter;
-        config_str journals = yon_file_open(journals_list_path,&size);
+        config_str journals = yon_resource_open_file(journals_list_path,&size);
         for (int i=1;i<size;i++){
             int log_size;
             int psize;
@@ -3106,7 +3106,7 @@ void yon_main_window_complete(template_main_window **window){
                 free(sfafa);
             gtk_list_store_set(widgets->list,&iter,0,log[0],1,log[1],2,_(log[2]),3,1,4,psize,-1);
         }
-            config_str services = yon_file_open(services_list_path,&service_size);
+            config_str services = yon_resource_open_file(services_list_path,&service_size);
             for (int i=1;i<service_size;i++){
                 if (services[i][0]!='#'){
                     int log_size;
diff --git a/source/ubl-settings-logging.h b/source/ubl-settings-logging.h
index 9967926..1cbf9bf 100644
--- a/source/ubl-settings-logging.h
+++ b/source/ubl-settings-logging.h
@@ -38,8 +38,8 @@
 #define banner_path "/com/ublinux/images/ubl-settings-logging-banner.png"
 #define CssPath "/com/ublinux/css/ubl-settings-logging.css"
 #define config_path yon_char_unite(yon_ubl_user_get_home_directory(),"/.config/",LocaleName,"/",LocaleName,".conf",NULL)
-#define journals_list_path "/usr/share/ubl-settings-logging/csv/journals_list.csv"
-#define services_list_path "/usr/share/ubl-settings-logging/csv/logging_services.csv"
+#define journals_list_path "resource:///com/ublinux/csv/journals_list.csv"
+#define services_list_path "resource:///com/ublinux/csv/logging_services.csv"
 #define icon_path "com.ublinux.ubl-settings-logging"
 
 #define logrotate_config_command "ls /etc/logrotate.d/ |sed -e 's/  */\\n/g'"