# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 992767064 0
# Node ID 3366311426df3264e3068f454cacafffaa70dcbe
# Parent  21f1f1e0d4c58544a1cc2635e39c94eb9fc91437
[gaim-migrate @ 2058]
little things

committer: Tailor Script <tailor@pidgin.im>

diff -r 21f1f1e0d4c5 -r 3366311426df src/buddy.c
--- a/src/buddy.c	Sun Jun 17 04:35:09 2001 +0000
+++ b/src/buddy.c	Sun Jun 17 08:37:44 2001 +0000
@@ -698,13 +698,13 @@
 			       event->button, event->time);
 
 	} else if (event->type == GDK_3BUTTON_PRESS && event->button == 2) {
-		if (!strcasecmp("zilding", normalize(b->name)))
+		if (!g_strcasecmp("zilding", normalize(b->name)))
 			show_ee_dialog(0);
-		else if (!strcasecmp("robflynn", normalize(b->name)))
+		else if (!g_strcasecmp("robflynn", normalize(b->name)))
 			show_ee_dialog(1);
-		else if (!strcasecmp("flynorange", normalize(b->name)))
+		else if (!g_strcasecmp("flynorange", normalize(b->name)))
 			show_ee_dialog(2);
-		else if (!strcasecmp("ewarmenhoven", normalize(b->name)))
+		else if (!g_strcasecmp("ewarmenhoven", normalize(b->name)))
 			show_ee_dialog(3);
 
 	} else {
@@ -1541,7 +1541,7 @@
 		grp = gc->groups;
 		while (grp) {
 			g = (struct group *)grp->data;
-			if (!strcasecmp(normalize(g->name), grpname)) {
+			if (!g_strcasecmp(normalize(g->name), grpname)) {
 					g_free(grpname);
 					return g;
 			}
@@ -1556,7 +1556,7 @@
 			grp = z->groups;
 			while (grp) {
 				g = (struct group *)grp->data;
-				if (!strcasecmp(normalize(g->name), grpname)) {
+				if (!g_strcasecmp(normalize(g->name), grpname)) {
 						g_free(grpname);
 						return g;
 				}
@@ -1733,7 +1733,7 @@
 		/* check and see if we're signed on as the pouncer */
 		if (u->gc == NULL) continue;
 		
-                if (!strcasecmp(who, normalize(b->name))) { /* find someone to pounce */
+                if (!g_strcasecmp(who, normalize(b->name))) { /* find someone to pounce */
 			if (b->options & OPT_POUNCE_POPUP) {
 				c = find_conversation(name);
 				if (c == NULL)
@@ -1867,7 +1867,7 @@
 
 	while (m) {
 		g = (struct group_show *)m->data;
-		if (!strcasecmp(normalize(g->name), who))
+		if (!g_strcasecmp(normalize(g->name), who))
 			break;
 		g = NULL;
 		m = m->next;
@@ -1884,7 +1884,7 @@
 
 	while (m) {
 		b = (struct buddy_show *)m->data;
-		if (!strcasecmp(normalize(b->name), who))
+		if (!g_strcasecmp(normalize(b->name), who))
 			break;
 		b = NULL;
 		m = m->next;
@@ -2910,7 +2910,7 @@
 				g_snprintf(name, strlen(c + 2) + 1, "%s", c + 2);
 				n = g_strdup(normalize(name));
 				while (d) {
-					if (!strcasecmp(n, normalize(d->data)))
+					if (!g_strcasecmp(n, normalize(d->data)))
 						break;
 					d = d->next;
 				}
@@ -2926,7 +2926,7 @@
 				g_snprintf(name, strlen(c + 2) + 1, "%s", c + 2);
 				n = g_strdup(normalize(name));
 				while (d) {
-					if (!strcasecmp(n, normalize(d->data)))
+					if (!g_strcasecmp(n, normalize(d->data)))
 						break;
 					d = d->next;
 				}
diff -r 21f1f1e0d4c5 -r 3366311426df src/buddy_chat.c
--- a/src/buddy_chat.c	Sun Jun 17 04:35:09 2001 +0000
+++ b/src/buddy_chat.c	Sun Jun 17 08:37:44 2001 +0000
@@ -361,7 +361,7 @@
 	/* k, so now we've gotten past all the HTML crap. */
 	if (!*c)
 		return FALSE;
-	if (!strncasecmp(c, "/me ", 4)) {
+	if (!g_strncasecmp(c, "/me ", 4)) {
 		sprintf(c, "%s", c + 4);
 		return TRUE;
 	} else
@@ -379,7 +379,7 @@
 	}
 
 	while (ignore) {
-		if (!strcasecmp(who, ignore->data))
+		if (!g_strcasecmp(who, ignore->data))
 			return;
 		ignore = ignore->next;
 	}
@@ -387,7 +387,7 @@
 
 	if (!(flag & WFLAG_WHISPER)) {
 		str = g_strdup(normalize(who));
-		if (!strcasecmp(str, normalize(b->gc->username))) {
+		if (!g_strcasecmp(str, normalize(b->gc->username))) {
 			debug_printf("%s %s\n", normalize(who), normalize(b->gc->username));
 			if (b->makesound && (sound_options & OPT_SOUND_CHAT_YOU_SAY))
 				play_sound(CHAT_YOU_SAY);
@@ -545,7 +545,7 @@
 
 	ignored = b->ignored;
 	while (ignored) {
-		if (!strcasecmp(name, ignored->data))
+		if (!g_strcasecmp(name, ignored->data))
 			break;
 		ignored = ignored->next;
 	}
@@ -588,7 +588,7 @@
 	char tmp[BUF_LONG];
 
 	while (names) {
-		if (!strcasecmp((char *)names->data, old)) {
+		if (!g_strcasecmp((char *)names->data, old)) {
 			char *tmp2 = names->data;
 			b->in_room = g_list_remove(b->in_room, names->data);
 			while (items) {
@@ -612,7 +612,7 @@
 	pos = g_list_index(b->in_room, name);
 
 	while (ignored) {
-		if (!strcasecmp(old, ignored->data))
+		if (!g_strcasecmp(old, ignored->data))
 			break;
 		ignored = ignored->next;
 	}
@@ -648,7 +648,7 @@
 	plugin_event(event_chat_buddy_leave, b->gc, b->name, buddy, 0);
 
 	while (names) {
-		if (!strcasecmp((char *)names->data, buddy)) {
+		if (!g_strcasecmp((char *)names->data, buddy)) {
 			char *tmp = names->data;
 			b->in_room = g_list_remove(b->in_room, names->data);
 			while (items) {
@@ -722,7 +722,7 @@
 
 	ignored = b->ignored;
 	while (ignored) {
-		if (!strcasecmp(name, ignored->data))
+		if (!g_strcasecmp(name, ignored->data))
 			break;
 		ignored = ignored->next;
 	}
diff -r 21f1f1e0d4c5 -r 3366311426df src/conversation.c
--- a/src/conversation.c	Sun Jun 17 04:35:09 2001 +0000
+++ b/src/conversation.c	Sun Jun 17 08:37:44 2001 +0000
@@ -170,7 +170,7 @@
 
 	while (cnv) {
 		c = (struct conversation *)cnv->data;
-		if (!strcasecmp(cuser, normalize(c->name))) {
+		if (!g_strcasecmp(cuser, normalize(c->name))) {
 			g_free(cuser);
 			return c;
 		}
@@ -215,7 +215,7 @@
 
 	while (lc) {
 		l = (struct log_conversation *)lc->data;
-		if (!strcasecmp(pname, normalize(l->name))) {
+		if (!g_strcasecmp(pname, normalize(l->name))) {
 			g_free(pname);
 			return l;
 		}
@@ -930,8 +930,8 @@
 	char *s;
 
 	s = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
-	if (!strncasecmp(&s[start], s1, strlen(s1)) &&
-	    !strncasecmp(&s[finish - strlen(s2)], s2, strlen(s2))) {
+	if (!g_strncasecmp(&s[start], s1, strlen(s1)) &&
+	    !g_strncasecmp(&s[finish - strlen(s2)], s2, strlen(s2))) {
 		if (really) {
 			gtk_editable_delete_text(GTK_EDITABLE(entry), start, start + strlen(s1));
 			gtk_editable_delete_text(GTK_EDITABLE(entry), finish - strlen(s2) - strlen(s1),
diff -r 21f1f1e0d4c5 -r 3366311426df src/dialogs.c
--- a/src/dialogs.c	Sun Jun 17 04:35:09 2001 +0000
+++ b/src/dialogs.c	Sun Jun 17 08:37:44 2001 +0000
@@ -566,7 +566,7 @@
 	destroy_dialog(NULL, imdialog);
 	imdialog = NULL;
         
-	if (!strcasecmp(who, "")) {
+	if (!g_strcasecmp(who, "")) {
 		g_free(who);
 		return;
 	}
@@ -589,7 +589,7 @@
 	destroy_dialog(NULL, infodialog);
 	infodialog = NULL;
         
-	if (!strcasecmp(who, "")) {
+	if (!g_strcasecmp(who, "")) {
 		g_free(who);
 		return;
 	}
@@ -1510,7 +1510,7 @@
 	new1 = gtk_entry_get_text(GTK_ENTRY(b->new1));
 	new2 = gtk_entry_get_text(GTK_ENTRY(b->new2));
 
-	if (strcasecmp(new1, new2)) {
+	if (g_strcasecmp(new1, new2)) {
 		do_error_dialog(_("New Passwords Do Not Match"), _("Gaim - Change Password Error"));
 		return ;
 	}
@@ -1806,7 +1806,7 @@
 		char *n;
 		n = g_strdup(normalize(name));
 		while (d) {
-			if (!strcasecmp(n, normalize(d->data)))
+			if (!g_strcasecmp(n, normalize(d->data)))
 				break;
 			d = d->next;
 		}
@@ -1823,7 +1823,7 @@
 		char *n;
 		n = g_strdup(normalize(name));
 		while (d) {
-			if (!strcasecmp(n, normalize(d->data)))
+			if (!g_strcasecmp(n, normalize(d->data)))
 				break;
 			d = d->next;
 		}
@@ -2936,7 +2936,7 @@
         fgets(first, 64, f);
 
 	/* AIM 4 buddy list */
-	if (!strcasecmp(first, "Config {\n")) {
+	if (!g_strcasecmp(first, "Config {\n")) {
 		debug_printf("aim 4\n");
 		rewind(f);
 		translate_blt (f, buf);
diff -r 21f1f1e0d4c5 -r 3366311426df src/gtkimhtml.c
--- a/src/gtkimhtml.c	Sun Jun 17 04:35:09 2001 +0000
+++ b/src/gtkimhtml.c	Sun Jun 17 08:37:44 2001 +0000
@@ -510,7 +510,7 @@
 	GList *chunks;
 	struct line_info *line;
 	gfloat x, y;
-	guint32 width, height;
+	gint width, height;
 
 	x = GTK_LAYOUT (imhtml)->hadjustment->value;
 	y = GTK_LAYOUT (imhtml)->vadjustment->value;
@@ -1591,7 +1591,7 @@
 
 		for (i = 0; choices [i]; i++) {
 			for (j = 0; fontnames [j]; j++)
-				if (!strcasecmp (fontnames [j], choices [i]))
+				if (!g_strcasecmp (fontnames [j], choices [i]))
 					break;
 			if (fontnames [j])
 				break;
@@ -1606,7 +1606,7 @@
 
 	if (!choice) {
 		for (i = 0; fontnames [i]; i++)
-			if (!strcasecmp (fontnames [i], DEFAULT_FONT_NAME))
+			if (!g_strcasecmp (fontnames [i], DEFAULT_FONT_NAME))
 				break;
 		if (fontnames [i])
 			choice = g_strdup (DEFAULT_FONT_NAME);
diff -r 21f1f1e0d4c5 -r 3366311426df src/oscar.c
--- a/src/oscar.c	Sun Jun 17 04:35:09 2001 +0000
+++ b/src/oscar.c	Sun Jun 17 08:37:44 2001 +0000
@@ -730,7 +730,7 @@
 	struct oscar_data *od = pos->gc->proto_data;
 	char in = '\0';
 	int x = 0;
-	char m[17];
+	unsigned char m[17];
 
 	while (read(pos->fd, &in, 1) == 1) {
 		if (in == '\n')
@@ -1851,15 +1851,15 @@
 int gaim_parse_misses(struct aim_session_t *sess,
 		      struct command_rx_struct *command, ...) {
 	va_list ap;
-	u_short chan, nummissed, reason;
+	unsigned short chan, nummissed, reason;
 	struct aim_userinfo_s *userinfo;
 	char buf[1024];
 
 	va_start(ap, command);
-	chan = (u_short)va_arg(ap, u_int);
+	chan = (unsigned short)va_arg(ap, unsigned int);
 	userinfo = va_arg(ap, struct aim_userinfo_s *);
-	nummissed = (u_short)va_arg(ap, u_int);
-	reason = (u_short)va_arg(ap, u_int);
+	nummissed = (unsigned short)va_arg(ap, unsigned int);
+	reason = (unsigned short)va_arg(ap, unsigned int);
 	va_end(ap);
 
 	switch(reason) {
@@ -1897,11 +1897,11 @@
 		      struct command_rx_struct *command, ...) {
 	va_list ap;
 	char *destn;
-	u_short reason;
+	unsigned short reason;
 	char buf[1024];
 
 	va_start(ap, command);
-	reason = (u_short)va_arg(ap, u_int);
+	reason = (unsigned short)va_arg(ap, unsigned int);
 	destn = va_arg(ap, char *);
 	va_end(ap);
 
@@ -1916,11 +1916,11 @@
 		      struct command_rx_struct *command, ...) {
 	va_list ap;
 	char *destn;
-	u_short reason;
+	unsigned short reason;
 	char buf[1024];
 
 	va_start(ap, command);
-	reason = (u_short)va_arg(ap, u_int);
+	reason = (unsigned short)va_arg(ap, unsigned int);
 	destn = va_arg(ap, char *);
 	va_end(ap);
 
@@ -1945,7 +1945,7 @@
 			 struct command_rx_struct *command, ...) {
 	struct aim_userinfo_s *info;
 	char *prof_enc = NULL, *prof = NULL;
-	u_short infotype;
+	unsigned short infotype;
 	char buf[BUF_LONG];
 	struct gaim_connection *gc = sess->aux_data;
 	va_list ap;
@@ -1955,7 +1955,7 @@
 	info = va_arg(ap, struct aim_userinfo_s *);
 	prof_enc = va_arg(ap, char *);
 	prof = va_arg(ap, char *);
-	infotype = (u_short)va_arg(ap, u_int);
+	infotype = (unsigned short)va_arg(ap, unsigned int);
 	va_end(ap);
 
 	if (info->membersince)
@@ -2000,12 +2000,12 @@
 int gaim_parse_motd(struct aim_session_t *sess,
 		    struct command_rx_struct *command, ...) {
 	char *msg;
-	u_short id;
+	unsigned short id;
 	va_list ap;
 	char buildbuf[150];
 
 	va_start(ap, command);
-	id  = (u_short)va_arg(ap, u_int);
+	id  = (unsigned short)va_arg(ap, unsigned int);
 	msg = va_arg(ap, char *);
 	va_end(ap);
 
@@ -2023,12 +2023,12 @@
 int gaim_chatnav_info(struct aim_session_t *sess,
 		      struct command_rx_struct *command, ...) {
 	va_list ap;
-	u_short type;
+	unsigned short type;
 	struct gaim_connection *gc = sess->aux_data;
 	struct oscar_data *odata = (struct oscar_data *)gc->proto_data;
 
 	va_start(ap, command);
-	type = (u_short)va_arg(ap, u_int);
+	type = (unsigned short)va_arg(ap, unsigned int);
 
 	switch(type) {
 		case 0x0002: {
@@ -2036,7 +2036,7 @@
 			struct aim_chat_exchangeinfo *exchanges;
 			int exchangecount, i = 0;
 
-			maxrooms = (u_char)va_arg(ap, u_int);
+			maxrooms = (unsigned char)va_arg(ap, unsigned int);
 			exchangecount = va_arg(ap, int);
 			exchanges = va_arg(ap, struct aim_chat_exchangeinfo *);
 			va_end(ap);
@@ -2058,19 +2058,19 @@
 			break;
 		case 0x0008: {
 			char *fqcn, *name, *ck;
-			u_short instance, flags, maxmsglen, maxoccupancy, unknown, exchange;
+			unsigned short instance, flags, maxmsglen, maxoccupancy, unknown, exchange;
 			unsigned char createperms;
 			unsigned long createtime;
 
 			fqcn = va_arg(ap, char *);
-			instance = (u_short)va_arg(ap, u_int);
-			exchange = (u_short)va_arg(ap, u_int);
-			flags = (u_short)va_arg(ap, u_int);
+			instance = (unsigned short)va_arg(ap, unsigned int);
+			exchange = (unsigned short)va_arg(ap, unsigned int);
+			flags = (unsigned short)va_arg(ap, unsigned int);
 			createtime = va_arg(ap, unsigned long);
-			maxmsglen = (u_short)va_arg(ap, u_int);
-			maxoccupancy = (u_short)va_arg(ap, u_int);
+			maxmsglen = (unsigned short)va_arg(ap, unsigned int);
+			maxoccupancy = (unsigned short)va_arg(ap, unsigned int);
 			createperms = (unsigned char)va_arg(ap, int);
-			unknown = (u_short)va_arg(ap, u_int);
+			unknown = (unsigned short)va_arg(ap, unsigned int);
 			name = va_arg(ap, char *);
 			ck = va_arg(ap, char *);
 			va_end(ap);
@@ -2172,11 +2172,11 @@
   */
 int gaim_parse_msgack(struct aim_session_t *sess, struct command_rx_struct *command, ...) {
 	va_list ap;
-	u_short type;
+	unsigned short type;
 	char *sn = NULL;
 
 	va_start(ap, command);
-	type = (u_short)va_arg(ap, u_int);
+	type = (unsigned short)va_arg(ap, unsigned int);
 	sn = va_arg(ap, char *);
 	va_end(ap);
 
@@ -2298,11 +2298,11 @@
 
 int gaim_parse_buddyrights(struct aim_session_t *sess, struct command_rx_struct *command, ...) {
 	va_list ap;
-	u_short maxbuddies, maxwatchers;
+	unsigned short maxbuddies, maxwatchers;
 
 	va_start(ap, command);
-	maxbuddies = (u_short)va_arg(ap, u_int);
-	maxwatchers = (u_short)va_arg(ap, u_int);
+	maxbuddies = (unsigned short)va_arg(ap, unsigned int);
+	maxwatchers = (unsigned short)va_arg(ap, unsigned int);
 	va_end(ap);
 
 	debug_printf("buddy list rights: Max buddies = %d / Max watchers = %d\n", maxbuddies, maxwatchers);
@@ -2311,12 +2311,12 @@
 }
 
 int gaim_bosrights(struct aim_session_t *sess, struct command_rx_struct *command, ...) {
-	u_short maxpermits, maxdenies;
+	unsigned short maxpermits, maxdenies;
 	va_list ap;
 
 	va_start(ap, command);
-	maxpermits = (u_short)va_arg(ap, u_int);
-	maxdenies = (u_short)va_arg(ap, u_int);
+	maxpermits = (unsigned short)va_arg(ap, unsigned int);
+	maxdenies = (unsigned short)va_arg(ap, unsigned int);
 	va_end(ap);
 
 	debug_printf("BOS rights: Max permit = %d / Max deny = %d\n", maxpermits, maxdenies);
diff -r 21f1f1e0d4c5 -r 3366311426df src/perl.c
--- a/src/perl.c	Sun Jun 17 04:35:09 2001 +0000
+++ b/src/perl.c	Sun Jun 17 08:37:44 2001 +0000
@@ -272,7 +272,7 @@
 XS (XS_GAIM_register)
 {
 	char *name, *ver, *callback, *unused; /* exactly like X-Chat, eh? :) */
-	int junk;
+	unsigned int junk;
 	struct perlscript *scp;
 	dXSARGS;
 	items = 0;
@@ -295,7 +295,7 @@
 XS (XS_GAIM_get_info)
 {
 	int i = 0;
-	int junk;
+	unsigned int junk;
 	dXSARGS;
 	items = 0;
 
@@ -343,7 +343,7 @@
 {
 	char *title;
 	char *message;
-	int junk;
+	unsigned int junk;
 	dXSARGS;
 	items = 0;
 
@@ -362,7 +362,7 @@
 	GSList *list = NULL;
 	GSList *mem;
 	int i = 0;
-	int junk;
+	unsigned int junk;
 	dXSARGS;
 	items = 0;
 
@@ -392,7 +392,7 @@
 	GSList *list = NULL;
 	GSList *mem;
 	int i = 0;
-	int junk;
+	unsigned int junk;
 	dXSARGS;
 	items = 0;
 
@@ -415,7 +415,7 @@
 
 XS (XS_GAIM_command)
 {
-	int junk;
+	unsigned int junk;
 	char *command = NULL;
 	dXSARGS;
 	items = 0;
@@ -474,7 +474,7 @@
 {
 	GSList *c = connections;
 	struct gaim_connection *gc;
-	int junk;
+	unsigned int junk;
 	struct buddy *buddy = NULL;
 	char *nick;
 	dXSARGS;
@@ -506,7 +506,7 @@
 {
 	char *nick, *what, *isauto;
 	struct conversation *c;
-	int junk;
+	unsigned int junk;
 	dXSARGS;
 	items = 0;
 
@@ -527,7 +527,7 @@
 	struct gaim_connection *gc;
 	struct conversation *b = NULL;
 	GSList *bcs;
-	int junk;
+	unsigned int junk;
 	dXSARGS;
 	items = 0;
 
@@ -570,7 +570,7 @@
 
 XS (XS_GAIM_add_event_handler)
 {
-	int junk;
+	unsigned int junk;
 	struct _perl_event_handlers *handler;
 	dXSARGS;
 	items = 0;
@@ -595,7 +595,7 @@
 
 XS (XS_GAIM_add_timeout_handler)
 {
-	int junk;
+	unsigned int junk;
 	long timeout;
 	struct _perl_timeout_handlers *handler;
 	dXSARGS;
diff -r 21f1f1e0d4c5 -r 3366311426df src/prefs.c
--- a/src/prefs.c	Sun Jun 17 04:35:09 2001 +0000
+++ b/src/prefs.c	Sun Jun 17 08:37:44 2001 +0000
@@ -1040,7 +1040,7 @@
 	while (c) {
 		if (c - text > len - 30)
 			break;	/* assume no chat rooms 30 from end, padding */
-		if (!strncasecmp(AOL_SRCHSTR, c, strlen(AOL_SRCHSTR))) {
+		if (!g_strncasecmp(AOL_SRCHSTR, c, strlen(AOL_SRCHSTR))) {
 			char *t;
 			int len = 0;
 			int exchange;
@@ -1096,7 +1096,7 @@
 
 	while (crs) {
 		cr2 = (struct chat_room *)crs->data;
-		if (!strcasecmp(cr->name, cr2->name))
+		if (!g_strcasecmp(cr->name, cr2->name))
 			 return;
 		crs = crs->next;
 	}
@@ -1706,7 +1706,7 @@
 
 static struct away_message *cur_message;
 static GtkWidget *away_text;
-static GtkWidget *make_away_button = NULL;;
+static GtkWidget *make_away_button = NULL;
 
 void away_list_clicked(GtkWidget *widget, struct away_message *a)
 {
diff -r 21f1f1e0d4c5 -r 3366311426df src/proxy.c
--- a/src/proxy.c	Sun Jun 17 04:35:09 2001 +0000
+++ b/src/proxy.c	Sun Jun 17 08:37:44 2001 +0000
@@ -57,7 +57,8 @@
 static void no_one_calls(gpointer data, gint source, GdkInputCondition cond)
 {
 	struct PHB *phb = data;
-	int len, error = ETIMEDOUT;
+	unsigned int len;
+	int error = ETIMEDOUT;
 	debug_printf("Connected\n");
 	len = sizeof(error);
 	if (getsockopt(source, SOL_SOCKET, SO_ERROR, &error, &len) < 0) {
@@ -118,7 +119,8 @@
 			return -1;
 		}
 	} else {
-		int len, error = ETIMEDOUT;
+		unsigned int len;
+		int error = ETIMEDOUT;
 		debug_printf("Connect didn't block\n");
 		len = sizeof(error);
 		if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &error, &len) < 0) {
@@ -177,7 +179,8 @@
 {
 	char cmd[384];
 	struct PHB *phb = data;
-	int len, error = ETIMEDOUT;
+	unsigned int len;
+	int error = ETIMEDOUT;
 	debug_printf("Connected\n");
 	if (phb->inpa > 0)
 		gdk_input_remove(phb->inpa);
@@ -266,7 +269,8 @@
 			return -1;
 		}
 	} else {
-		int len, error = ETIMEDOUT;
+		unsigned int len;
+		int error = ETIMEDOUT;
 		debug_printf("Connect didn't block\n");
 		len = sizeof(error);
 		if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &error, &len) < 0) {
@@ -308,7 +312,8 @@
 	unsigned char packet[12];
 	struct hostent *hp;
 	struct PHB *phb = data;
-	int len, error = ETIMEDOUT;
+	unsigned int len;
+	int error = ETIMEDOUT;
 	debug_printf("Connected\n");
 	if (phb->inpa > 0)
 		gdk_input_remove(phb->inpa);
@@ -389,7 +394,8 @@
 			return -1;
 		}
 	} else {
-		int len, error = ETIMEDOUT;
+		unsigned int len;
+		int error = ETIMEDOUT;
 		debug_printf("Connect didn't block\n");
 		len = sizeof(error);
 		if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &error, &len) < 0) {
@@ -539,7 +545,8 @@
 	unsigned char buf[512];
 	int i;
 	struct PHB *phb = data;
-	int len, error = ETIMEDOUT;
+	unsigned int len;
+	int error = ETIMEDOUT;
 	debug_printf("Connected\n");
 	if (phb->inpa > 0)
 		gdk_input_remove(phb->inpa);
@@ -616,7 +623,8 @@
 			return -1;
 		}
 	} else {
-		int len, error = ETIMEDOUT;
+		unsigned int len;
+		int error = ETIMEDOUT;
 		debug_printf("Connect didn't block\n");
 		len = sizeof(error);
 		if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &error, &len) < 0) {
diff -r 21f1f1e0d4c5 -r 3366311426df src/server.c
--- a/src/server.c	Sun Jun 17 04:35:09 2001 +0000
+++ b/src/server.c	Sun Jun 17 08:37:44 2001 +0000
@@ -603,7 +603,7 @@
 
 		while (cnv) {
 			cv = (struct conversation *)cnv->data;
-			if (!strcasecmp(who, normalize(cv->name))) {
+			if (!g_strcasecmp(who, normalize(cv->name))) {
 				if (display_options & OPT_DISP_ONE_WINDOW) {
 					set_convo_tab_label(cv, b->name);
 				} else {
diff -r 21f1f1e0d4c5 -r 3366311426df src/sound.c
--- a/src/sound.c	Sun Jun 17 04:35:09 2001 +0000
+++ b/src/sound.c	Sun Jun 17 08:37:44 2001 +0000
@@ -76,7 +76,7 @@
 }
 
 
-static void play_audio(char *data, int size)
+static void play_audio(unsigned char *data, int size)
 {
 	int fd;
 
diff -r 21f1f1e0d4c5 -r 3366311426df src/toc.c
--- a/src/toc.c	Sun Jun 17 04:35:09 2001 +0000
+++ b/src/toc.c	Sun Jun 17 08:37:44 2001 +0000
@@ -291,7 +291,7 @@
 static unsigned char *roast_password(char *pass)
 {
 	/* Trivial "encryption" */
-	static char rp[256];
+	static unsigned char rp[256];
 	static char *roast = ROAST;
 	int pos = 2;
 	int x;
@@ -369,7 +369,7 @@
 
 	if (tdt->state == STATE_SIGNON_REQUEST) {
 		debug_printf("* TOC sends client SIGN_ON reply\n");
-		if (strncasecmp(buf + sizeof(struct sflap_hdr), "SIGN_ON", strlen("SIGN_ON"))) {
+		if (g_strncasecmp(buf + sizeof(struct sflap_hdr), "SIGN_ON", strlen("SIGN_ON"))) {
 			debug_printf("Didn't get SIGN_ON! buf was: %s\n",
 				     buf + sizeof(struct sflap_hdr));
 			hide_login_progress(gc, _("Authentication Failed"));
@@ -409,7 +409,7 @@
 
 	c = strtok(buf + sizeof(struct sflap_hdr), ":");	/* Ditch the first part */
 
-	if (!strcasecmp(c, "SIGN_ON")) {
+	if (!g_strcasecmp(c, "SIGN_ON")) {
 		/* we should only get here after a PAUSE */
 		if (tdt->state != STATE_PAUSE)
 			debug_printf("got SIGN_ON but not PAUSE!\n");
diff -r 21f1f1e0d4c5 -r 3366311426df src/util.c
--- a/src/util.c	Sun Jun 17 04:35:09 2001 +0000
+++ b/src/util.c	Sun Jun 17 08:37:44 2001 +0000
@@ -134,7 +134,7 @@
 	cpy[strlen(text)] = 0;
 	c = cpy;
 	while (*c) {
-		if (!strncasecmp(c, "<A", 2)) {
+		if (!g_strncasecmp(c, "<A", 2)) {
 			while (1) {
 				if (!strncasecmp(c, "/A>", 3)) {
 					break;
@@ -144,7 +144,7 @@
 				if (!(*c))
 					break;
 			}
-		} else if ((!strncasecmp(c, "http://", 7) || (!strncasecmp(c, "https://", 8)))) {
+		} else if ((!g_strncasecmp(c, "http://", 7) || (!g_strncasecmp(c, "https://", 8)))) {
 			t = c;
 			while (1) {
 				if (badchar(*t)) {
@@ -170,8 +170,8 @@
 				t++;
 
 			}
-		} else if (!strncasecmp(c, "www.", 4)) {
-			if (strncasecmp(c, "www..", 5)) {
+		} else if (!g_strncasecmp(c, "www.", 4)) {
+			if (g_strncasecmp(c, "www..", 5)) {
 				t = c;
 				while (1) {
 					if (badchar(*t)) {
@@ -201,7 +201,7 @@
 					t++;
 				}
 			}
-		} else if (!strncasecmp(c, "ftp://", 6)) {
+		} else if (!g_strncasecmp(c, "ftp://", 6)) {
 			t = c;
 			while (1) {
 				if (badchar(*t)) {
@@ -221,8 +221,8 @@
 				t++;
 
 			}
-		} else if (!strncasecmp(c, "ftp.", 4)) {
-			if (strncasecmp(c, "ftp..", 5)) {
+		} else if (!g_strncasecmp(c, "ftp.", 4)) {
+			if (g_strncasecmp(c, "ftp..", 5)) {
 				t = c;
 				while (1) {
 					if (badchar(*t)) {
@@ -246,7 +246,7 @@
 					t++;
 				}
 			}
-		} else if (!strncasecmp(c, "mailto:", 7)) {
+		} else if (!g_strncasecmp(c, "mailto:", 7)) {
 			t = c;
 			while (1) {
 				if (badchar(*t)) {
@@ -266,7 +266,7 @@
 				t++;
 
 			}
-		} else if (c != cpy && !strncasecmp(c, "@", 1)) {
+		} else if (c != cpy && !g_strncasecmp(c, "@", 1)) {
 			char *tmp;
 			int flag;
 			int len = 0;