Applications
/
ubl-settings-datetime
8
0
Fork 3
Code Issues 5 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'Fixed crash' (#183) from YanTheKaller/ubl-settings-datetime:master into master

Browse Source 
Reviewed-on: #183
pull/189/head v2.22
Dmitry Razumov 6 months ago
parent ed80d31f51 2f87ad5aa6
commit 8871d9e53f
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File

26
source/ubl-settings-datetime.c
Unescape View File

@ -446,6 +446,7 @@ void on_ntp_sync(GtkWidget *, main_window *widgets){
} }
break; break;
case 2:{ case 2:{
if (!getuid()){
int size; int size;
config_str parsed = yon_config_load(get_ntp_default_command,&size); config_str parsed = yon_config_load(get_ntp_default_command,&size);
if (size&&!yon_char_is_empty(parsed[0])&&strcmp(parsed[0],"(null)\n")){ if (size&&!yon_char_is_empty(parsed[0])&&strcmp(parsed[0],"(null)\n")){
@ -457,8 +458,10 @@ void on_ntp_sync(GtkWidget *, main_window *widgets){
gtk_entry_set_text(GTK_ENTRY(widgets->NTPEntry),""); gtk_entry_set_text(GTK_ENTRY(widgets->NTPEntry),"");
} }
} }
}
break; break;
case 3:{ case 3:{
if (!getuid()){
int size; int size;
config_str parsed = yon_config_load(get_ntp_ru_command,&size); config_str parsed = yon_config_load(get_ntp_ru_command,&size);
if (size&&!yon_char_is_empty(parsed[0])&&strcmp(parsed[0],"(null)\n")){ if (size&&!yon_char_is_empty(parsed[0])&&strcmp(parsed[0],"(null)\n")){
@ -470,6 +473,7 @@ void on_ntp_sync(GtkWidget *, main_window *widgets){
gtk_entry_set_text(GTK_ENTRY(widgets->NTPEntry),""); gtk_entry_set_text(GTK_ENTRY(widgets->NTPEntry),"");
} }
} }
}
break; break;
case 1: case 1:
gtk_entry_set_placeholder_text(GTK_ENTRY(widgets->NTPEntry),"DHCP"); gtk_entry_set_placeholder_text(GTK_ENTRY(widgets->NTPEntry),"DHCP");
@ -537,15 +541,17 @@ void config_init(){
main_config.ntp_default = NULL; main_config.ntp_default = NULL;
char *ntp_command = yon_config_parameter_prepare_command(NTPSERVERS_parameter_raw_command,"default",NULL,NULL); char *ntp_command = yon_config_parameter_prepare_command(NTPSERVERS_parameter_raw_command,"default",NULL,NULL);
int size; if (!getuid()){
config_str parsed = yon_config_load(ntp_command,&size); int size;
if (size>0){ config_str parsed = yon_config_load(ntp_command,&size);
if (strcmp(parsed[0],"(null)\n")){ if (size>0){
yon_char_remove_last_symbol(parsed[0],'\n'); if (strcmp(parsed[0],"(null)\n")){
if (strstr(parsed[0],"[")&&strstr(parsed[0],"]")) yon_char_remove_last_symbol(parsed[0],'\n');
main_config.ntp_default = strstr(parsed[0],"] ")+2; if (strstr(parsed[0],"[")&&strstr(parsed[0],"]"))
else main_config.ntp_default = strstr(parsed[0],"] ")+2;
main_config.ntp_default = parsed[0]; else
main_config.ntp_default = parsed[0];
}
} }
} }
} }
@ -631,7 +637,7 @@ void yon_main_window_complete(main_window **window){
} }
} }
} }
{ if (!getuid()){
int size; int size;
config_str parsed = yon_config_load(HWCLOCK_SYNC_parameter_command,&size); config_str parsed = yon_config_load(HWCLOCK_SYNC_parameter_command,&size);
if (size&&!yon_char_is_empty(parsed[0])&&strcmp(parsed[0],"(null)\n")){ if (size&&!yon_char_is_empty(parsed[0])&&strcmp(parsed[0],"(null)\n")){

Write Preview
Loading…
Cancel
Save