Attachment 19383 Details for Bug 55640 – git diff изменений

[patch] git diff изменений

3231.diff (text/plain), 4.09 KB, created by Semen Fomchenkov on 2025-08-19 12:47:28 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Semen Fomchenkov

Created: 2025-08-19 12:47:28 MSK

Size: 4.09 KB

patch

obsolete

>diff --git a/panels/system/users/cc-password-dialog.c b/panels/system/users/cc-password-dialog.c
>index 860b3c627cf5e9a65b00060ea17210d594e449fa..b1128bf30382e2674d453cfba19eff063a6fbc7c 100644
>--- a/panels/system/users/cc-password-dialog.c
>+++ b/panels/system/users/cc-password-dialog.c
>@@ -143,6 +143,13 @@ password_changed_cb (PasswdHandler    *handler,
>         else {
>                 primary_text = _("Password could not be changed");
>                 secondary_text = error->message;
>+
>+                if (error->code == PASSWD_ERROR_CHANGE_FAILED) {
>+                        gtk_editable_set_text (GTK_EDITABLE (self->password_entry), "");
>+                        gtk_widget_grab_focus (GTK_WIDGET (self->password_entry));
>+
>+                        gtk_editable_set_text (GTK_EDITABLE (self->verify_entry), "");
>+                }
>         }
> 
>         dialog = adw_alert_dialog_new (primary_text, secondary_text);
>diff --git a/panels/system/users/cc-user-page.c b/panels/system/users/cc-user-page.c
>index 3cae301ba9ba9c873832df3dea40da670824ea7f..f07515df4873c93b531ed3f3e3364ca9b4b0363d 100644
>--- a/panels/system/users/cc-user-page.c
>+++ b/panels/system/users/cc-user-page.c
>@@ -469,7 +469,7 @@ update_editable_state (CcUserPage *self)
>     self->avatar_editable = (is_current_user (self->user) || !self->locked);
>     g_object_notify (G_OBJECT (self), "avatar-editable");
> 
>-    self->editable = self->avatar_editable && act_user_is_local_account (self->user);
>+    self->editable = self->avatar_editable;
>     g_object_notify (G_OBJECT (self), "editable");
> }
> 
>diff --git a/panels/system/users/run-passwd.c b/panels/system/users/run-passwd.c
>index 5b6e844071ad789c1d69ab91abe2d7a4b6cba5d9..fb9efc6ed9f094a2178fcc9c1580eb0aadd94950 100644
>--- a/panels/system/users/run-passwd.c
>+++ b/panels/system/users/run-passwd.c
>@@ -440,6 +440,7 @@ io_watch_stdout (GIOChannel *source, GIOCondition condition, PasswdHandler *pass
>                                                 "match",
>                                                 "1 numeric or special",
>                                                 "failure",
>+                                                "change failed",
>                                                 "DIFFERENT",
>                                                 "BAD PASSWORD",
>                                                 NULL)) {
>@@ -497,6 +498,9 @@ io_watch_stdout (GIOChannel *source, GIOCondition condition, PasswdHandler *pass
>                                         else if (strstr (str->str, "DIFFERENT")) {
>                                                 error = g_error_new (PASSWD_ERROR, PASSWD_ERROR_REJECTED,
>                                                                      _("The new password does not contain enough different characters"));
>+                                        } else if (strstr (str->str, "change failed") != NULL) {
>+                                            error = g_error_new (PASSWD_ERROR, PASSWD_ERROR_CHANGE_FAILED,
>+                                                                 _("Password does not meet your organization's security policies. Try a different password or contact your system administrator."));
>                                         }
>                                         else {
>                                                 error = g_error_new (PASSWD_ERROR, PASSWD_ERROR_UNKNOWN,
>diff --git a/panels/system/users/run-passwd.h b/panels/system/users/run-passwd.h
>index c0362bd2bc913b2061e77163efc30bde32cab7e7..299164decaa96beaa3012c3b73177b7b288776ef 100644
>--- a/panels/system/users/run-passwd.h
>+++ b/panels/system/users/run-passwd.h
>@@ -31,6 +31,7 @@ typedef void (*PasswdCallback) (PasswdHandler *passwd_handler, GError *error, co
> /* Error codes */
> typedef enum {
>         PASSWD_ERROR_REJECTED,          /* New password is not secure enough */
>+        PASSWD_ERROR_CHANGE_FAILED,     /* Password can't be changed */
>         PASSWD_ERROR_AUTH_FAILED,       /* Wrong old password, or PAM failure */
>         PASSWD_ERROR_REAUTH_FAILED,     /* Password has changed since first authentication */
>         PASSWD_ERROR_BACKEND,           /* Backend error */

Actions: View | Diff

Attachments on bug 55640: 19383 | 19624