Changeset 6326

Timestamp:

06/17/08 15:41:52 (6 months ago)

Author:

eugene

Message:

Removed an empty version of ClearSocketDesc? and gave the default value for channel parameter of the full version to clear all descriptors.

Location:

trunk/licq

Files:

• include/licq_user.h (modified) (1 diff)
• src/user.cpp (modified) (2 diffs)

trunk/licq/include/licq_user.h

@@ -903 +903 @@
   // Don't call these:
   int SocketDesc(unsigned char);
-  void ClearSocketDesc();
-  void ClearSocketDesc(unsigned char);
+  void ClearSocketDesc(unsigned char nChannel = 0x00);
   void SetSocketDesc(TCPSocket *);
 

trunk/licq/src/user.cpp

@@ -2764 +2764 @@
 }
 
-
-void ICQUser::ClearSocketDesc()
-{
-  m_nNormalSocketDesc = m_nInfoSocketDesc = m_nStatusSocketDesc = -1;
-  m_nLocalPort = 0;
-  m_nConnectionVersion = 0;
-  m_bSecure = false;
-
-  if (gLicqDaemon != NULL && m_bOnContactList)
-    gLicqDaemon->PushPluginSignal(new CICQSignal(SIGNAL_UPDATExUSER,
-      USER_SECURITY, m_szId, m_nPPID, 0));
-}
-
 void ICQUser::ClearSocketDesc(unsigned char nChannel)
 {
@@ -2790 +2777 @@
     m_nStatusSocketDesc = -1;
     break;
+  case 0x00: // Used as default value to clear all socket descriptors
+    m_nNormalSocketDesc = m_nInfoSocketDesc = m_nStatusSocketDesc = -1;
+    break;
   default:
     gLog.Info("%sUnknown channel %u\n", L_WARNxSTR, nChannel);
     return;
   }
-  if ((m_nStatusSocketDesc == -1) && (m_nInfoSocketDesc == -1) && (m_nNormalSocketDesc == -1))
-    ClearSocketDesc();
-  else if (gLicqDaemon != NULL && m_bOnContactList)
+
+  if (m_nStatusSocketDesc == m_nInfoSocketDesc == m_nNormalSocketDesc == -1)
+  {
+    m_nLocalPort = 0;
+    m_nConnectionVersion = 0;
+    m_bSecure = false;
+  }
+
+  if (gLicqDaemon != NULL && m_bOnContactList)
     gLicqDaemon->PushPluginSignal(new CICQSignal(SIGNAL_UPDATExUSER, USER_SECURITY, m_szId, m_nPPID, 0));
 }