Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv27558
Modified Files:
core.c gtkimhtml.c util.c
Log Message:
cvs commit
Index: core.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/core.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- core.c 2001/10/19 02:43:18 1.16
+++ core.c 2001/10/24 08:48:05 1.17
@@ -35,6 +35,7 @@
#include <signal.h>
#include <getopt.h>
#include <stdarg.h>
+#include <string.h>
#include "gaim.h"
Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- gtkimhtml.c 2001/10/23 04:59:46 1.57
+++ gtkimhtml.c 2001/10/24 08:48:05 1.58
@@ -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;
}
Index: util.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/util.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- util.c 2001/09/30 19:58:48 1.107
+++ util.c 2001/10/24 08:48:05 1.108
@@ -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;
|
