[uim-commit] r669 - trunk/uim

[ekato at freedesktop.org]

Author: ekato
Date: 2005-02-18 00:12:27 -0800 (Fri, 18 Feb 2005)
New Revision: 669

Modified:
   trunk/uim/uim-encoding.h
   trunk/uim/uim-func.c
Log:
* uim/uim-func.c (uim_iconv_create) : Add an encoding check that
  was accidentally removed in r668, sorry.
* uim/uim-encoding.h : Cosmetic changes.


Modified: trunk/uim/uim-encoding.h
===================================================================
--- trunk/uim/uim-encoding.h	2005-02-18 04:56:13 UTC (rev 668)
+++ trunk/uim/uim-encoding.h	2005-02-18 08:12:27 UTC (rev 669)
@@ -96,7 +96,6 @@
   "iso8859-2", "8859-2", "iso8859_2", "iso_8859_2",
   NULL
 };
-
 static const char *alias_iso88593[] = {
   "ISO-8859-3", "ISO-IR-109", "ISO_8859-3:1988", "ISO_8859-3",
   "LATIN3", "L3", "csISOLatin3", "913", "cp913", "ibm-913", "ibm913",
@@ -325,7 +324,7 @@
   alias_cp1255,
   alias_tis620,
   alias_georgianps,
-  NULL,
+  NULL
 };
 
 #endif

Modified: trunk/uim/uim-func.c
===================================================================
--- trunk/uim/uim-func.c	2005-02-18 04:56:13 UTC (rev 668)
+++ trunk/uim/uim-func.c	2005-02-18 08:12:27 UTC (rev 669)
@@ -350,6 +350,9 @@
 {
   iconv_t ic;
 
+  if (check_encoding_equivalence(tocode, fromcode))
+    return (void *)0;
+
   ic = uim_iconv_open(tocode, fromcode);
   if (ic == (iconv_t)-1) {
     ic = (iconv_t)0;