Skip g_convert when to_codeset and from_codeset are both 'UTF-8' (gnome

	* modules/input/gtkimcontextxim.c (mb_to_utf8), xim_text_to_utf8):
	Skip g_convert when to_codeset and from_codeset are both 'UTF-8'
	(gnome bugzilla #58202)

ChangeLog

+2001-08-06  HideToshi Tajima  <tajima@eng.sun.com>
+
+	* modules/input/gtkimcontextxim.c (mb_to_utf8), xim_text_to_utf8):
+	Skip g_convert when to_codeset and from_codeset are both 'UTF-8'
+	(gnome bugzilla #58202)
+
 2001-08-06  Havoc Pennington  <hp@pobox.com>
  
  	* gdk/x11/gdkimage-x11.c (_gdk_x11_get_image): The whole 

ChangeLog.pre-2-0

+2001-08-06  HideToshi Tajima  <tajima@eng.sun.com>
+
+	* modules/input/gtkimcontextxim.c (mb_to_utf8), xim_text_to_utf8):
+	Skip g_convert when to_codeset and from_codeset are both 'UTF-8'
+	(gnome bugzilla #58202)
+
 2001-08-06  Havoc Pennington  <hp@pobox.com>
  
  	* gdk/x11/gdkimage-x11.c (_gdk_x11_get_image): The whole 

ChangeLog.pre-2-10

+2001-08-06  HideToshi Tajima  <tajima@eng.sun.com>
+
+	* modules/input/gtkimcontextxim.c (mb_to_utf8), xim_text_to_utf8):
+	Skip g_convert when to_codeset and from_codeset are both 'UTF-8'
+	(gnome bugzilla #58202)
+
 2001-08-06  Havoc Pennington  <hp@pobox.com>
  
  	* gdk/x11/gdkimage-x11.c (_gdk_x11_get_image): The whole 

ChangeLog.pre-2-2

+2001-08-06  HideToshi Tajima  <tajima@eng.sun.com>
+
+	* modules/input/gtkimcontextxim.c (mb_to_utf8), xim_text_to_utf8):
+	Skip g_convert when to_codeset and from_codeset are both 'UTF-8'
+	(gnome bugzilla #58202)
+
 2001-08-06  Havoc Pennington  <hp@pobox.com>
  
  	* gdk/x11/gdkimage-x11.c (_gdk_x11_get_image): The whole 

ChangeLog.pre-2-4

+2001-08-06  HideToshi Tajima  <tajima@eng.sun.com>
+
+	* modules/input/gtkimcontextxim.c (mb_to_utf8), xim_text_to_utf8):
+	Skip g_convert when to_codeset and from_codeset are both 'UTF-8'
+	(gnome bugzilla #58202)
+
 2001-08-06  Havoc Pennington  <hp@pobox.com>
  
  	* gdk/x11/gdkimage-x11.c (_gdk_x11_get_image): The whole 

ChangeLog.pre-2-6

+2001-08-06  HideToshi Tajima  <tajima@eng.sun.com>
+
+	* modules/input/gtkimcontextxim.c (mb_to_utf8), xim_text_to_utf8):
+	Skip g_convert when to_codeset and from_codeset are both 'UTF-8'
+	(gnome bugzilla #58202)
+
 2001-08-06  Havoc Pennington  <hp@pobox.com>
  
  	* gdk/x11/gdkimage-x11.c (_gdk_x11_get_image): The whole 

ChangeLog.pre-2-8

+2001-08-06  HideToshi Tajima  <tajima@eng.sun.com>
+
+	* modules/input/gtkimcontextxim.c (mb_to_utf8), xim_text_to_utf8):
+	Skip g_convert when to_codeset and from_codeset are both 'UTF-8'
+	(gnome bugzilla #58202)
+
 2001-08-06  Havoc Pennington  <hp@pobox.com>
  
  	* gdk/x11/gdkimage-x11.c (_gdk_x11_get_image): The whole 

modules/input/gtkimcontextxim.c

@@ -281,14 +281,18 @@ mb_to_utf8 (GtkIMContextXIM *context_xim,
   GError *error = NULL;
   gchar *result;
 
-  result = g_convert (str, -1,
-		      "UTF-8", context_xim->mb_charset,
-		      NULL, NULL, &error);
-
-  if (!result)
+  if (strcmp (context_xim->mb_charset, "UTF-8") == 0)
+    result = g_strdup (str);
+  else
     {
-      g_warning ("Error converting text from IM to UTF-8: %s\n", error->message);
-      g_error_free (error);
+      result = g_convert (str, -1,
+			  "UTF-8", context_xim->mb_charset,
+			  NULL, NULL, &error);
+      if (!result)
+	{
+	  g_warning ("Error converting text from IM to UTF-8: %s\n", error->message);
+	  g_error_free (error);
+	}
     }
   
   return result;
@@ -603,11 +607,14 @@ xim_text_to_utf8 (GtkIMContextXIM *context, XIMText *xim_text, gchar **text)
 	  return 0;
 	}
 
-      result = g_convert (xim_text->string.multi_byte,
-			  -1,
-			  "UTF-8",
-			  context->mb_charset,
-			  NULL, NULL, &error);
+      if (strcmp (context->mb_charset, "UTF-8") == 0)
+	result = g_strdup (xim_text->string.multi_byte);
+      else
+	result = g_convert (xim_text->string.multi_byte,
+			    -1,
+			    "UTF-8",
+			    context->mb_charset,
+			    NULL, NULL, &error);
       
       if (result)
 	{