# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 1003913285 0
# Node ID 35c23df11d16e6ec94daacd6c6cd2265e3aeefe4
# Parent  04a5f68f640c1a8d0983c90ea9b9d592c23ba74f
[gaim-migrate @ 2609]
cvs commit

committer: Tailor Script <tailor@pidgin.im>

diff -r 04a5f68f640c -r 35c23df11d16 src/core.c
--- a/src/core.c	Wed Oct 24 08:35:55 2001 +0000
+++ b/src/core.c	Wed Oct 24 08:48:05 2001 +0000
@@ -35,6 +35,7 @@
 #include <signal.h>
 #include <getopt.h>
 #include <stdarg.h>
+#include <string.h>
 
 #include "gaim.h"
 
diff -r 04a5f68f640c -r 35c23df11d16 src/gtkimhtml.c
--- a/src/gtkimhtml.c	Wed Oct 24 08:35:55 2001 +0000
+++ b/src/gtkimhtml.c	Wed Oct 24 08:48:05 2001 +0000
@@ -86,17 +86,18 @@
 	gchar **image;
 };
 
-static gchar* getcharset()
+static gchar*
+getcharset ()
 {
-	static gchar charset[64];
+	static gchar charset [64];
 #ifdef HAVE_LANGINFO_CODESET
-	gchar *ch = nl_langinfo(CODESET);
-	if (strncasecmp(ch, "iso-", 4) == 0)
-		g_snprintf(charset, sizeof(charset), "iso%s", ch + 4);
+	gchar *ch = nl_langinfo (CODESET);
+	if (!g_strncasecmp (ch, "iso-", 4))
+		g_snprintf (charset, sizeof (charset), "iso%s", ch + 4);
 	else
-		g_snprintf(charset, sizeof(charset), ch);
+		g_snprintf (charset, sizeof (charset), ch);
 #else
-	g_snprintf(charset, sizeof(charset), "iso8859-*");
+	g_snprintf (charset, sizeof (charset), "iso8859-*");
 #endif
 	return charset;
 }
diff -r 04a5f68f640c -r 35c23df11d16 src/util.c
--- a/src/util.c	Wed Oct 24 08:35:55 2001 +0000
+++ b/src/util.c	Wed Oct 24 08:48:05 2001 +0000
@@ -127,7 +127,7 @@
 	while (*c) {
 		if (!g_strncasecmp(c, "<A", 2)) {
 			while (1) {
-				if (!strncasecmp(c, "/A>", 3)) {
+				if (!g_strncasecmp(c, "/A>", 3)) {
 					break;
 				}
 				text[cnt++] = *c;