rpms/gnome-screensaver/FC-6 gnome-screensaver-2.16.1-localize-prompt.patch, NONE, 1.1 gnome-screensaver.spec, 1.116, 1.117
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Nov 10 20:03:41 UTC 2006
- Previous message (by thread): rpms/openoffice.org/devel openoffice.org.spec,1.932,1.933
- Next message (by thread): rpms/compiz/devel .cvsignore, 1.15, 1.16 aiglx-defaults.patch, 1.2, 1.3 compiz.spec, 1.59, 1.60 fedora-logo.patch, 1.3, 1.4 icon-menu.patch, 1.1, 1.2 sources, 1.17, 1.18
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rstrode
Update of /cvs/dist/rpms/gnome-screensaver/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv7160
Modified Files:
gnome-screensaver.spec
Added Files:
gnome-screensaver-2.16.1-localize-prompt.patch
Log Message:
- convert pam messages from users encoding to utf8 before puttin
in ui (bug 214681)
gnome-screensaver-2.16.1-localize-prompt.patch:
gs-auth-pam.c | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
--- NEW FILE gnome-screensaver-2.16.1-localize-prompt.patch ---
--- gnome-screensaver-2.16.1/src/gs-auth-pam.c.localize-prompt 2006-11-09 10:25:03.000000000 -0500
+++ gnome-screensaver-2.16.1/src/gs-auth-pam.c 2006-11-09 10:41:31.000000000 -0500
@@ -161,7 +161,7 @@
case GS_AUTH_MESSAGE_PROMPT_ECHO_ON:
break;
case GS_AUTH_MESSAGE_PROMPT_ECHO_OFF:
- if (msg != NULL && g_str_has_prefix (msg, "Password:")) {
+ if (msg != NULL && g_str_has_prefix (msg, _("Password:"))) {
did_we_ask_for_password = TRUE;
}
break;
@@ -241,12 +241,30 @@
for (replies = 0; replies < nmsgs; replies++) {
GSAuthMessageStyle style;
+ gchar *message_text;
style = pam_style_to_gs_style (msg [replies]->msg_style);
+ message_text = g_locale_to_utf8 (msg [replies]->msg,
+ -1, NULL, NULL, NULL);
+
+ /* if we couldn't covert text from users locale then
+ * assume utf-8 and hope for the best
+ */
+ if (message_text == NULL) {
+ message_text = g_strdup (msg [replies]->msg);
+ gchar *p, *q;
+
+ p = message_text;
+ while (*p != '\0' && !g_utf8_validate (p, -1, &q)) {
+ *q = '?';
+ p = q + 1;
+ }
+ }
+
/* handle message locally first */
auth_message_handler (style,
- msg [replies]->msg,
+ message_text,
&reply [replies].resp,
NULL);
@@ -254,7 +272,7 @@
/* blocks until the gui responds
*/
res = gs_auth_run_message_handler (c, style,
- msg [replies]->msg,
+ message_text,
&reply [replies].resp);
/* If the handler returns FALSE - interrupt the PAM stack */
@@ -264,6 +282,7 @@
reply [replies].resp_retcode = PAM_INCOMPLETE;
}
}
+ g_free (message_text);
/* iterate the glib event loop inbetween processing pam
* messages so that the user interface can be updated
Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/FC-6/gnome-screensaver.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- gnome-screensaver.spec 16 Oct 2006 18:24:57 -0000 1.116
+++ gnome-screensaver.spec 10 Nov 2006 20:03:39 -0000 1.117
@@ -13,7 +13,7 @@
Summary: GNOME Screensaver
Name: gnome-screensaver
Version: 2.16.1
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPL
Group: Amusements/Graphics
Source0: %{name}-%{version}.tar.bz2
@@ -22,6 +22,7 @@
Patch1: gnome-screensaver-2.15.4-default-theme.patch
Patch2: gnome-screensaver-2.16.0-better-pam-integration.patch
Patch3: gnome-screensaver-2.16.0-securitytoken.patch
+Patch4: gnome-screensaver-2.16.1-localize-prompt.patch
BuildRoot: %{_tmppath}/%{name}-root
URL: http://www.gnome.org
@@ -65,6 +66,7 @@
%patch1 -p1 -b .use-floaters-by-default
%patch2 -p1 -b .better-pam-integration
%patch3 -p1 -b .securitytoken
+%patch4 -p1 -b .localize-prompt
%build
autoreconf
@@ -122,6 +124,10 @@
%{_sysconfdir}/pam.d/*
%changelog
+* Fri Nov 10 2006 Ray Strode <rstrode at redhat.com> - 2.16.1-3.fc6
+- convert pam messages from users encoding to utf8 before puttin
+ in ui (bug 214681)
+
* Mon Oct 16 2006 Ray Strode <rstrode at redhat.com> - 2.16.1-2.fc6
- backport fixes from fc7 branch
- Previous message (by thread): rpms/openoffice.org/devel openoffice.org.spec,1.932,1.933
- Next message (by thread): rpms/compiz/devel .cvsignore, 1.15, 1.16 aiglx-defaults.patch, 1.2, 1.3 compiz.spec, 1.59, 1.60 fedora-logo.patch, 1.3, 1.4 icon-menu.patch, 1.1, 1.2 sources, 1.17, 1.18
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list