Group password parsing fixes

pull/235/head
Ivan Dmitrievich Yartsev 10 months ago
parent c7cca4571f
commit f387a71d5f

@ -1255,7 +1255,9 @@ void on_group_save(GtkWidget *self, dictionary *dict){
int password_active = gtk_combo_box_get_active(GTK_COMBO_BOX(window->PasswordCombo)); int password_active = gtk_combo_box_get_active(GTK_COMBO_BOX(window->PasswordCombo));
if (password_active > 1){ if (password_active == 1) {
password = "!*";
} else if (password_active == 2){
password = (char*)gtk_entry_get_text(GTK_ENTRY(window->PasswordEntry)); password = (char*)gtk_entry_get_text(GTK_ENTRY(window->PasswordEntry));
if (yon_char_is_empty(password)){ if (yon_char_is_empty(password)){
yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),EMPTY_IMPORTANT_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),EMPTY_IMPORTANT_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
@ -2131,12 +2133,17 @@ void on_main_edit(GtkWidget *, main_window *widgets){
} }
} }
if (size>4){ if (size>4){
if (!yon_char_is_empty(parsed[4])&&strcmp(parsed[4],"x")){ if (!yon_char_is_empty(parsed[4])){
gtk_entry_set_text(GTK_ENTRY(window->PasswordEntry),parsed[4]); if (!strcmp(parsed[4],"!*")){
gtk_combo_box_set_active(GTK_COMBO_BOX(window->PasswordCombo),2); gtk_combo_box_set_active(GTK_COMBO_BOX(window->PasswordCombo),1);
} else { gtk_entry_set_text(GTK_ENTRY(window->PasswordEntry),"");
gtk_combo_box_set_active(GTK_COMBO_BOX(window->PasswordCombo),0); } else if (strcmp(parsed[4],"x")){
gtk_entry_set_text(GTK_ENTRY(window->PasswordEntry),parsed[4]);
gtk_combo_box_set_active(GTK_COMBO_BOX(window->PasswordCombo),2);
}
} }
} else {
gtk_combo_box_set_active(GTK_COMBO_BOX(window->PasswordCombo),0);
} }
char *sync = yon_config_get_by_key(GROUPADD_SYNC(name)); char *sync = yon_config_get_by_key(GROUPADD_SYNC(name));
if (sync){ if (sync){

Loading…
Cancel
Save