Applications
/
ubl-settings-usergroups
10
0
Fork 1
Code Issues 7 Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull request 'Fixed user folder loading algorythm' (#120) from YanTheKaller/ubl-settings-usergroups:master into master

Browse Source 
Reviewed-on: #120
pull/235/head
Dmitry Razumov 2 years ago
parent 1388470bd2 3c9676c899
commit 6e03a25191
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File

11
source/ubl-settings-usergroups.c
Unescape View File

@ -139,6 +139,10 @@ void yon_interface_update(main_window *widgets){
} }
} }
void on_save_window_close_update(GtkWidget *self, main_window *widgets){
yon_interface_update(widgets);
}
void on_config_local_load(GtkWidget *self, main_window *widgets){ void on_config_local_load(GtkWidget *self, main_window *widgets){
yon_load_proceed(YON_CONFIG_LOCAL); yon_load_proceed(YON_CONFIG_LOCAL);
textdomain(template_ui_LocaleName); textdomain(template_ui_LocaleName);
@ -285,11 +289,12 @@ void yon_hide_passwords(template_saving_window *window){
} }
} }
void on_config_save(){ void on_config_save(GtkWidget *self, main_window *widgets){
yon_accept_changes(); yon_accept_changes();
yon_samba_sync_proceed(); yon_samba_sync_proceed();
template_saving_window *window = yon_save_proceed(NULL,YON_CONFIG_BOTH,"users", "DEFAULTPASSWD DEFAULTROOTPASSWD DEFAULTUSER HASHPASSWD USERGROUPS ADDADM USERADD[*] USERSHADOW[*] GROUPADD[*]",NULL); template_saving_window *window = yon_save_proceed(NULL,YON_CONFIG_BOTH,"users", "DEFAULTPASSWD DEFAULTROOTPASSWD DEFAULTUSER HASHPASSWD USERGROUPS ADDADM USERADD[*] USERSHADOW[*] GROUPADD[*]",NULL);
if (window) yon_hide_passwords(window); if (window) yon_hide_passwords(window);
g_signal_connect(G_OBJECT(window->Window),"destroy",G_CALLBACK(on_save_window_close_update),widgets);
} }
void on_config_global_save(){ void on_config_global_save(){
@ -331,7 +336,7 @@ void on_config_local_save(GtkWidget *self, main_window *widgets){
yon_config_parse_parameter(keys[i],&key,&value); yon_config_parse_parameter(keys[i],&key,&value);
yon_config_set(key,value); yon_config_set(key,value);
} }
yon_interface_update(widgets); g_signal_connect(G_OBJECT(window->Window),"destroy",G_CALLBACK(on_save_window_close_update),widgets);
} }
void on_saving_settings_save(GtkWidget *self, yon_savasettings_window *window){ void on_saving_settings_save(GtkWidget *self, yon_savasettings_window *window){
@ -2059,7 +2064,7 @@ void on_main_edit(GtkWidget *self, main_window *widgets){
// gtk_entry_set_text(GTK_ENTRY(window->), parsed_size>4?parameters[4]:""); // gtk_entry_set_text(GTK_ENTRY(window->), parsed_size>4?parameters[4]:"");
} }
window->old_password=parameters[5]; window->old_password=parameters[5];
if (strcmp(parameters[5],"x")){ if (strcmp(parameters[5],"x")&&strcmp(parameters[5],"")){
gtk_entry_set_text(GTK_ENTRY(window->userPasswordEntry),parameters[5]); gtk_entry_set_text(GTK_ENTRY(window->userPasswordEntry),parameters[5]);
gtk_combo_box_set_active(GTK_COMBO_BOX(window->userPasswordCombo),2); gtk_combo_box_set_active(GTK_COMBO_BOX(window->userPasswordCombo),2);
} }

Write Preview
Loading…
Cancel
Save