From 3eccd37f7c693be96a7ce6e282d4b4053c9c0bf7 Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Thu, 20 Feb 2025 14:44:47 +0600
Subject: [PATCH 1/2] Fixed name conflict

---
 source/ubl-settings-repomanager.c | 8 ++++----
 source/ubl-strings.h              | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/source/ubl-settings-repomanager.c b/source/ubl-settings-repomanager.c
index ec79ba4..3ab87ad 100644
--- a/source/ubl-settings-repomanager.c
+++ b/source/ubl-settings-repomanager.c
@@ -129,7 +129,7 @@ void on_file_chooser_file_activate(GtkFileChooser *self, repo_add_window *window
     gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(self)));
 }
 
-file_chooser_window *yon_file_chooser_window_new(){
+file_chooser_window *yon_file_chooser_new(){
     file_chooser_window *window = malloc(sizeof(file_chooser_window));
     GtkBuilder *builder = gtk_builder_new_from_resource(glade_path_filechooser);
     window->Window = yon_gtk_builder_get_widget(builder,"Window");
@@ -634,7 +634,7 @@ void on_add_accept(GtkWidget *self, dictionary *dict){
 }
 
 void on_add_package(GtkWidget *self, repo_add_window *window){
-    file_chooser_window *dialog = yon_file_chooser_window_new();
+    file_chooser_window *dialog = yon_file_chooser_new();
     yon_gtk_window_setup(GTK_WINDOW(dialog->Window),GTK_WINDOW(window->MainWindow),CHOSE_PACKAGES_TITLE_LABEL,icon_path,"filechooserWindow");
     gtk_label_set_text(GTK_LABEL(dialog->HeadLabel),CHOSE_PACKAGES_TITLE_LABEL);
     gtk_widget_show(dialog->Window);
@@ -958,7 +958,7 @@ void on_move_add_accept(GtkWidget *self, dictionary *dict){
 
 void on_move_add_package(GtkWidget *self, repo_add_window *window){
     if (gtk_combo_box_get_active(GTK_COMBO_BOX(window->MoveTargetArchEntry))>-1&&gtk_combo_box_get_active(GTK_COMBO_BOX(window->MoveSourceStorageEntry))>-1){
-        file_chooser_window *dialog = yon_file_chooser_window_new();
+        file_chooser_window *dialog = yon_file_chooser_new();
         yon_gtk_window_setup(GTK_WINDOW(dialog->Window),GTK_WINDOW(window->MainWindow),CHOSE_PACKAGES_TITLE_LABEL,icon_path,"ChooseMoveFileChooserWindow");
         gtk_label_set_text(GTK_LABEL(dialog->HeadLabel),CHOSE_PACKAGES_TITLE_LABEL);
         GtkFileFilter *filter = gtk_file_filter_new();
@@ -1130,7 +1130,7 @@ repo_add_window *on_move_clicked(GtkWidget *self, main_window *widgets){
 
 void on_remove_add_package(GtkWidget *self, repo_add_window *window){
     if (gtk_combo_box_get_active(GTK_COMBO_BOX(window->ArchitectureCombo))>-1){
-        file_chooser_window *dialog = yon_file_chooser_window_new();
+        file_chooser_window *dialog = yon_file_chooser_new();
         yon_gtk_window_setup(GTK_WINDOW(dialog->Window),GTK_WINDOW(window->MainWindow),CHOSE_PACKAGES_TITLE_LABEL,icon_path,"ChooseMoveFileChooserWindow");
         gtk_label_set_text(GTK_LABEL(dialog->HeadLabel),CHOSE_PACKAGES_TITLE_LABEL);
         GtkFileFilter *filter = gtk_file_filter_new();
diff --git a/source/ubl-strings.h b/source/ubl-strings.h
index 739457e..5f3c6d2 100644
--- a/source/ubl-strings.h
+++ b/source/ubl-strings.h
@@ -40,7 +40,7 @@
 
 #define LOAD_SUCCESS_LABEL _("Repository data has been loaded successfully")
 
-#define SAVE_SUCCESS_LABEL _("Saving has succeeded")
+#define SAVE_SUCCESSFUL_LABEL _("Saving has succeeded")
 
 #define GENERAL_TAB_LABEL _("General")
 #define PUBLICATION_TAB_LABEL _("Publication")
-- 
2.35.1


From 2349833eea776da59d5c46d1c42ba3b3158e00be Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Fri, 21 Feb 2025 15:25:02 +0600
Subject: [PATCH 2/2] Crash fix

---
 source/ubl-settings-repomanager.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/source/ubl-settings-repomanager.c b/source/ubl-settings-repomanager.c
index 3ab87ad..cb8ab84 100644
--- a/source/ubl-settings-repomanager.c
+++ b/source/ubl-settings-repomanager.c
@@ -117,14 +117,16 @@ void on_file_chooser_entry_changed(GtkEntry *self, file_chooser_window *window){
 void on_file_chooser_file_activate(GtkFileChooser *self, repo_add_window *window){
     GtkTreeIter iter;
     GSList *list = gtk_file_chooser_get_filenames(self);
-    for (int i=0;i<g_slist_length(list);i++){
-        char *path = g_slist_nth_data(list,i);
-        char *filename = yon_char_new(path);
-        free(yon_char_divide(filename,yon_char_find_last(filename,'/')));
-        gtk_list_store_append(window->PackagesList,&iter);
-        gtk_list_store_set(window->PackagesList,&iter,1,filename,2,path,-1);
-        free(filename);
-        g_slist_free(list);
+    if (list){
+        for (int i=0;i<g_slist_length(list);i++){
+            char *path = g_slist_nth_data(list,i);
+            char *filename = yon_char_new(path);
+            free(yon_char_divide(filename,yon_char_find_last(filename,'/')));
+            gtk_list_store_append(window->PackagesList,&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)));
 }
@@ -1530,7 +1532,9 @@ void yon_combo_box_text_set_signs(GtkComboBoxText *target){
     gtk_combo_box_text_append_text(target,DO_NOT_SIGN_LABEL);
     for (int i=0;i<main_config.signs_size;i++){
         char *temp = yon_char_new(main_config.signs[i]);
+        if (strstr(temp,"<"))
         free(yon_char_divide_search(temp,"<",-1));
+        if (strstr(temp,">"))
         yon_char_remove_last_symbol(temp,'>');
         gtk_combo_box_text_append(target,temp,main_config.signs[i]);
         free(temp);
-- 
2.35.1