[Gaim-commits] CVS: gaim/src/protocols/icq eventhandle.c,1.1,1.2 filesession.c,1.1,1.2 icqevent.c,1.1,1.2 queue.c,1.1,1.2 tcplink.c,1.1,1.2

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/icq
In directory usw-pr-cvs1:/tmp/cvs-serv11034/src/protocols/icq

Modified Files:
	eventhandle.c filesession.c icqevent.c queue.c tcplink.c 
Log Message:
Wall!


Index: eventhandle.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/icq/eventhandle.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- eventhandle.c	2001/07/31 01:00:38	1.1
+++ eventhandle.c	2001/10/13 00:06:18	1.2
@@ -95,7 +95,6 @@
 
 void icq_HandleChatRequestEvent(icq_Event *pbase, icq_Link *icqlink)
 {
-  icq_ChatRequestEvent *pevent=(icq_ChatRequestEvent *)pbase;
   icq_MessageEvent *pmsgevent=(icq_MessageEvent *)pmsgevent;
 
   struct tm *ptime=localtime(&(pbase->time));

Index: filesession.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/icq/filesession.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- filesession.c	2001/07/31 01:00:38	1.1
+++ filesession.c	2001/10/13 00:06:18	1.2
@@ -37,6 +37,7 @@
 #include "icqlib.h"
 #include "filesession.h"
 #include "stdpackets.h"
+#include "socketmanager.h"
 
 icq_FileSession *icq_FileSessionNew(icq_Link *icqlink)
 {
@@ -115,7 +116,7 @@
         status, NULL);
     if (status == FILE_STATUS_SENDING)
       icq_SocketSetHandler(p->tcplink->socket, ICQ_SOCKET_WRITE,
-        icq_FileSessionSendData, p);
+        (icq_SocketHandler)icq_FileSessionSendData, p);
     else
       icq_SocketSetHandler(p->tcplink->socket, ICQ_SOCKET_WRITE, NULL, NULL);
   }

Index: icqevent.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/icq/icqevent.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- icqevent.c	2001/07/31 01:00:38	1.1
+++ icqevent.c	2001/10/13 00:06:18	1.2
@@ -382,7 +382,6 @@
 void icq_FileParsePacket(icq_Event *pbase, icq_Packet *p)
 {
   icq_FileRequestEvent *pevent=(icq_FileRequestEvent *)pbase;
-  int port;
 
   /* parse header and message data */
   icq_MessageParsePacket(pbase, p);

Index: queue.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/icq/queue.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- queue.c	2001/07/31 01:00:38	1.1
+++ queue.c	2001/10/13 00:06:18	1.2
@@ -26,6 +26,7 @@
 
 #include "icqlib.h"
 #include "queue.h"
+#include "udp.h"
 
 void icq_UDPQueueNew(icq_Link *icqlink)
 {

Index: tcplink.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/icq/tcplink.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tcplink.c	2001/07/31 01:00:38	1.1
+++ tcplink.c	2001/10/13 00:06:18	1.2
@@ -47,6 +47,7 @@
 #include "chatsession.h"
 #include "filesession.h"
 #include "contacts.h"
+#include "socketmanager.h"
 
 icq_TCPLink *icq_TCPLinkNew(icq_Link *icqlink)
 {
@@ -453,7 +454,7 @@
 #endif /* TCP_PACKET_TRACE */
 
   icq_SocketSetHandler(plink->socket, ICQ_SOCKET_WRITE,
-    icq_TCPLinkOnConnect, plink);
+    (icq_SocketHandler)icq_TCPLinkOnConnect, plink);
   plink->connect_timeout=icq_TimeoutNew(TCP_LINK_CONNECT_TIMEOUT,
     (icq_TimeoutHandler)icq_TCPLinkClose, plink);
   
@@ -492,7 +493,7 @@
 
     /* install socket handler for new socket */
     icq_SocketSetHandler(socket_fd, ICQ_SOCKET_READ, 
-      icq_TCPLinkOnDataReceived, pnewlink);
+      (icq_SocketHandler)icq_TCPLinkOnDataReceived, pnewlink);
   }
 
   /* set the socket to non-blocking */
@@ -542,7 +543,7 @@
 
   plink->mode|=TCP_LINK_MODE_LISTEN;
 
-  icq_SocketSetHandler(plink->socket, ICQ_SOCKET_READ, icq_TCPLinkAccept,
+  icq_SocketSetHandler(plink->socket, ICQ_SOCKET_READ, (icq_SocketHandler)icq_TCPLinkAccept,
     plink);
 
   return 0;
@@ -758,7 +759,7 @@
   {
     icq_SocketSetHandler(plink->socket, ICQ_SOCKET_WRITE, NULL, NULL);
     icq_SocketSetHandler(plink->socket, ICQ_SOCKET_READ, 
-      icq_TCPLinkOnConnect, plink);
+      (icq_SocketHandler)icq_TCPLinkOnConnect, plink);
     return;
   }
 
@@ -776,7 +777,7 @@
   plink->mode&= ~TCP_LINK_MODE_CONNECTING;
 
   icq_SocketSetHandler(plink->socket, ICQ_SOCKET_READ, 
-    icq_TCPLinkOnDataReceived, plink);
+    (icq_SocketHandler)icq_TCPLinkOnDataReceived, plink);
   icq_SocketSetHandler(plink->socket, ICQ_SOCKET_WRITE, NULL, NULL);
 
   /* socket is now connected, notify each request that connection