Merge pull request 'Removed config_str compare function' (#194) from YanTheKaller/ubl-settings-datetime:master into master

Reviewed-on: #194

source/ubl-settings-datetime.c

@@ -4,20 +4,6 @@ config main_config;
 
 // functions
 
-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;
-
-    if ((strstr(_(*str_a),"-")||strstr(_(*str_a),"+"))&&(strstr(_(*str_b),"-")||strstr(_(*str_b),"+"))){
-        int a = atoi(_(*str_a)+3);
-        int b = atoi(_(*str_b)+3);
-        if (a>b) return 1;
-        else if (b>a) return -1;
-        else return 0;
-    }
-    return strcoll(_(*str_a), _(*str_b));
-}
-
 config_str yon_char_parsed_localize(config_str parsed, int size){
     config_str new_parsed = yon_char_parsed_copy(parsed,size);
     for (int i=0;i<size;i++){
@@ -30,7 +16,7 @@ config_str yon_char_parsed_localize(config_str parsed, int size){
 
 config_str yon_char_parsed_sort(config_str parsed, int size){
     config_str new_parsed = yon_char_parsed_copy(parsed,size);
-    qsort(new_parsed,size,sizeof(char*),yon_char_parsed_compare);
+    qsort(new_parsed,size,sizeof(char*),(__compar_fn_t)yon_char_parsed_compare);
     return new_parsed;
 }
 
@@ -746,9 +732,7 @@ int main(int argc, char *argv[]){
     yon_root_button_setup((template_main_window*)widgets,argv,argc);
     yon_main_window_complete((main_window**)&widgets);
     if (getuid()!=0){
-        textdomain(template_ui_LocaleName);
+        yon_ubl_status_box_render(yon_char_get_localised_from_lib(ROOT_WARNING_LABEL),BACKGROUND_IMAGE_FAIL_TYPE);
-        yon_ubl_status_box_render(ROOT_WARNING_LABEL,BACKGROUND_IMAGE_FAIL_TYPE);
-        textdomain(LocaleName);
     }
     gtk_main();
     return 0;

source/ubl-settings-datetime.h

@@ -154,7 +154,6 @@ void on_date_cancel(GtkWidget *, main_window *widgets);
 config_str yon_char_parsed_localize(config_str parsed, int size);
 config_str yon_char_parsed_sort(config_str parsed, int size);
 
-int yon_char_parsed_compare(const void *a, const void *b);
 void on_save_done(main_window *widgets, config_str output, int size);
 
 void on_date_format_changed(GtkWidget *, main_window *widgets);