Changeset 6377

Timestamp:

07/01/08 06:40:14 (3 months ago)

Author:

flynd

Message:

Use the new DropOwner? function to properly specify which owner to unlock.

Files:

• trunk/msn/src/msn-srv.cpp (modified) (8 diffs)

trunk/msn/src/msn-srv.cpp

@@ -105 +105 @@
         ICQOwner *o = gUserManager.FetchOwner(MSN_PPID, LOCK_W);
         o->SetAlias(strDecodedNick.c_str());
-        gUserManager.DropOwner(MSN_PPID);
+        gUserManager.DropOwner(o);
          
         // This cookie doesn't work anymore now that we are online
@@ -220 +220 @@
         if (m_pDaemon->AddUserEvent(o, e))
         {
-          gUserManager.DropOwner(MSN_PPID);
+          gUserManager.DropOwner(o);
           e->AddToHistory(NULL, MSN_PPID, D_RECEIVER);
           m_pDaemon->m_xOnEventManager.Do(ON_EVENT_SYSMSG, NULL);
         }
         else
-          gUserManager.DropOwner(MSN_PPID);
+          gUserManager.DropOwner(o);
       }
       else
@@ -268 +268 @@
         string strDecodedNick = Decode(strNick);
         o->SetAlias(strDecodedNick.c_str());
-        gUserManager.DropOwner(MSN_PPID);
+        gUserManager.DropOwner(o);
       }
       
@@ -277 +277 @@
       packet->SkipParameter(); // seq
       string strStatus = packet->GetParameter();
-      ICQUser *o = gUserManager.FetchOwner(MSN_PPID, LOCK_W);
+      ICQOwner* o = gUserManager.FetchOwner(MSN_PPID, LOCK_W);
       unsigned long nStatus;
       bool bHidden = false;
@@ -296 +296 @@
       m_nStatus = nStatus;
       gLog.Info("%sServer says we are now: %s\n", L_MSNxSTR, ICQUser::StatusToStatusStr(o->Status(), bHidden));
-      gUserManager.DropOwner(MSN_PPID);
+      gUserManager.DropOwner(o);
     }
     else if (strCmd == "ILN" || strCmd == "NLN")
@@ -442 +442 @@
         if (m_pDaemon->AddUserEvent(o, pEmailAlert))
         {
-          gUserManager.DropOwner(MSN_PPID);
+          gUserManager.DropOwner(o);
           pEmailAlert->AddToHistory(NULL, MSN_PPID, D_RECEIVER);
           m_pDaemon->m_xOnEventManager.Do(ON_EVENT_SYSMSG, NULL);
         }
         else
-          gUserManager.DropOwner(MSN_PPID);
+          gUserManager.DropOwner(o);
       }
     }
@@ -539 +539 @@
   m_szUserName = strdup(o->IdString());
   m_szPassword = strdup(o->Password());
-  gUserManager.DropOwner(MSN_PPID);
-  
+  gUserManager.DropOwner(o);
+
   SrvSocket *sock = new SrvSocket(m_szUserName, MSN_PPID);
   sock->SetRemoteAddr(_szServer, _nPort);
@@ -608 +608 @@
   ICQOwner *o = gUserManager.FetchOwner(MSN_PPID, LOCK_W);      
   m_pDaemon->ChangeUserStatus(o, ICQ_STATUS_OFFLINE);
-  gUserManager.DropOwner(MSN_PPID);  
+  gUserManager.DropOwner(o);
   //m_pDaemon->PushPluginSignal(new CICQSignal(SIGNAL_LOGOFF, 0, 0));   
 }