# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 967698383 0
# Node ID 12d0aaef70fb11ca103436e22ea456fe987ee083
# Parent  9d61f3d01046ac23b0109f468cdf4745bb153e8b
[gaim-migrate @ 819]
small changes. nothing big.

committer: Tailor Script <tailor@pidgin.im>

diff -r 9d61f3d01046 -r 12d0aaef70fb src/oscar.c
--- a/src/oscar.c	Thu Aug 31 03:40:17 2000 +0000
+++ b/src/oscar.c	Thu Aug 31 05:06:23 2000 +0000
@@ -47,7 +47,6 @@
 static int inpa = -1;
 static int paspa = -1;
 static int cnpa = -1;
-static int keepalive = -1;
 struct aim_session_t *gaim_sess;
 struct aim_conn_t    *gaim_conn;
 int gaim_caps = AIM_CAPS_CHAT | AIM_CAPS_SENDFILE | AIM_CAPS_GETFILE |
@@ -230,9 +229,6 @@
 	if (inpa > 0)
 		gdk_input_remove(inpa);
 	inpa = -1;
-	if (keepalive > 0)
-		gtk_timeout_remove(keepalive);
-	keepalive = -1;
 	aim_logoff(gaim_sess);
 	g_free(gaim_sess);
 	debug_print(_("Signed off.\n"));
@@ -388,12 +384,6 @@
 	return 1;
 }
 
-static int oscar_keepalive(gpointer d) {
-	debug_print("oscar: sending nop (keepalive)\n");
-	aim_bos_nop(gaim_sess, gaim_conn);
-	return 1;
-}
-
 int gaim_handle_redirect(struct aim_session_t *sess,
 			 struct command_rx_struct *command, ...) {
 	va_list ap;
@@ -442,8 +432,6 @@
 		aim_bos_clientready(sess, command->conn);
 		debug_print("Roger that, all systems go\n");
 
-		keepalive = gtk_timeout_add(30000, (GtkFunction)oscar_keepalive, NULL);
-
 		aim_bos_reqservice(sess, command->conn, AIM_CONN_TYPE_CHATNAV);
 
 		break;
diff -r 9d61f3d01046 -r 12d0aaef70fb src/server.c
--- a/src/server.c	Thu Aug 31 03:40:17 2000 +0000
+++ b/src/server.c	Thu Aug 31 05:06:23 2000 +0000
@@ -561,7 +561,6 @@
 					b->name, count);
 		debug_print(debug_buff);
 
-//		aim_chat_leaveroom(gaim_sess, b->name);
 		c = find_oscar_chat(b->name);
 		if (c != NULL) {
 			oscar_chats = g_list_remove(oscar_chats, c);