[prev in list] [next in list] [prev in thread] [next in thread] 

List:       licq-cvs
Subject:    [Licq-cvs] licq/src
From:       Jon Keating <emostar () users ! sourceforge ! net>
Date:       2005-01-20 17:26:43
Message-ID: E1Crg4x-0001PJ-3D () sc8-pr-cvs1 ! sourceforge ! net
[Download RAW message or body]

Update of /cvsroot/licq/licq/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5145/src

Modified Files:
	icqd-chat.cpp icqd.cpp 
Log Message:
A few fixes to get Chat's working again. They were broken at some point.


Index: icqd-chat.cpp
===================================================================
RCS file: /cvsroot/licq/licq/src/icqd-chat.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- icqd-chat.cpp	18 Aug 2004 14:41:22 -0000	1.29
+++ icqd-chat.cpp	20 Jan 2005 17:26:40 -0000	1.30
@@ -953,14 +953,13 @@
       u->nPPID = u->m_pClient->m_nPPID;
       
       bool bFound = false;
-      if (u->m_pClient->m_nId != 0)
       {
         pthread_mutex_lock(&licqDaemon->mutex_reverseconnect);
         std::list<CReverseConnectToUserData *>::iterator iter;
         for (iter = licqDaemon->m_lReverseConnect.begin();
                          iter != licqDaemon->m_lReverseConnect.end();  iter++)
         {
-          if ((*iter)->nId == u->m_pClient->m_nId && (*iter)->nUin == u->uin)
+          if ((*iter)->nUin == u->uin)
           {
             bFound = true;
             (*iter)->bSuccess = true;
@@ -2344,7 +2343,7 @@
         if (nCurrentSocket == chatman->pipe_thread[PIPE_READ])
         {
           read(chatman->pipe_thread[PIPE_READ], buf, 1);
-          if (buf[0] == 'S')
+          if (buf[0] == 'R')
           {
             DEBUG_THREADS("[ChatManager_tep] Reloading socket info.\n");
           }

Index: icqd.cpp
===================================================================
RCS file: /cvsroot/licq/licq/src/icqd.cpp,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- icqd.cpp	15 Nov 2004 14:37:23 -0000	1.95
+++ icqd.cpp	20 Jan 2005 17:26:40 -0000	1.96
@@ -2265,7 +2265,7 @@
     if (!bIsAck)
     {
       CEventChat *e = new CEventChat(message, szChatClients, nPort, nSequence,
-                                     TIME_NOW, nFlags, nMsgID[0], nMsgID[1]);
+                                     TIME_NOW, nFlags, -1, nMsgID[0], nMsgID[1]);
       nEventType = ON_EVENT_CHAT;
       pEvent = e;
     }
@@ -2298,7 +2298,7 @@
 
       CEventFile *e = new CEventFile(szFilename, message, nFileSize,
                                      filelist, nSequence, TIME_NOW, nFlags,
-                                     nMsgID[0], nMsgID[1]);
+                                     -1, nMsgID[0], nMsgID[1]);
       nEventType = ON_EVENT_FILE;
       pEvent = e;
     }



-------------------------------------------------------
This SF.Net email is sponsored by: IntelliVIEW -- Interactive Reporting
Tool for open source databases. Create drag-&-drop reports. Save time
by over 75%! Publish reports on the web. Export to DOC, XLS, RTF, etc.
Download a FREE copy at http://www.intelliview.com/go/osdn_nl
_______________________________________________
Licq-cvs mailing list
Licq-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/licq-cvs
[prev in list] [next in list] [prev in thread] [next in thread]