diff options
| author | Brian Cameron <brian.cameron@sun.com> | 2006-06-30 20:11:45 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2006-06-30 20:11:45 +0000 |
| commit | 798dd38fc5c3e3670f7ff9e0f90e23d79aba7f1e (patch) | |
| tree | 28016e353deed46c82fea1f563585fd070820a2c /gui | |
| parent | 9a81364f07c8e21c5f7b164138fdf811b2903337 (diff) | |
| download | gdm-798dd38fc5c3e3670f7ff9e0f90e23d79aba7f1e.tar.gz | |
Fix timed login message so it works when TimedLogin is set to use a piped
2006-06-25 Brian Cameron <brian.cameron@sun.com>
* gui/gdmcommon.c: Fix timed login message so it works
when TimedLogin is set to use a piped script.
* gui/gdmwm.c: Make comment nicer.
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/gdmcommon.c | 2 | ||||
| -rw-r--r-- | gui/gdmwm.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gui/gdmcommon.c b/gui/gdmcommon.c index ae2dc6dc..88037c8f 100644 --- a/gui/gdmcommon.c +++ b/gui/gdmcommon.c @@ -704,7 +704,7 @@ gdm_common_expand_text (const gchar *text) g_string_append_printf (str, ngettext("%d second", "%d seconds", gdm_timed_delay), gdm_timed_delay); case 'u': - g_string_append (str, ve_sure_string (gdm_config_get_string (GDM_KEY_TIMED_LOGIN))); + g_string_append (str, ve_sure_string (g_getenv("GDM_TIMED_LOGIN_OK"))); break; default: if (ch < 127) diff --git a/gui/gdmwm.c b/gui/gdmwm.c index e06c136b..9916e812 100644 --- a/gui/gdmwm.c +++ b/gui/gdmwm.c @@ -318,7 +318,7 @@ get_typed_property_data (Display *xdisplay, } if (!abort && expected_format && expected_format != format_returned) { - g_warning (G_GNUC_PRETTY_FUNCTION "(): Expected format (%u) unmatched (%d), programmer was drunk?", + g_warning (G_GNUC_PRETTY_FUNCTION "(): Expected format (%u) unmatched (%d)", expected_format, format_returned); abort++; } |