From 52915655ee2262a0bb7ac92a2050f9f59f63badc Mon Sep 17 00:00:00 2001 From: Diego Gonzalez Date: Mon, 8 Aug 2005 01:28:40 +0000 Subject: [PATCH] fix the rest of bug 312092 which was caused when the old and new passwords 2005-08-07 Diego Gonzalez * 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. --- capplets/about-me/ChangeLog | 6 ++++++ capplets/about-me/gnome-about-me-password.c | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/capplets/about-me/ChangeLog b/capplets/about-me/ChangeLog index 84ec1e48d..1b46def22 100644 --- a/capplets/about-me/ChangeLog +++ b/capplets/about-me/ChangeLog @@ -1,3 +1,9 @@ +2005-08-07 Diego Gonzalez + + * 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 * gnome-about-me.c (about_me_setup_dialog): handle protocol errors diff --git a/capplets/about-me/gnome-about-me-password.c b/capplets/about-me/gnome-about-me-password.c index 677f94769..492f145de 100644 --- a/capplets/about-me/gnome-about-me-password.c +++ b/capplets/about-me/gnome-about-me-password.c @@ -307,7 +307,7 @@ update_password (PasswordDialog *pdialog, gchar **msg) 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) { retcode = -2; } else if (g_strrstr (s, "short") != NULL) { @@ -325,6 +325,10 @@ update_password (PasswordDialog *pdialog, gchar **msg) } else if (g_strrstr (s, "one") != NULL) { *msg = g_strdup (_("Old and new password are the same")); 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);