crypt-key.csv

@@ -3,5 +3,3 @@ RSA;RSA/RSA;RSA
 DSA ElGamal;DSA/ELG;ELG
 DSA (sign only);DSA;DSA
 RSA (sign only);RSA;RSA
-GOST R 34.10-2012;GOST3410-2012;GOST3410-2012
-GOST R 34.10-2001;GOST3410-2001;GOST3410-2001

source/CMakeLists.txt

@@ -12,10 +12,12 @@ pkg_check_modules(VTE291 REQUIRED vte-2.91)
 include_directories(${VTE291_INCLUDE_DIRS})
 link_directories(${VTE291_LIBRARY_DIRS})
 add_definitions(${VTE291_CFLAGS_OTHER})
+add_definitions(-DVTE_INCLUDE)
 
 find_library(WEBKIT_LIBRARIES_FOUND webkit2gtk-4.0 webkit2gtk-web-extension-4.0)
 
 if(WEBKIT_LIBRARIES_FOUND)
+        add_definitions(-DWEBKIT_INCLUDE)
         PKG_CHECK_MODULES(WEBKIT REQUIRED webkit2gtk-4.0 webkit2gtk-web-extension-4.0)
         include_directories(${WEBKIT_INCLUDE_DIRS})
         link_directories(${WEBKIT_LIBRARY_DIRS})

source/ubl-settings-repomanager-storage-window.c

@@ -200,7 +200,7 @@ void yon_storage_config_update(storage_config_window *window){
         storage_struct *storage = g_hash_table_lookup(window->storages_copy,active);
         int size;
             config_str repo_keys = (config_str)g_hash_table_get_keys_as_array(storage->repos,&size);
-            qsort(repo_keys,size,sizeof(char*),yon_char_parsed_compare);
+            qsort(repo_keys,size,sizeof(char*),(__compar_fn_t)yon_char_parsed_compare);
         for (int i = 0;i<size;i++){
             repo_struct *repos = g_hash_table_lookup(storage->repos,repo_keys[i]);
         if (repos){
@@ -245,12 +245,6 @@ void yon_storage_remove(char *key, storage_struct *storage,void*){
     yon_storage_sturct_free_full(storage);
 }
 
-int yon_char_parsed_compare(const void *a, const void *b){
-    const config_str str_a = (const config_str)a;
-    const config_str str_b = (const config_str)b;
-
-    return strcmp(*str_a,*str_b);
-}
 
 
 void on_storage_accept(GtkWidget *self, dictionary *dict){
@@ -268,7 +262,7 @@ void on_storage_accept(GtkWidget *self, dictionary *dict){
             int repos_size;
             config_str repos = yon_char_parse(config(keys[i]),&repos_size,",");
             if (repos_size){
-                qsort(repos,repos_size,sizeof(char*),yon_char_parsed_compare);
+                qsort(repos,repos_size,sizeof(char*),(__compar_fn_t)yon_char_parsed_compare);
                 char *repos_string = yon_char_parsed_to_string(repos,repos_size,",");
                 int config_status = yon_config_get_status(keys[i]);
                 yon_config_set(keys[i],repos_string);
@@ -327,7 +321,7 @@ storage_config_window *yon_storage_config_window_new(){
             repo_struct *repo = (repo_struct*)iter2->data;
             yon_char_parsed_add_or_create_if_exists(paths,&repos_size,repo->path);
         }
-        qsort(paths,repos_size,sizeof(char*),yon_char_parsed_compare);
+        qsort(paths,repos_size,sizeof(char*),(__compar_fn_t)yon_char_parsed_compare);
         yon_config_register(storage->path,STORAGE_command,yon_char_parsed_to_string(paths,repos_size,","));
     }
     g_signal_connect(G_OBJECT(window->CancelButton),"clicked",G_CALLBACK(on_subwindow_close),NULL);

source/ubl-settings-repomanager.c

@@ -67,7 +67,7 @@ int yon_storages_load(main_window *widgets){
             if (yon_char_is_empty(repos)) continue;
             int repos_size;
             config_str repo_names = yon_char_parse(repos,&repos_size,",");
-            qsort(repo_names,repos_size,sizeof(char*),yon_char_parsed_compare);
+            qsort(repo_names,repos_size,sizeof(char*),(__compar_fn_t)yon_char_parsed_compare);
             yon_storage_fill_repos(storage,repo_names,repos_size);
             yon_char_parsed_free(repo_names,repos_size);
         }
@@ -188,7 +188,7 @@ void on_main_tree_selection_changed(GtkWidget *, main_window *widgets){
         if (data_type!=YON_REPO_DATA_ARCH){
             int size;
             config_str repos = (config_str)g_hash_table_get_keys_as_array(data_struct->repos,&size);
-            qsort(repos,size,sizeof(char*),yon_char_parsed_compare);
+            qsort(repos,size,sizeof(char*),(__compar_fn_t)yon_char_parsed_compare);
             GtkTreeIter iter;
             for (int i=0;i<size;i++){
                 gtk_list_store_append(widgets->RepoFileList,&iter);

source/ubl-settings-repomanager.h

@@ -12,7 +12,7 @@
 #include <libublsettings.h>
 #include <libublsettings-gtk3.h>
 #include <libublsettingsui-gtk3.h>
-#ifdef WEBKIT_FOUND
+#ifdef WEBKIT_INCLUDE
     #include <webkit2/webkit2.h>
 #endif 
 #include "ubl-strings.h"
@@ -419,4 +419,3 @@ void on_move_window_tree_changed(GtkWidget *self, repo_add_window *window);
 void on_move_check_fill(GtkWidget *self, repo_add_window *window);
 void yon_repo_creation_set_sensitive_from_combo_box(GtkComboBox *toggle, GtkWidget *target);
 int yon_sort_func(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user_data);
-int yon_char_parsed_compare(const void *a, const void *b);