Changed ntp and ntp-ru placeholder text

pull/171/head
parent 2132c21517
commit 26a974ba9a

@ -416,9 +416,31 @@ void on_ntp_sync(GtkWidget *, main_window *widgets){
gtk_entry_set_text(GTK_ENTRY(widgets->NTPEntry),main_config.ntp_default); gtk_entry_set_text(GTK_ENTRY(widgets->NTPEntry),main_config.ntp_default);
} }
break; break;
case 2:{
int 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")){
free(yon_char_divide_search(parsed[0],"=",-1));
yon_char_remove_last_symbol(parsed[0],'\n');
yon_char_remove_brackets(parsed[0]);
gtk_entry_set_placeholder_text(GTK_ENTRY(widgets->NTPEntry),parsed[0]);
yon_char_parsed_free(parsed,size);
}
}
break;
case 3:{
int 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")){
free(yon_char_divide_search(parsed[0],"=",-1));
yon_char_remove_last_symbol(parsed[0],'\n');
yon_char_remove_brackets(parsed[0]);
gtk_entry_set_placeholder_text(GTK_ENTRY(widgets->NTPEntry),parsed[0]);
yon_char_parsed_free(parsed,size);
}
}
break;
case 1: case 1:
case 2:
case 3:
case 5: case 5:
gtk_entry_set_text(GTK_ENTRY(widgets->NTPEntry),""); gtk_entry_set_text(GTK_ENTRY(widgets->NTPEntry),"");
break; break;
@ -548,8 +570,8 @@ void yon_main_window_complete(main_window **window){
g_signal_connect(G_OBJECT(widgets->ZoneCombo),"changed",G_CALLBACK(yon_save_parameters),widgets); g_signal_connect(G_OBJECT(widgets->ZoneCombo),"changed",G_CALLBACK(yon_save_parameters),widgets);
} }
// Initial data loading // Initial data loading
char *ntp_default = NULL; char *ntp_default = NULL;
char *time_sync_default = NULL; char *time_sync_default = NULL;
{ {
{ {
int size; int size;
@ -610,8 +632,6 @@ void yon_main_window_complete(main_window **window){
if (size) yon_char_parsed_free(parsed,size); if (size) yon_char_parsed_free(parsed,size);
gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->RegionCombo),0); gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->RegionCombo),0);
} }
gtk_window_resize(GTK_WINDOW(widgets->Window),100,150); gtk_window_resize(GTK_WINDOW(widgets->Window),100,150);
while(gtk_events_pending()) gtk_main_iteration(); while(gtk_events_pending()) gtk_main_iteration();

@ -37,6 +37,9 @@
#define config_get_global_only_parameters "" #define config_get_global_only_parameters ""
#define config_get_local_only_parameters "" #define config_get_local_only_parameters ""
#define get_ntp_default_command "ubconfig --default get [network] NTPSERVERS_DEFAULT"
#define get_ntp_ru_command "ubconfig --default get [network] NTPSERVERS_RU"
#define NTPSERVERS_parameter "NTPSERVERS" #define NTPSERVERS_parameter "NTPSERVERS"
#define NTPSERVERS_parameter_command "ubconfig --source global get network NTPSERVERS" #define NTPSERVERS_parameter_command "ubconfig --source global get network NTPSERVERS"
#define NTPSERVERS_parameter_raw_command "ubconfig --source global --raw get network NTPSERVERS" #define NTPSERVERS_parameter_raw_command "ubconfig --source global --raw get network NTPSERVERS"

Loading…
Cancel
Save