fix the rest of bug 312092 which was caused when the old and new passwords
2005-08-07 Diego Gonzalez <diego@pemas.net> * gnome-about-me-password.c (update_password): fix the rest of bug 312092 which was caused when the old and new passwords were the same.
This commit is contained in:
parent
f27337cbce
commit
52915655ee
2 changed files with 11 additions and 1 deletions
|
@ -1,3 +1,9 @@
|
||||||
|
2005-08-07 Diego Gonzalez <diego@pemas.net>
|
||||||
|
|
||||||
|
* gnome-about-me-password.c (update_password): fix the rest of bug
|
||||||
|
312092 which was caused when the old and new passwords were the
|
||||||
|
same.
|
||||||
|
|
||||||
2005-08-06 Diego Gonzalez <diego@pemas.net>
|
2005-08-06 Diego Gonzalez <diego@pemas.net>
|
||||||
|
|
||||||
* gnome-about-me.c (about_me_setup_dialog): handle protocol errors
|
* gnome-about-me.c (about_me_setup_dialog): handle protocol errors
|
||||||
|
|
|
@ -307,7 +307,7 @@ update_password (PasswordDialog *pdialog, gchar **msg)
|
||||||
|
|
||||||
write_to_backend (pdialog, retyped_password);
|
write_to_backend (pdialog, retyped_password);
|
||||||
|
|
||||||
s = read_from_backend (pdialog, "successfully", "short", "panlindrome", "simple", "similar", "one", "recovered", NULL);
|
s = read_from_backend (pdialog, "successfully", "short", "panlindrome", "simple", "similar", "one", "recovered", "unchanged", NULL);
|
||||||
if (g_strrstr (s, "recovered") != NULL) {
|
if (g_strrstr (s, "recovered") != NULL) {
|
||||||
retcode = -2;
|
retcode = -2;
|
||||||
} else if (g_strrstr (s, "short") != NULL) {
|
} else if (g_strrstr (s, "short") != NULL) {
|
||||||
|
@ -325,6 +325,10 @@ update_password (PasswordDialog *pdialog, gchar **msg)
|
||||||
} else if (g_strrstr (s, "one") != NULL) {
|
} else if (g_strrstr (s, "one") != NULL) {
|
||||||
*msg = g_strdup (_("Old and new password are the same"));
|
*msg = g_strdup (_("Old and new password are the same"));
|
||||||
retcode = -3;
|
retcode = -3;
|
||||||
|
} else if (g_strrstr (s, "unchanged") != NULL) {
|
||||||
|
kill (pdialog->backend_pid, SIGKILL);
|
||||||
|
*msg = g_strdup (_("Old and new password are the same"));
|
||||||
|
retcode = -3;
|
||||||
}
|
}
|
||||||
|
|
||||||
g_free (s);
|
g_free (s);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue