diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-01-19 21:05:09 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-01-19 21:05:09 +0800 |
| commit | f373eeb5537c5410fcd0a28b9535eca32775a35d (patch) | |
| tree | cd2779aae68a5d35d6a3f1f1b357b2f5cc70bf44 | |
| parent | 034937b3a656cc6850a215b7163970dd614039c9 (diff) | |
| download | marcuscom-ports-f373eeb5537c5410fcd0a28b9535eca32775a35d.tar marcuscom-ports-f373eeb5537c5410fcd0a28b9535eca32775a35d.tar.gz marcuscom-ports-f373eeb5537c5410fcd0a28b9535eca32775a35d.tar.bz2 marcuscom-ports-f373eeb5537c5410fcd0a28b9535eca32775a35d.tar.lz marcuscom-ports-f373eeb5537c5410fcd0a28b9535eca32775a35d.tar.xz marcuscom-ports-f373eeb5537c5410fcd0a28b9535eca32775a35d.tar.zst marcuscom-ports-f373eeb5537c5410fcd0a28b9535eca32775a35d.zip | |
Fix patching.
Noticed by: DomiX on IRC
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13489 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | sysutils/gnome-system-tools/files/patch-src_users_user-settings.c | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/sysutils/gnome-system-tools/files/patch-src_users_user-settings.c b/sysutils/gnome-system-tools/files/patch-src_users_user-settings.c index 2ff992c65..75be235f5 100644 --- a/sysutils/gnome-system-tools/files/patch-src_users_user-settings.c +++ b/sysutils/gnome-system-tools/files/patch-src_users_user-settings.c @@ -1,17 +1,11 @@ ---- src/users/user-settings.c.orig 2009-11-30 17:40:27.000000000 -0500 -+++ src/users/user-settings.c 2010-01-05 18:51:40.000000000 -0500 -@@ -1228,12 +1228,12 @@ on_edit_user_passwd (GtkButton *button, - "changed")); +--- src/users/user-settings.c.orig 2010-01-11 19:53:32.000000000 +0100 ++++ src/users/user-settings.c 2010-01-19 14:04:14.000000000 +0100 +@@ -1142,7 +1142,7 @@ on_edit_user_passwd (GtkButton *button, - if (passwd_changed) -- oobs_user_set_password (user, -+ oobs_user_set_crypted_password (user, - gtk_entry_get_text (GTK_ENTRY (passwd_entry))); - } else { - passwd_entry = gst_dialog_get_widget (tool->main_dialog, - "user_settings_random_passwd"); -- oobs_user_set_password (user, -+ oobs_user_set_crypted_password (user, - gtk_entry_get_text (GTK_ENTRY (passwd_entry))); - } + /* empty password means: don't change it */ + if (strlen (passwd) > 0) +- oobs_user_set_password (user, passwd); ++ oobs_user_set_crypted_password (user, passwd); + /* check whether user is allowed to login without password */ + no_passwd_login_group = get_no_passwd_login_group (); |