# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 968957404 0
# Node ID 7b976e5e1c3a7f90acc159fc11e9a30f49899450
# Parent  2876c40108cd7b515dbd9cad68a9575783209f01
[gaim-migrate @ 916]
i wanted to use my modem. to use my modem i had to download modem software. to download modem software i needed to use my modem. so i threw my computer away and got a cat.

committer: Tailor Script <tailor@pidgin.im>

diff -r 2876c40108cd -r 7b976e5e1c3a src/oscar.c
--- a/src/oscar.c	Thu Sep 14 17:50:56 2000 +0000
+++ b/src/oscar.c	Thu Sep 14 18:50:04 2000 +0000
@@ -866,7 +866,7 @@
 				_("AOL error"));
 
 	if (keepalv < 0)
-		update_keepalive(TRUE);
+		update_keepalive(general_options & OPT_GEN_KEEPALIVE);
 
 	return 1;
 }
@@ -927,7 +927,7 @@
 			createtime = va_arg(ap, unsigned long);
 			maxmsglen = (u_short)va_arg(ap, u_int);
 			maxoccupancy = (u_short)va_arg(ap, u_int);
-			createperms = va_arg(ap, unsigned char);
+			createperms = (unsigned char)va_arg(ap, int);
 			unknown = (u_short)va_arg(ap, u_int);
 			name = va_arg(ap, char *);
 			ck = va_arg(ap, char *);
@@ -1274,7 +1274,7 @@
 }
 
 void update_keepalive(gboolean on) {
-	if (on && keepalv < 0 && blist && (general_options & OPT_GEN_KEEPALIVE)) {
+	if (on && keepalv < 0 && blist) {
 		debug_print("allowing NOP\n");
 		keepalv = gtk_timeout_add(60000, (GtkFunction)send_keepalive, 0);
 	} else if (!on && keepalv > -1) {