Fixed wrong order in conversion.

2001-11-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>

	* glib/gdate.c: Fixed wrong order in conversion.

diff --git a/ChangeLog b/ChangeLog
index 1d0f6f5..6221bad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-11-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * glib/gdate.c: Fixed wrong order in conversion.
+
 Wed Nov 28 18:34:22 2001  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gmain.[ch]: Rename (private) GSource.id and 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 1d0f6f5..6221bad 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,7 @@
+2001-11-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * glib/gdate.c: Fixed wrong order in conversion.
+
 Wed Nov 28 18:34:22 2001  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gmain.[ch]: Rename (private) GSource.id and 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1d0f6f5..6221bad 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+2001-11-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * glib/gdate.c: Fixed wrong order in conversion.
+
 Wed Nov 28 18:34:22 2001  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gmain.[ch]: Rename (private) GSource.id and 

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 1d0f6f5..6221bad 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,7 @@
+2001-11-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * glib/gdate.c: Fixed wrong order in conversion.
+
 Wed Nov 28 18:34:22 2001  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gmain.[ch]: Rename (private) GSource.id and 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 1d0f6f5..6221bad 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+2001-11-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * glib/gdate.c: Fixed wrong order in conversion.
+
 Wed Nov 28 18:34:22 2001  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gmain.[ch]: Rename (private) GSource.id and 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 1d0f6f5..6221bad 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+2001-11-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * glib/gdate.c: Fixed wrong order in conversion.
+
 Wed Nov 28 18:34:22 2001  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gmain.[ch]: Rename (private) GSource.id and 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 1d0f6f5..6221bad 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+2001-11-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * glib/gdate.c: Fixed wrong order in conversion.
+
 Wed Nov 28 18:34:22 2001  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gmain.[ch]: Rename (private) GSource.id and 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 1d0f6f5..6221bad 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+2001-11-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * glib/gdate.c: Fixed wrong order in conversion.
+
 Wed Nov 28 18:34:22 2001  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gmain.[ch]: Rename (private) GSource.id and 

diff --git a/glib/gdate.c b/glib/gdate.c
index 08b0334..a9e38ea 100644 (file)
--- 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)
        {