diff --git a/source/ubinstall-gtk-startup-apps.c b/source/ubinstall-gtk-startup-apps.c index 0a37ec6..d150db4 100644 --- a/source/ubinstall-gtk-startup-apps.c +++ b/source/ubinstall-gtk-startup-apps.c @@ -159,7 +159,6 @@ startup_service_window *yon_startup_app_window_new(){ g_signal_connect(G_OBJECT(window->CancelButton),"clicked",G_CALLBACK(on_subwindow_close),NULL); g_object_set_data(G_OBJECT(window->AcceptButton),"startup_service_window",window); - return window; } diff --git a/source/ubinstall-gtk-startup-services.c b/source/ubinstall-gtk-startup-services.c index 45dbe95..fbc1bd7 100644 --- a/source/ubinstall-gtk-startup-services.c +++ b/source/ubinstall-gtk-startup-services.c @@ -52,16 +52,16 @@ void on_startup_services_remove(GtkWidget *self,main_window *widgets){ void yon_startup_services_setup(main_window *widgets){ GtkTreeIter iter; gtk_list_store_clear(widgets->StartupList); - int size; - config_str services = yon_resource_open_file(services_list_path,&size); - for (int i=1;iStartupList,&iter); - gtk_list_store_set(widgets->StartupList,&iter,0,1,1,parsed[0],2,yon_char_return_if_exist(parsed[1],""),3,yon_char_return_if_exist(_(parsed[2]),""),-1); - } + int size; + config_str services = yon_resource_open_file(services_list_path,&size); + for (int i=1;iStartupList,&iter); + gtk_list_store_set(widgets->StartupList,&iter,0,1,1,parsed[0],2,yon_char_return_if_exist(parsed[1],""),3,yon_char_return_if_exist(_(parsed[2]),""),-1); } + } char *startup = config(SERVICES_ENABLE_parameter); if (!yon_char_is_empty(startup)){ diff --git a/source/ubinstall-gtk-ui-lang.c b/source/ubinstall-gtk-ui-lang.c index 32e61b8..57ffe2b 100644 --- a/source/ubinstall-gtk-ui-lang.c +++ b/source/ubinstall-gtk-ui-lang.c @@ -73,14 +73,14 @@ void yon_startup_language_init(){ } if (size>1&&!yon_char_is_empty(parsed[1])&&strcmp(parsed[1],"(null)\n")){ yon_char_remove_last_symbol(parsed[1],'\n'); - if (strstr(parsed[0],"=")) + if (strstr(parsed[1],"=")) free(yon_char_divide_search(parsed[1],"=",-1)); yon_char_remove_brackets(parsed[1]); yon_config_register(installer_locale_parameter,installer_locale_parameter_command,parsed[1]); } if (size>2&&!yon_char_is_empty(parsed[2])&&strcmp(parsed[2],"(null)\n")){ yon_char_remove_last_symbol(parsed[2],'\n'); - if (strstr(parsed[0],"=")) + if (strstr(parsed[2],"=")) free(yon_char_divide_search(parsed[2],"=",-1)); yon_char_remove_brackets(parsed[2]); yon_config_register(installer_locale_parameter,installer_locale_parameter_command,parsed[2]); diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c index d95c7ac..f61ce03 100644 --- a/source/ubinstall-gtk.c +++ b/source/ubinstall-gtk.c @@ -920,6 +920,7 @@ void yon_main_window_create(main_window *widgets){ } } if (main_config.force_ini){ + while(gtk_events_pending()) gtk_main_iteration(); if (yon_configuration_path_check(main_config.config_save_path)){ GList *box = gtk_container_get_children(GTK_CONTAINER(widgets->ConfigurationModeMenuItem)); GList *children = gtk_container_get_children(GTK_CONTAINER(box->data)); @@ -964,7 +965,7 @@ void *yon_maximize(main_window *widgets){ */ main_window *yon_main_window_complete(){ if (main_config.force_ini){ //Check if config path exists - if (yon_configuration_path_check(main_config.config_save_path)){ + if (!yon_char_is_empty(main_config.config_save_path)){ { main_config.configure_mode=1; } @@ -974,11 +975,6 @@ main_window *yon_main_window_complete(){ widgets = malloc(sizeof(main_window)); memset(widgets,0,sizeof(main_window)); yon_main_window_create(widgets); - - // yon_set_locales_list(widgets); - // yon_main_window_update_locale(widgets); - // // yon_window_config_custom_window_setup(GTK_WINDOW(widgets->MainWindow),"MainWindow"); - return widgets; } diff --git a/source/ubl-strings.h b/source/ubl-strings.h index d90f427..0bd55e2 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -6,7 +6,7 @@ #define ADDITIONAL_ARGS yon_char_unite(\ " --dry-run ",_("Dry run; Installation will not start"),"\n",\ - " --ini ", _("Set ini file for configuration mode"),\ + " --file ", _("Set ini file for configuration mode"),\ NULL) #define KEYBOARD_TITLE_LABEL _("Keyboard layout")