changeset 2015:200970e7a3b1 trunk

[svn] - run chardet against even valid UTF-8 strings, as they may be non-UTF-8 sequences encoded as UTF-8.
author nenolod
date Mon, 27 Nov 2006 15:38:11 -0800
parents ae33464ff918
children 917903e2fc1c
files ChangeLog audacious/util.c
diffstat 2 files changed, 38 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Nov 26 15:57:59 2006 -0800
+++ b/ChangeLog	Mon Nov 27 15:38:11 2006 -0800
@@ -1,3 +1,37 @@
+2006-11-26 23:57:59 +0000  Adam Cecile <gandalf@le-vert.net>
+  revision [3023]
+  Just ran make update-po.
+  
+  trunk/po/audacious.pot |  236 +++++++-------
+  trunk/po/br.po         |  236 +++++++-------
+  trunk/po/cs.po         |  236 +++++++-------
+  trunk/po/cy.po         |  779 +++++++++++++++++++++++++++++++++++++------------
+  trunk/po/de.po         |  236 +++++++-------
+  trunk/po/el.po         |  236 +++++++-------
+  trunk/po/es.po         |  236 +++++++-------
+  trunk/po/fi.po         |  236 +++++++-------
+  trunk/po/fr.po         |  237 +++++++-------
+  trunk/po/hi.po         |  236 +++++++-------
+  trunk/po/hu.po         |  236 +++++++-------
+  trunk/po/it.po         |  236 +++++++-------
+  trunk/po/ja.po         |  236 +++++++-------
+  trunk/po/ka.po         |  236 +++++++-------
+  trunk/po/ko.po         |  236 +++++++-------
+  trunk/po/lt.po         |  236 +++++++-------
+  trunk/po/mk.po         |  236 +++++++-------
+  trunk/po/nl.po         |  236 +++++++-------
+  trunk/po/pl.po         |  236 +++++++-------
+  trunk/po/pt_BR.po      |  236 +++++++-------
+  trunk/po/ro.po         |  236 +++++++-------
+  trunk/po/ru.po         |  236 +++++++-------
+  trunk/po/sk.po         |  236 +++++++-------
+  trunk/po/sv.po         |  236 +++++++-------
+  trunk/po/uk.po         |  236 +++++++-------
+  trunk/po/zh_CN.po      |   70 ++--
+  trunk/po/zh_TW.po      |  236 +++++++-------
+  27 files changed, 3574 insertions(+), 3176 deletions(-)
+
+
 2006-11-26 23:40:14 +0000  Adam Cecile <gandalf@le-vert.net>
   revision [3021]
   First po updates by Le_Vert.
--- a/audacious/util.c	Sun Nov 26 15:57:59 2006 -0800
+++ b/audacious/util.c	Mon Nov 27 15:38:11 2006 -0800
@@ -1542,14 +1542,14 @@
      * encodings. To avoid this, the order of evaluation has been
      * changed. (It might cause a drawback?)
      */
+    /* chardet encoding detector */
+    if ((out_str = chardet_to_utf8(str, strlen(str), NULL, NULL, NULL)))
+        return out_str;
+
     /* already UTF-8? */
     if (g_utf8_validate(str, -1, NULL))
         return g_strdup(str);
 
-    /* chardet encoding detector */
-    if ((out_str = chardet_to_utf8(str, strlen(str), NULL, NULL, NULL)))
-        return out_str;
-
     /* assume encoding associated with locale */
     if ((out_str = g_locale_to_utf8(str, -1, NULL, NULL, NULL)))
         return out_str;