ekiga r6242 - in trunk: . src/gui

[jpuydt svn gnome org]

Author: jpuydt
Date: Mon May  5 19:21:14 2008
New Revision: 6242
URL: http://svn.gnome.org/viewvc/ekiga?rev=6242&view=rev

Log:
Fixed #491517


Modified:
   trunk/ChangeLog
   trunk/src/gui/misc.cpp
   trunk/src/gui/misc.h

Modified: trunk/src/gui/misc.cpp
==============================================================================
--- trunk/src/gui/misc.cpp	(original)
+++ trunk/src/gui/misc.cpp	Mon May  5 19:21:14 2008
@@ -151,34 +151,6 @@
 
   return s2.Trim ();
 }
-
-
-gchar *
-gnomemeeting_from_iso88591_to_utf8 (PString iso_string)
-{
-  if (iso_string.IsEmpty ())
-    return NULL;
-
-  gchar *utf_8_string =
-    g_convert ((const char *) iso_string.GetPointer (),
-               iso_string.GetSize (), "UTF-8", "ISO-8859-1", 0, 0, 0);
-  
-  return utf_8_string;
-}
-
-
-gchar *
-gnomemeeting_get_utf8 (PString str)
-{
-  gchar *utf8_str = NULL;
-
-  if (g_utf8_validate ((gchar *) (const unsigned char*) str, -1, NULL))
-    utf8_str = g_strdup ((char *) (const char *) (str));
-  else
-    utf8_str = gnomemeeting_from_iso88591_to_utf8 (str);
-
-  return utf8_str;
-}
     
 
 /* Stolen from GDK */

Modified: trunk/src/gui/misc.h
==============================================================================
--- trunk/src/gui/misc.h	(original)
+++ trunk/src/gui/misc.h	Mon May  5 19:21:14 2008
@@ -81,16 +81,6 @@
 gnomemeeting_pstring_cut (PString s);
 
 
-/* DESCRIPTION   :  /
- * BEHAVIOR      : Takes an ISO-8859-1 encoded PString, and returns an UTF-8
- *                 encoded string.
- * PRE           : An ISO-8859-1 encoded PString.
- */
-gchar *
-gnomemeeting_from_iso88591_to_utf8 (PString iso_string);
-
-
-gchar *gnomemeeting_get_utf8 (PString str);
 
 void gdk_window_set_always_on_top (GdkWindow *window, 
 				   gboolean enable);