Changeset 6381 for trunk/qt-gui/src/mainwin.cpp

Timestamp:

07/01/08 17:03:38 (5 months ago)

Author:

flynd

Message:

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

Files:

• trunk/qt-gui/src/mainwin.cpp (modified) (19 diffs)

trunk/qt-gui/src/mainwin.cpp

@@ -620 +620 @@
   m_nRealHeight = hVal;
 
-  ICQOwner *o = gUserManager.FetchOwner(LOCK_R);
+  ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
   if (o != NULL)
   {
     m_szCaption = tr("Licq (%1)").arg(QString::fromUtf8(o->GetAlias()));
-    gUserManager.DropOwner();
+    gUserManager.DropOwner(o);
   }
   else
@@ -791 +791 @@
    {
      // Do we need to get a password
-     o = gUserManager.FetchOwner(LOCK_R);
+     o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
      if (o != NULL)
      {
       if(o->Password()[0] == '\0')
       {
-        gUserManager.DropOwner();
+        gUserManager.DropOwner(o);
         (void) new UserSelectDlg(licqDaemon);
       }
       else
-        gUserManager.DropOwner();
+        gUserManager.DropOwner(o);
      }
    }
@@ -808 +808 @@
    {
     mnuPFM->setItemChecked(o->PhoneFollowMeStatus(), true);
-    gUserManager.DropOwner();
+    gUserManager.DropOwner(o);
    }
 
@@ -1405 +1405 @@
           }
           else
-          {  
+          {
             s = o->Status();
-            gUserManager.DropOwner(nPPID);
+            gUserManager.DropOwner(o);
           }
           if (s == ICQ_STATUS_ONLINE || s == ICQ_STATUS_FREEFORCHAT)
@@ -1464 +1464 @@
         {
           m_szCaption = tr("Licq (%1)").arg(QString::fromUtf8(o->GetAlias()));
-          gUserManager.DropOwner(nPPID);
+          gUserManager.DropOwner(o);
         }
         else
@@ -2093 +2093 @@
     else
     {
-      gUserManager.DropOwner(nPPID);
-      
+      gUserManager.DropOwner(o);
+
       // Show multiple icons for each protocol
       lblStatus->clearPrependPixmap();
       lblStatus->setText("");
       lblStatus->clearPixmaps();
-      
+
       vector<unsigned long>::iterator it;
       for (it = m_lnProtMenu.begin(); it != m_lnProtMenu.end(); it++)
@@ -2108 +2108 @@
           lblStatus->addPixmap(CMainWindow::iconForStatus(o->StatusFull(),
             o->IdString(), *it));
-          gUserManager.DropOwner(*it);
+          gUserManager.DropOwner(o);
         }
       }
@@ -2133 +2133 @@
       setIcon(CMainWindow::iconForStatus(o->StatusFull()));
 #endif   // USE_KDE
-  
-      gUserManager.DropOwner(nPPID);
+
+      gUserManager.DropOwner(o);
     }
    }
@@ -2151 +2151 @@
          lblStatus->addPixmap(CMainWindow::iconForStatus(o->StatusFull(),
            o->IdString(), *it));
-         gUserManager.DropOwner(*it);
+         gUserManager.DropOwner(o);
        }
      }
-     
+
      lblStatus->update();
    }
@@ -2168 +2168 @@
 {
   //TODO iterate all owners that support fetching away message
-  ICQOwner* o = gUserManager.FetchOwner(LOCK_R);
+  ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
   if (o == NULL)
     return;
 
   unsigned short status = o->Status();
-  gUserManager.DropOwner();
+  gUserManager.DropOwner(o);
   showAwayMsgDlg(status);
 }
@@ -2296 +2296 @@
     ICQOwner *o = gUserManager.FetchOwner(nPPID, LOCK_R);
     if (o == NULL) continue;
-              
+
     if (id == ICQ_STATUS_OFFLINE)
     {
-      gUserManager.DropOwner(nPPID);
+      gUserManager.DropOwner(o);
       licqDaemon->ProtoLogoff(nPPID);
       continue;
@@ -2313 +2313 @@
       if (o->StatusOffline())
       {
-        gUserManager.DropOwner(nPPID);
+        gUserManager.DropOwner(o);
         continue;
       }
@@ -2342 +2342 @@
     // call the right function
     bool b = o->StatusOffline();
-    gUserManager.DropOwner(nPPID);
+    gUserManager.DropOwner(o);
     if (b)
       licqDaemon->ProtoLogon(nPPID, newStatus);
@@ -2449 +2449 @@
       szId = strdup(o->IdString());
       unsigned short nNumMsg = o->NewMessages();
-      gUserManager.DropOwner((*_ppit)->PPID());
-      
+      gUserManager.DropOwner(o);
+
       if (nNumMsg > 0)
         callFunction(index, szId, (*_ppit)->PPID());
@@ -2469 +2469 @@
         if (o == 0) continue;
         szId = strdup(o->IdString());
-        gUserManager.DropOwner((*_ppit)->PPID());
+        gUserManager.DropOwner(o);
         callInfoTab(index, szId, (*_ppit)->PPID());
         free(szId);
@@ -3002 +3002 @@
       if (o == 0) continue; // just in case
       unsigned short nNumMsg = o->NewMessages();
-      gUserManager.DropOwner((*_ppit)->PPID());
+      gUserManager.DropOwner(o);
       if (nNumMsg > 0)
       {
@@ -3586 +3586 @@
 void CMainWindow::aboutBox()
 {
-  ICQOwner *o = gUserManager.FetchOwner(LOCK_R);
-  
+  ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
+
   // We might have no owner
   QString m_Alias = (o == 0) ? QString(tr("(Error! No owner set)")) : QString::fromUtf8(o->GetAlias());
   QString id = (o == 0) ? "" : o->IdString();
-  
+
   QString about(tr("Licq version %1%8.\n"
                    "Qt GUI plugin version %2.\n"
@@ -3611 +3611 @@
 #endif
                    .arg(__DATE__).arg(CICQDaemon::CryptoEnabled() ? "/SSL" : ""));
-  gUserManager.DropOwner();
+  gUserManager.DropOwner(o);
   InformUser(this, about);
 }
@@ -4797 +4797 @@
 
   // Do system messages first
-  ICQOwner *o = gUserManager.FetchOwner(LOCK_R);
+  ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
   unsigned short nNumMsg = 0;
   if (o)
   {
     nNumMsg = o->NewMessages();
-    gUserManager.DropOwner();
-  }
-  
+    gUserManager.DropOwner(o);
+  }
+
   if (nNumMsg > 0)
   {