diff --git a/source/ubl-settings-datetime.c b/source/ubl-settings-datetime.c index 84f7096..93f38a7 100644 --- a/source/ubl-settings-datetime.c +++ b/source/ubl-settings-datetime.c @@ -413,6 +413,7 @@ void on_ntp_sync(GtkWidget *, main_window *widgets){ switch(mode){ case 0: if (main_config.ntp_default){ + gtk_entry_set_placeholder_text(GTK_ENTRY(widgets->NTPEntry),""); gtk_entry_set_text(GTK_ENTRY(widgets->NTPEntry),main_config.ntp_default); } break; @@ -442,10 +443,12 @@ void on_ntp_sync(GtkWidget *, main_window *widgets){ break; case 1: case 5: + gtk_entry_set_placeholder_text(GTK_ENTRY(widgets->NTPEntry),""); gtk_entry_set_text(GTK_ENTRY(widgets->NTPEntry),""); break; case 4: gtk_widget_set_sensitive(widgets->NTPEntry,1); + gtk_entry_set_placeholder_text(GTK_ENTRY(widgets->NTPEntry),""); gtk_entry_set_text(GTK_ENTRY(widgets->NTPEntry),""); break; } @@ -574,27 +577,23 @@ void yon_main_window_complete(main_window **window){ char *time_sync_default = NULL; { { - int size; - config_str parsed = yon_config_load(NTPSERVERS_parameter_command,&size); - if (size&&!yon_char_is_empty(parsed[0])){ - yon_char_remove_last_symbol(parsed[0],'\n'); - free(yon_char_divide_search(parsed[0],"=",-1)); - if (!strcmp(parsed[0],"dhcp")){ + + if (!yon_char_is_empty(main_config.ntp_default)){ + if (!strcmp(main_config.ntp_default,"dhcp")){ ntp_default = DHCP_LABEL; - } else if (!strcmp(parsed[0],"default")){ + } else if (!strcmp(main_config.ntp_default,"default")){ ntp_default = NTP_LABEL; - } else if (!strcmp(parsed[0],"ntp-ru")){ + } else if (!strcmp(main_config.ntp_default,"ntp-ru")){ ntp_default = NTp_RU_LABEL; - } else if (!strcmp(parsed[0],"disable")){ + } else if (!strcmp(main_config.ntp_default,"disable")){ ntp_default = STOPPED_LABEL; - } else if(!strcmp(parsed[0],"stop")) { + } else if(!strcmp(main_config.ntp_default,"stop")) { ntp_default = DISABLED_LABEL; } else { - ntp_default = yon_char_new(parsed[0]); + ntp_default = yon_char_new(main_config.ntp_default); } - yon_char_parsed_free(parsed,size); } } {