Fixed double service names

pull/93/head
parent 63c3eadac3
commit 93efb93f78

@ -1450,12 +1450,17 @@ void* yon_interface_update(main_window *widgets){
parsed[0]=yon_char_replace(name_temp,"\18","\\\\"); parsed[0]=yon_char_replace(name_temp,"\18","\\\\");
if (name_temp!=parsed[0]) free(name_temp); if (name_temp!=parsed[0]) free(name_temp);
if (parsed){ if (parsed){
int names_size;
config_str names_parsed = yon_char_parse(parsed[0],&names_size," ");
for (int j=0;j<names_size;j++){
int enabled = !strcmp(parsed[5],"enabled"); int enabled = !strcmp(parsed[5],"enabled");
int loaded = !strcmp(parsed[1],"loaded"); int loaded = !strcmp(parsed[1],"loaded");
int active = !strcmp(parsed[2],"active"); int active = !strcmp(parsed[2],"active");
enum YON_UNIT_TYPE type = yon_get_unit_type(parsed[0]); enum YON_UNIT_TYPE type = yon_get_unit_type(names_parsed[j]);
gtk_list_store_append(widgets->SystemList,&iter); gtk_list_store_append(widgets->SystemList,&iter);
gtk_list_store_set(widgets->SystemList,&iter,3,enabled,4,active,5,parsed[0],6,parsed[4],7,type,8,active,9,loaded,11,_(parsed[3]),13,parsed[3],-1); gtk_list_store_set(widgets->SystemList,&iter,3,enabled,4,active,5,names_parsed[j],6,parsed[4],7,type,8,active,9,loaded,11,_(parsed[3]),13,parsed[3],-1);
}
yon_char_parsed_free(names_parsed,names_size);
} }
} }
@ -1502,12 +1507,17 @@ void* yon_interface_update(main_window *widgets){
int size; int size;
config_str parsed = yon_char_parse(user_services[i],&size,";"); config_str parsed = yon_char_parse(user_services[i],&size,";");
if (parsed){ if (parsed){
int names_size;
config_str names_parsed = yon_char_parse(parsed[0],&names_size," ");
for (int j=0;j<names_size;j++){
int enabled = !strcmp(parsed[5],"enabled"); int enabled = !strcmp(parsed[5],"enabled");
int loaded = !strcmp(parsed[1],"loaded"); int loaded = !strcmp(parsed[1],"loaded");
int active = !strcmp(parsed[2],"active"); int active = !strcmp(parsed[2],"active");
enum YON_UNIT_TYPE type = yon_get_unit_type(parsed[0]); enum YON_UNIT_TYPE type = yon_get_unit_type(names_parsed[j]);
gtk_list_store_append(widgets->UserList,&iter); gtk_list_store_append(widgets->UserList,&iter);
gtk_list_store_set(widgets->UserList,&iter,3,enabled,4,active,5,parsed[0],6,parsed[4],7,type,8,active,9,loaded,11,_(parsed[3]),13,parsed[3],-1); gtk_list_store_set(widgets->UserList,&iter,3,enabled,4,active,5,names_parsed[j],6,parsed[4],7,type,8,active,9,loaded,11,_(parsed[3]),13,parsed[3],-1);
}
yon_char_parsed_free(names_parsed,names_size);
} }
} }

Loading…
Cancel
Save