[Licq-cvs] CVS: licq/src icqd-srv.cpp,1.14,1.15 icqd-tcp.cpp,1.30,1.31

[Jon K. <em...@us...>]

Update of /cvsroot/licq/licq/src
In directory usw-pr-cvs1:/tmp/cvs-serv26980

Modified Files:
	icqd-srv.cpp icqd-tcp.cpp 
Log Message:
Patch for URL sending by Sergey Kononenko <sergk AT kiyavia.com.ua>


Index: icqd-srv.cpp
===================================================================
RCS file: /cvsroot/licq/licq/src/icqd-srv.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- icqd-srv.cpp	2002/01/23 07:04:11	1.14
+++ icqd-srv.cpp	2002/01/28 00:54:33	1.15
@@ -396,8 +396,18 @@
   ICQEvent* result;
 
   CPU_ThroughServer *p = new CPU_ThroughServer(nUin, format, _sMessage);
-
-  gLog.Info("%sSending message through server (#%ld).\n", L_SRVxSTR, p->Sequence());
+  
+  switch (format)
+  {
+    case ICQ_CMDxSUB_MSG:
+	gLog.Info("%sSending message through server (#%ld).\n", L_SRVxSTR, p->Sequence());
+	break;	
+    case ICQ_CMDxSUB_URL:
+        gLog.Info("%sSending url through server (#%ld).\n", L_SRVxSTR, p->Sequence());
+	break;
+    default:
+	gLog.Info("%sSending misc through server (#%ld).\n", L_SRVxSTR, p->Sequence());
+  }
 
   // If we are already shutting down, don't start any events
   if (m_bShuttingDown) return NULL;

Index: icqd-tcp.cpp
===================================================================
RCS file: /cvsroot/licq/licq/src/icqd-tcp.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- icqd-tcp.cpp	2002/01/06 14:40:03	1.30
+++ icqd-tcp.cpp	2002/01/28 00:54:33	1.31
@@ -127,10 +127,7 @@
   if (!online) // send offline
   {
     e = new CEventUrl(url, description, ICQ_CMDxSND_THRUxSERVER, TIME_NOW, f);
-    CPU_ThroughServer *p = new CPU_ThroughServer(_nUin,
-       ICQ_CMDxSUB_URL | (bMultipleRecipients ? ICQ_CMDxSUB_FxMULTIREC : 0), m);
-    gLog.Info("%sSending url through server (#%ld).\n", L_SRVxSTR, p->Sequence());
-    result = SendExpectEvent_Server(_nUin, p, e);
+    result = icqSendThroughServer(_nUin, ICQ_CMDxSUB_URL | (bMultipleRecipients ? ICQ_CMDxSUB_FxMULTIREC : 0), m, e);
   }
   else
   {