diff src/protocols/yahoo/util.c @ 7827:ee32e030c9be

[gaim-migrate @ 8479] marv asserts that these character set conversions are more correct than the previous yahoo conversions, which assumed that pretty much everything was UTF-8. I believe him. committer: Tailor Script <[e-mail]>

--- a/src/protocols/yahoo/util.c	Wed Dec 10 07:37:13 2003 +0000
+++ b/src/protocols/yahoo/util.c	Wed Dec 10 16:48:23 2003 +0000
@@ -26,9 +26,68 @@
 
 #include "prpl.h"
 #include "debug.h"
+#include "yahoo.h"
 
 #include <string.h>
 
+/**
+ * Encode some text to send to the yahoo server.
+ *
+ * @param gc The connection handle.
+ * @param str The null terminated utf8 string to encode.
+ * @param utf8 If not @c NULL, whether utf8 is okay or not.
+ *             Even if it is okay, we may not use it. If we
+ *             used it, we set this to @c TRUE, else to
+ *             @c FALSE. If @c NULL, false is assumed, and
+ *             it is not dereferenced.
+ * @return The g_malloced string in the appropriate encoding.
+ */
+char *yahoo_string_encode(GaimConnection *gc, const char *str, gboolean *utf8)
+{
+	char *ret;
+	char *to_codeset;
+
+	if (utf8 && *utf8) /* FIXME: maybe don't use utf8 if it'll fit in latin1 */
+		return g_strdup(str);
+
+	to_codeset = "ISO-8859-1";
+
+	ret = g_convert_with_fallback(str, strlen(str), to_codeset, "UTF-8", NULL, NULL, NULL, NULL);
+	if (ret)
+		return ret;
+	else
+		return g_strdup("");
+}
+
+/**
+ * Decode some text received from the server.
+ *
+ * @param gc The gc handle.
+ * @param str The null terminated string to decode.
+ * @param utf8 Did the server tell us it was supposed to be utf8?
+ * @return The decoded, utf-8 string, which must be g_free()'d.
+ */
+char *yahoo_string_decode(GaimConnection *gc, const char *str, gboolean utf8)
+{
+	char *ret;
+	char *from_codeset;
+
+	if (utf8) {
+		if (g_utf8_validate(str, -1, NULL))
+			return g_strdup(str);
+	}
+
+	from_codeset = "ISO-8859-1";
+
+	ret = g_convert_with_fallback(str, strlen(str), "UTF-8", from_codeset, NULL, NULL, NULL, NULL);
+
+	if (ret)
+		return ret;
+	else
+		return g_strdup("");
+}
+
+
 
 /*
  * I found these on some website but i don't know that they actually