changeset 2496:f0a2a9afdb77

[gaim-migrate @ 2509] Wall! committer: Tailor Script <tailor@pidgin.im>
author Eric Warmenhoven <eric@warmenhoven.org>
date Sat, 13 Oct 2001 00:06:18 +0000
parents b46e8a80da4f
children be88e02789e0
files ChangeLog src/protocols/icq/eventhandle.c src/protocols/icq/filesession.c src/protocols/icq/icqevent.c src/protocols/icq/queue.c src/protocols/icq/tcplink.c
diffstat 6 files changed, 15 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Oct 12 22:51:10 2001 +0000
+++ b/ChangeLog	Sat Oct 13 00:06:18 2001 +0000
@@ -5,6 +5,7 @@
 	* ICQ works on big-endian platforms, e.g. sparc and ppc
 	  (thanks to Nathan Walp and Ben Miller)
 	* Better applet icon drawing (thanks to Ari Pollak)
+	* An extraordinary number of bug fixes
 
 version 0.45 (10/04/2001):
 	* New plugin event: event_chat_send_invite
--- a/src/protocols/icq/eventhandle.c	Fri Oct 12 22:51:10 2001 +0000
+++ b/src/protocols/icq/eventhandle.c	Sat Oct 13 00:06:18 2001 +0000
@@ -1,7 +1,7 @@
 /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 
 /*
- * $Id: eventhandle.c 2096 2001-07-31 01:00:39Z warmenhoven $
+ * $Id: eventhandle.c 2509 2001-10-13 00:06:18Z warmenhoven $
  *
  * Copyright (C) 1998-2001, Denis V. Dmitrienko <denis@null.net> and
  *                          Bill Soudan <soudan@kde.org>
@@ -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));
--- a/src/protocols/icq/filesession.c	Fri Oct 12 22:51:10 2001 +0000
+++ b/src/protocols/icq/filesession.c	Sat Oct 13 00:06:18 2001 +0000
@@ -1,7 +1,7 @@
 /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 
 /*
- * $Id: filesession.c 2096 2001-07-31 01:00:39Z warmenhoven $
+ * $Id: filesession.c 2509 2001-10-13 00:06:18Z warmenhoven $
  *
  * Copyright (C) 1998-2001, Denis V. Dmitrienko <denis@null.net> and
  *                          Bill Soudan <soudan@kde.org>
@@ -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);
   }
--- a/src/protocols/icq/icqevent.c	Fri Oct 12 22:51:10 2001 +0000
+++ b/src/protocols/icq/icqevent.c	Sat Oct 13 00:06:18 2001 +0000
@@ -1,7 +1,7 @@
 /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 
 /*
- * $Id: icqevent.c 2096 2001-07-31 01:00:39Z warmenhoven $
+ * $Id: icqevent.c 2509 2001-10-13 00:06:18Z warmenhoven $
  *
  * Copyright (C) 1998-2001, Denis V. Dmitrienko <denis@null.net> and
  *                          Bill Soudan <soudan@kde.org>
@@ -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);
--- a/src/protocols/icq/queue.c	Fri Oct 12 22:51:10 2001 +0000
+++ b/src/protocols/icq/queue.c	Sat Oct 13 00:06:18 2001 +0000
@@ -1,7 +1,7 @@
 /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 
 /*
- * $Id: queue.c 2096 2001-07-31 01:00:39Z warmenhoven $
+ * $Id: queue.c 2509 2001-10-13 00:06:18Z warmenhoven $
  *
  * Copyright (C) 1998-2001, Denis V. Dmitrienko <denis@null.net> and
  *                          Bill Soudan <soudan@kde.org>
@@ -26,6 +26,7 @@
 
 #include "icqlib.h"
 #include "queue.h"
+#include "udp.h"
 
 void icq_UDPQueueNew(icq_Link *icqlink)
 {
--- a/src/protocols/icq/tcplink.c	Fri Oct 12 22:51:10 2001 +0000
+++ b/src/protocols/icq/tcplink.c	Sat Oct 13 00:06:18 2001 +0000
@@ -1,7 +1,7 @@
 /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 
 /*
- * $Id: tcplink.c 2096 2001-07-31 01:00:39Z warmenhoven $
+ * $Id: tcplink.c 2509 2001-10-13 00:06:18Z warmenhoven $
  *
  * Copyright (C) 1998-2001, Denis V. Dmitrienko <denis@null.net> and
  *                          Bill Soudan <soudan@kde.org>
@@ -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