libublsettings-gtk3 related changes #58

Merged
asmeron merged 2 commits from YanTheKaller/libublsettingsui-gtk3:master into master 1 week ago

@ -32,7 +32,7 @@ config_str yon_apps_get_from_file(char *file,int *final_size){
return final;
}
int yon_apps_get(yon_app_chooser_window *window){
int yon_app_chooser_apps_get(yon_app_chooser_window *window){
window->apps = NULL;
window->apps_size=0;
int merged_size;
@ -204,7 +204,7 @@ yon_app_chooser_window *yon_app_chooser_window_new(int multiple_choise){
}
if (!yon_apps_get(window)) return NULL;
if (!yon_app_chooser_apps_get(window)) return NULL;
if (!yon_app_chooser_convert_apps(window)) return NULL;
yon_tree_store_setup_apps(window);

@ -420,11 +420,12 @@ int yon_ubl_setup_arguments(int argc, char *argv[],config_str *unfound_arguments
{"socket-trd-id", 1,0, 't'},
{"clear-config", 0,0, 'c'},
{"debug", 0,0, 'd'},
{"file", 1, 0, 'f'},
{ NULL, 0, NULL, 0 }
};
config_str unregistered_arguments=NULL;
for (int i=1;i<argc;i++){
int argument=getopt_long(argc,argv,"hVvs:e:t:cd",long_options,&option_index);
int argument=getopt_long(argc,argv,"hVvs:e:t:cdf:",long_options,&option_index);
switch(argument){
case 'h':
show_help=1;
@ -472,11 +473,17 @@ int yon_ubl_setup_arguments(int argc, char *argv[],config_str *unfound_arguments
case 6:
template_config->lock_load_system=1;
break;
case 'f':
template_config->force_ini = yon_char_new(optarg);
template_config->config_load_path = template_config->force_ini;
template_config->config_save_path = template_config->force_ini;
break;
default:
char *unfound = optarg;
yon_char_parsed_add_or_create_if_exists(unregistered_arguments,arguments_size,yon_char_unite(argv[i],!yon_char_is_empty(unfound)?"=":"",!yon_char_is_empty(unfound)?unfound:"",NULL));
}
}
if (arguments_size)yon_char_parsed_add_or_create_if_exists(unregistered_arguments,arguments_size,NULL);
(*unfound_arguments)=unregistered_arguments;
if (show_help&&!template_config->lock_help){
printf("%s\n",HELP_LABEL(additional_options_output));

@ -137,7 +137,10 @@ extern template_app_info template_app_information;
\
int always_open_documentation;\
int debug_mode;\
char *custom_load_path;
char *custom_load_path;\
char *force_ini;\
char *config_load_path;\
char *config_save_path;
typedef struct {
template_config_fields

Loading…
Cancel
Save