diff options
| author | Brian Cameron <brian.cameron@sun.com> | 2006-06-30 20:15:30 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2006-06-30 20:15:30 +0000 |
| commit | 0a0c13375df394aaf1c8ed75a8c13f7939b1393d (patch) | |
| tree | 2772fe4603cf43cb2d088d51f0cc179823d3ec02 | |
| parent | 66e274c0d4dbc00a1870b5140c41e735d7e86468 (diff) | |
| download | gdm-0a0c13375df394aaf1c8ed75a8c13f7939b1393d.tar.gz | |
Fix timed login message so it works when TimedLogin is set to use a piped
2006-06-30 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.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | gui/gdmcommon.c | 2 | ||||
| -rw-r--r-- | gui/gdmwm.c | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2006-06-30 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. + 2006-06-25 Brian Cameron <brian.cameron@sun.com> * daemon/gdm.c: Fix decoding of suspend message in the daemon diff --git a/gui/gdmcommon.c b/gui/gdmcommon.c index 7166526f..ae204b67 100644 --- a/gui/gdmcommon.c +++ b/gui/gdmcommon.c @@ -708,7 +708,7 @@ gdm_common_expand_text (const gchar *text) g_string_append (str, _(" second")); break; 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++; } |