summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Lebl <jirka@5z.com>2001-09-13 07:26:35 +0000
committerGeorge Lebl <jirka@src.gnome.org>2001-09-13 07:26:35 +0000
commitc9ec678b1ffbe602f47cf49519d1527913407d74 (patch)
tree176853dd1a90a6479746aee0c72b9a79ec7da710
parent515a0d6bb855c8aa4edc8a67754ef2261d58b1a2 (diff)
downloadgdm-c9ec678b1ffbe602f47cf49519d1527913407d74.tar.gz
Apply patch from Ali Akcaagac <ali.akcaagac@stud.fh-wilhelmshaven.de> to
Thu Sep 13 00:20:46 2001 George Lebl <jirka@5z.com> * gui/gdmlogin.c: Apply patch from Ali Akcaagac <ali.akcaagac@stud.fh-wilhelmshaven.de> to fix up the 24hr time display to not show the %p
-rw-r--r--ChangeLog6
-rw-r--r--gui/gdmlogin.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f114fc21..545c9e55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Sep 13 00:20:46 2001 George Lebl <jirka@5z.com>
+
+ * gui/gdmlogin.c: Apply patch from Ali Akcaagac
+ <ali.akcaagac@stud.fh-wilhelmshaven.de> to fix up the 24hr time
+ display to not show the %p
+
Tue Sep 11 02:34:47 2001 George Lebl <jirka@5z.com>
* daemon/gdm.h, config/gdm.conf.in, gui/gdmconfig.(c|glade),
diff --git a/gui/gdmlogin.c b/gui/gdmlogin.c
index 76b11e72..aecf5486 100644
--- a/gui/gdmlogin.c
+++ b/gui/gdmlogin.c
@@ -2544,7 +2544,7 @@ update_clock (gpointer data)
the_tm = localtime (&the_time);
if (GdmUse24Clock) {
- if (strftime (str, sizeof (str), _("%a %b %d, %H:%M %p"), the_tm) == 0) {
+ if (strftime (str, sizeof (str), _("%a %b %d, %H:%M"), the_tm) == 0) {
/* according to docs, if the string does not fit, the
* contents of str are undefined, thus just use
* ??? */