From 16b965383047a96c6c17baf6b46a378524f3a492 Mon Sep 17 00:00:00 2001 From: Sebastian Wilhelmi Date: Thu, 29 Nov 2001 09:41:25 +0000 Subject: [PATCH] Fixed wrong order in conversion. 2001-11-28 Sebastian Wilhelmi * glib/gdate.c: Fixed wrong order in conversion. --- ChangeLog | 4 ++++ ChangeLog.pre-2-0 | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-12 | 4 ++++ ChangeLog.pre-2-2 | 4 ++++ ChangeLog.pre-2-4 | 4 ++++ ChangeLog.pre-2-6 | 4 ++++ ChangeLog.pre-2-8 | 4 ++++ glib/gdate.c | 2 +- 9 files changed, 33 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1d0f6f5..6221bad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2001-11-28 Sebastian Wilhelmi + + * glib/gdate.c: Fixed wrong order in conversion. + Wed Nov 28 18:34:22 2001 Owen Taylor * glib/gmain.[ch]: Rename (private) GSource.id and diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 1d0f6f5..6221bad 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,7 @@ +2001-11-28 Sebastian Wilhelmi + + * glib/gdate.c: Fixed wrong order in conversion. + Wed Nov 28 18:34:22 2001 Owen Taylor * glib/gmain.[ch]: Rename (private) GSource.id and diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1d0f6f5..6221bad 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +2001-11-28 Sebastian Wilhelmi + + * glib/gdate.c: Fixed wrong order in conversion. + Wed Nov 28 18:34:22 2001 Owen Taylor * glib/gmain.[ch]: Rename (private) GSource.id and diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 1d0f6f5..6221bad 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,7 @@ +2001-11-28 Sebastian Wilhelmi + + * glib/gdate.c: Fixed wrong order in conversion. + Wed Nov 28 18:34:22 2001 Owen Taylor * glib/gmain.[ch]: Rename (private) GSource.id and diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 1d0f6f5..6221bad 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,7 @@ +2001-11-28 Sebastian Wilhelmi + + * glib/gdate.c: Fixed wrong order in conversion. + Wed Nov 28 18:34:22 2001 Owen Taylor * glib/gmain.[ch]: Rename (private) GSource.id and diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 1d0f6f5..6221bad 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,7 @@ +2001-11-28 Sebastian Wilhelmi + + * glib/gdate.c: Fixed wrong order in conversion. + Wed Nov 28 18:34:22 2001 Owen Taylor * glib/gmain.[ch]: Rename (private) GSource.id and diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 1d0f6f5..6221bad 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,7 @@ +2001-11-28 Sebastian Wilhelmi + + * glib/gdate.c: Fixed wrong order in conversion. + Wed Nov 28 18:34:22 2001 Owen Taylor * glib/gmain.[ch]: Rename (private) GSource.id and diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 1d0f6f5..6221bad 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,7 @@ +2001-11-28 Sebastian Wilhelmi + + * glib/gdate.c: Fixed wrong order in conversion. + Wed Nov 28 18:34:22 2001 Owen Taylor * glib/gmain.[ch]: Rename (private) GSource.id and diff --git a/glib/gdate.c b/glib/gdate.c index 08b0334..a9e38ea 100644 --- a/glib/gdate.c +++ b/glib/gdate.c @@ -1370,7 +1370,7 @@ g_date_strftime (gchar *s, gchar *convbuf; GError *error = NULL; - locale_format = g_convert (format, -1 , "UTF-8", charset, + locale_format = g_convert (format, -1 , charset, "UTF-8", NULL, NULL, &error); if (error) { -- 2.7.4