summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog7
-rw-r--r--config/gdm.conf.in8
-rw-r--r--daemon/gdm.c4
-rw-r--r--daemon/verify-pam.c24
-rw-r--r--gui/.cvsignore2
-rw-r--r--gui/gdmlogin.c18
-rw-r--r--gui/greeter/.cvsignore1
-rw-r--r--gui/greeter/Makefile.am1
-rw-r--r--po/POTFILES.in6
-rw-r--r--po/POTFILES.skip3
-rw-r--r--po/cs.po5
11 files changed, 51 insertions, 28 deletions
diff --git a/ChangeLog b/ChangeLog
index 12c64121..7475b05e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon May 06 10:39:41 2002 George Lebl <jirka@5z.com>
+
+ * gui/gdmlogin.c, daemon/verify-pam.c, po/cs.po, config/gdm.conf.in,
+ daemon/gdm.c: Try to solve some of the pending translation issues
+ mainly with utf8 kinds of weirdness. Not yet completely solved
+ though.
+
Fri May 03 16:42:42 2002 George Lebl <jirka@5z.com>
* daemon/gdm.[ch], daemon/slave.c: add notifies for sysmenu and
diff --git a/config/gdm.conf.in b/config/gdm.conf.in
index 8dbbe385..92962650 100644
--- a/config/gdm.conf.in
+++ b/config/gdm.conf.in
@@ -87,14 +87,8 @@ LocaleFile=@EXPANDED_LOCALEDIR@/locale.alias
Logo=@EXPANDED_PIXMAPDIR@/gnome-logo-large.png
Quiver=true
SystemMenu=true
+#FIXME: handle translations!
Welcome=Welcome to %n
-Welcome[es]=Bienvenido a %n
-Welcome[de]=Willkommen auf %n
-Welcome[fr]=Bienvenue sur %n
-Welcome[cs]=Vítejte na %n
-Welcome[no]=Velkommen til %n
-Welcome[nn]=Velkomen til %n
-Welcome[ru]=äÏÂÒÏ ÐÏÖÁÌÏ×ÁÔØ ÎÁ %n
LockPosition=false
SetPosition=false
PositionX=0
diff --git a/daemon/gdm.c b/daemon/gdm.c
index 4bb42c50..e098e56d 100644
--- a/daemon/gdm.c
+++ b/daemon/gdm.c
@@ -1308,12 +1308,12 @@ main (int argc, char *argv[])
store_argv (argc, argv);
- setlocale(LC_ALL, "");
-
bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
+ setlocale(LC_ALL, "");
+
/* Initialize runtime environment */
umask (022);
diff --git a/daemon/verify-pam.c b/daemon/verify-pam.c
index 4ef25dc7..93b7fb85 100644
--- a/daemon/verify-pam.c
+++ b/daemon/verify-pam.c
@@ -57,8 +57,8 @@ gdm_verify_pam_conv (int num_msg, const struct pam_message **msg,
struct pam_response **resp,
void *appdata_ptr)
{
- gint replies = 0;
- gchar *s;
+ int replies = 0;
+ char *s, *utf8;
struct pam_response *reply = NULL;
reply = malloc (sizeof (struct pam_response) * num_msg);
@@ -73,13 +73,18 @@ gdm_verify_pam_conv (int num_msg, const struct pam_message **msg,
switch (msg[replies]->msg_style) {
case PAM_PROMPT_ECHO_ON:
+ utf8 = g_locale_to_utf8 (msg[replies]->msg, -1, NULL, NULL, NULL);
+
/* PAM requested textual input with echo on */
- s = gdm_slave_greeter_ctl (GDM_PROMPT, _((gchar *) msg[replies]->msg));
+ s = gdm_slave_greeter_ctl (GDM_PROMPT, utf8);
+ g_free (utf8);
+
if (gdm_slave_greeter_check_interruption (s)) {
g_free (s);
free (reply);
return PAM_CONV_ERR;
}
+ /* FIXME: convert to locale? */
reply[replies].resp_retcode = PAM_SUCCESS;
reply[replies].resp = strdup (ve_sure_string (s));
g_free (s);
@@ -87,12 +92,15 @@ gdm_verify_pam_conv (int num_msg, const struct pam_message **msg,
case PAM_PROMPT_ECHO_OFF:
/* PAM requested textual input with echo off */
- s = gdm_slave_greeter_ctl (GDM_NOECHO, _((gchar *) msg[replies]->msg));
+ utf8 = g_locale_to_utf8 (msg[replies]->msg, -1, NULL, NULL, NULL);
+ s = gdm_slave_greeter_ctl (GDM_NOECHO, utf8);
+ g_free (utf8);
if (gdm_slave_greeter_check_interruption (s)) {
g_free (s);
free (reply);
return PAM_CONV_ERR;
}
+ /* FIXME: convert to locale? */
reply[replies].resp_retcode = PAM_SUCCESS;
reply[replies].resp = strdup (ve_sure_string (s));
g_free (s);
@@ -100,13 +108,17 @@ gdm_verify_pam_conv (int num_msg, const struct pam_message **msg,
case PAM_ERROR_MSG:
/* PAM sent a message that should displayed to the user */
- gdm_slave_greeter_ctl_no_ret (GDM_ERRDLG, _((gchar *) msg[replies]->msg));
+ utf8 = g_locale_to_utf8 (msg[replies]->msg, -1, NULL, NULL, NULL);
+ gdm_slave_greeter_ctl_no_ret (GDM_ERRDLG, utf8);
+ g_free (utf8);
reply[replies].resp_retcode = PAM_SUCCESS;
reply[replies].resp = NULL;
break;
case PAM_TEXT_INFO:
/* PAM sent a message that should displayed to the user */
- gdm_slave_greeter_ctl_no_ret (GDM_MSG, _((gchar *) msg[replies]->msg));
+ utf8 = g_locale_to_utf8 (msg[replies]->msg, -1, NULL, NULL, NULL);
+ gdm_slave_greeter_ctl_no_ret (GDM_MSG, utf8);
+ g_free (utf8);
reply[replies].resp_retcode = PAM_SUCCESS;
reply[replies].resp = NULL;
break;
diff --git a/gui/.cvsignore b/gui/.cvsignore
index 33329741..fe39f154 100644
--- a/gui/.cvsignore
+++ b/gui/.cvsignore
@@ -8,6 +8,8 @@ gdmlogin
gdmchooser
gdmconfig
gdmconfig.desktop
+gdmsetup
+gdmsetup.desktop
gdmphotosetup.desktop
gdmflexiserver.desktop
gdmflexiserver-xnest.desktop
diff --git a/gui/gdmlogin.c b/gui/gdmlogin.c
index 8b4427fc..c9be02b5 100644
--- a/gui/gdmlogin.c
+++ b/gui/gdmlogin.c
@@ -2633,6 +2633,7 @@ static gboolean
update_clock (gpointer data)
{
struct tm *the_tm;
+ char *utf8;
time_t the_time;
char str[256];
gint time_til_next_min;
@@ -2660,8 +2661,9 @@ update_clock (gpointer data)
}
str [sizeof(str)-1] = '\0'; /* just for sanity */
- gtk_label_set_text (GTK_LABEL (clock_label), str);
-
+ utf8 = g_locale_to_utf8 (str, -1, NULL, NULL, NULL);
+ gtk_label_set_text (GTK_LABEL (clock_label), utf8);
+ g_free (utf8);
/* account for leap seconds */
time_til_next_min = 60 - the_tm->tm_sec;
@@ -3760,6 +3762,13 @@ main (int argc, char *argv[])
openlog ("gdmlogin", LOG_PID, LOG_DAEMON);
+ bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ textdomain (GETTEXT_PACKAGE);
+
+ gtk_init (&argc, &argv);
+
+#if 0
gnome_program_init ("gdmlogin", VERSION,
/* FIXME: oh fuck this inits way too much
* shit that we don't want */
@@ -3768,6 +3777,7 @@ main (int argc, char *argv[])
GNOME_PARAM_CREATE_DIRECTORIES, FALSE,
GNOME_PARAM_ENABLE_SOUND, FALSE,
NULL);
+#endif
gdm_login_parse_config ();
@@ -3780,10 +3790,6 @@ main (int argc, char *argv[])
setlocale (LC_ALL, "");
}
- bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
- bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
- textdomain (GETTEXT_PACKAGE);
-
setup_cursor (GDK_LEFT_PTR);
tooltips = gtk_tooltips_new ();
diff --git a/gui/greeter/.cvsignore b/gui/greeter/.cvsignore
index 02b05239..984f9768 100644
--- a/gui/greeter/.cvsignore
+++ b/gui/greeter/.cvsignore
@@ -1,4 +1,5 @@
Makefile
Makefile.in
+gdmgreeter
.deps
.libs
diff --git a/gui/greeter/Makefile.am b/gui/greeter/Makefile.am
index e94cdfd6..ccc9da41 100644
--- a/gui/greeter/Makefile.am
+++ b/gui/greeter/Makefile.am
@@ -8,7 +8,6 @@ INCLUDES = \
-DGDM_CONFIG_FILE=\"@sysconfdir@/gdm/gdm.conf\" \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DGREETERTHEMEDIR=\""$(datadir)/gdm/themes"\" \
- $(WARN_CFLAGS) \
$(GREETER_CFLAGS)
bin_PROGRAMS = \
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f0ca165a..4a619b7b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -17,9 +17,9 @@ daemon/xdmcp.c
gui/gdmchooser.c
gui/gdmchooser-strings.c
gui/gdmcomm.c
-gui/gdmconfig.c
-gui/gdmconfig.desktop.in
-gui/gdmconfig-strings.c
+gui/gdmsetup.c
+gui/gdmsetup.desktop.in
+gui/gdmsetup-strings.c
gui/gdmflexiserver.c
gui/gdmflexiserver.desktop.in
gui/gdmflexiserver-xnest.desktop.in
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index e69de29b..2017974a 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -0,0 +1,3 @@
+gui/gdmconfig.c
+gui/gdmconfig.desktop.in
+gui/gdmconfig-strings.c
diff --git a/po/cs.po b/po/cs.po
index 8663d0e5..48cafba2 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -10,7 +10,7 @@ msgstr ""
"Last-Translator: George Lebl <jirka@5z.com>\n"
"Language-Team: czech <cs@li.org>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-2\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8bit\n"
#: daemon/auth.c:146
@@ -2722,9 +2722,8 @@ msgid "Do not lock current screen"
msgstr ""
#: gui/gdmflexiserver.c:502
-#, fuzzy
msgid "Debugging output"
-msgstr "Povolit ladicí výstup"
+msgstr "Ladicí výstup"
#: gui/gdmflexiserver.c:503
msgid "Authenticate before running --command"
View Lorry Controller Status