diff --git a/source/ubl-settings-update-ftp.c b/source/ubl-settings-update-ftp.c index 1fb6b09..411ac9f 100644 --- a/source/ubl-settings-update-ftp.c +++ b/source/ubl-settings-update-ftp.c @@ -174,7 +174,7 @@ void on_ftp_remove(GtkWidget *,main_window *widgets){ dialog_confirmation_data *data = yon_confirmation_dialog_data_new(); data->title = REMOVE_FTP_TITLE_LABEL; data->action_text = REMOVE_REPO_WARNING_LABEL; - if (yon_confirmation_dialog_call(widgets->Window,data)!=GTK_RESPONSE_CANCEL){ + if (yon_confirmation_dialog_call(widgets->Window,data)==GTK_RESPONSE_ACCEPT){ char *storage; char *repos; gtk_tree_model_get(model,&iter,1,&storage,2,&repos,-1); diff --git a/source/ubl-settings-update-save.c b/source/ubl-settings-update-save.c index a16dedf..9e261b2 100644 --- a/source/ubl-settings-update-save.c +++ b/source/ubl-settings-update-save.c @@ -27,21 +27,21 @@ void on_config_custom_save(GtkWidget *, main_window *){ void on_config_local_load(GtkWidget *,main_window *widgets){ yon_load_proceed(YON_CONFIG_LOCAL); - yon_ubl_status_box_render(yon_char_get_localised_from_lib(LOCAL_LOAD_SUCCESS_LABEL),BACKGROUND_IMAGE_SUCCESS_TYPE); + yon_ubl_status_box_render(LOCAL_LOAD_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE); main_config.load_mode=YON_CONFIG_LOCAL; yon_interface_update(widgets); } void on_config_global_load(GtkWidget *,main_window *widgets){ yon_load_proceed(YON_CONFIG_GLOBAL); - yon_ubl_status_box_render(yon_char_get_localised_from_lib(GLOBAL_LOAD_SUCCESS_LABEL),BACKGROUND_IMAGE_SUCCESS_TYPE); + yon_ubl_status_box_render(GLOBAL_LOAD_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE); main_config.load_mode=YON_CONFIG_GLOBAL; yon_interface_update(widgets); } void on_config_custom_load(GtkWidget *,main_window *widgets){ yon_load_proceed(YON_CONFIG_CUSTOM); - yon_ubl_status_box_render(yon_char_get_localised_from_lib(LOCAL_LOAD_SUCCESS_LABEL),BACKGROUND_IMAGE_SUCCESS_TYPE); + yon_ubl_status_box_render(LOCAL_LOAD_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE); main_config.load_mode=YON_CONFIG_CUSTOM; yon_interface_update(widgets); } @@ -60,9 +60,7 @@ void yon_load_proceed(YON_CONFIG_TYPE type){ yon_config_load_config(type,config_get_command("system"),NULL); } else if (type==YON_CONFIG_CUSTOM){ char *path=""; - textdomain(template_ui_LocaleName); GtkWidget *dialog = gtk_file_chooser_dialog_new(template_app_information.app_title,NULL,GTK_FILE_CHOOSER_ACTION_SAVE,CANCEL_LABEL,GTK_RESPONSE_CANCEL,OPEN_LABEL,GTK_RESPONSE_ACCEPT,NULL); - textdomain(LocaleName); gtk_window_set_icon_name(GTK_WINDOW(dialog),"com.ublinux.ubl-settings-services"); gtk_window_set_title(GTK_WINDOW(dialog),TITLE_LABEL); GtkFileFilter *filter = gtk_file_filter_new(); diff --git a/source/ubl-settings-update.c b/source/ubl-settings-update.c index b99852f..abff832 100644 --- a/source/ubl-settings-update.c +++ b/source/ubl-settings-update.c @@ -11,7 +11,6 @@ void on_save_done(main_window *, config_str output, int size){ free(final_output); } yon_char_parsed_free(output,size); - textdomain(template_ui_LocaleName); switch (main_config.save_config){ case 0: yon_ubl_status_box_render(GLOBAL_SAVE_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE); @@ -23,7 +22,6 @@ void on_save_done(main_window *, config_str output, int size){ yon_ubl_status_box_render(GLOBAL_LOCAL_SAVE_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE); break; } - textdomain(LocaleName); // yon_config_set_ignore(REPOSITORY_parameter); } @@ -1495,7 +1493,7 @@ int main(int argc, char *argv[]){ setlocale(LC_ALL, ""); textdomain (LocaleName); config_init(); - + yon_ubl_connect_config((_template_config*)&main_config); yon_ubl_window_init(TITLE_LABEL,TITLE_INFO_LABEL,LocaleName,CssPath,LocaleName,version_application,WIKI_LINK); config_str unfound = NULL; @@ -1509,9 +1507,7 @@ int main(int argc, char *argv[]){ char *path = yon_char_unite(yon_ubl_user_get_home_directory(),"/.config/",LocaleName,"/",LocaleName,".conf",NULL); yon_window_config_load(path); if (getuid()!=0){ - textdomain(template_ui_LocaleName); yon_ubl_status_box_render(ROOT_WARNING_LABEL,BACKGROUND_IMAGE_FAIL_TYPE); - textdomain(LocaleName); } gtk_main(); return 0; diff --git a/ubl-settings-update-ftp-publication.glade b/ubl-settings-update-ftp-publication.glade index e870698..7ccf937 100644 --- a/ubl-settings-update-ftp-publication.glade +++ b/ubl-settings-update-ftp-publication.glade @@ -13,7 +13,7 @@ 65535 - 8080 + 21 1 10