Changeset 6374 for trunk/qt4-gui/src/core

Timestamp:

07/01/08 06:31:24 (5 months ago)

Author:

flynd

Message:

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

Location:

trunk/qt4-gui/src/core

Files:

• licqgui.cpp (modified) (6 diffs)
• mainwin.cpp (modified) (8 diffs)
• systemmenu.cpp (modified) (4 diffs)

trunk/qt4-gui/src/core/licqgui.cpp

@@ -694 +694 @@
     if (o->StatusOffline())
     {
-      gUserManager.DropOwner(ppid);
+      gUserManager.DropOwner(o);
       return;
     }
@@ -712 +712 @@
 
   bool b = o->StatusOffline();
-  gUserManager.DropOwner(ppid);
+  gUserManager.DropOwner(o);
   if (b)
     myLicqDaemon->ProtoLogon(ppid, status);
@@ -1162 +1162 @@
     QString id = o->IdString();
     unsigned short nNumMsg = o->NewMessages();
-    gUserManager.DropOwner((*_ppit)->PPID());
+    gUserManager.DropOwner(o);
 
     if (nNumMsg > 0)
@@ -1187 +1187 @@
         continue;
       unsigned short nNumMsg = o->NewMessages();
-      gUserManager.DropOwner((*_ppit)->PPID());
+      gUserManager.DropOwner(o);
       if (nNumMsg > 0)
       {
@@ -1265 +1265 @@
 
   // Do system messages first
-  ICQOwner* o = gUserManager.FetchOwner(LOCK_R);
+  ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
   unsigned short numMsg = 0;
   if (o != NULL)
   {
     numMsg = o->NewMessages();
-    gUserManager.DropOwner();
+    gUserManager.DropOwner(o);
   }
 
@@ -1447 +1447 @@
               break;
           }
-          gUserManager.DropOwner(ppid);
+          gUserManager.DropOwner(o);
         }
 

trunk/qt4-gui/src/core/mainwin.cpp

@@ -129 +129 @@
 
   myCaption = "Licq";
-  ICQOwner* o = gUserManager.FetchOwner(LOCK_R);
+  ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
   if (o != NULL)
   {
     myCaption += QString(" (%1)").arg(QString::fromUtf8(o->GetAlias()));
-    gUserManager.DropOwner();
+    gUserManager.DropOwner(o);
   }
   setWindowTitle(myCaption);
@@ -242 +242 @@
   {
     // 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);
        new UserSelectDlg();
      }
      else
-       gUserManager.DropOwner();
+       gUserManager.DropOwner(o);
     }
   }
@@ -619 +619 @@
         {
           myCaption.replace("|", QString::fromUtf8(o->GetAlias()));
-          gUserManager.DropOwner(ppid);
+          gUserManager.DropOwner(o);
         }
         else
@@ -851 +851 @@
             o->IdString(), o->PPID()));
       myStatusField->update();
+      gUserManager.DropOwner(o);
     }
     else
     {
-      gUserManager.DropOwner(nPPID);
+      gUserManager.DropOwner(o);
 
       // Show icons for each protocol, w/o text
@@ -868 +869 @@
           continue;
         myStatusField->addPixmap(iconman->iconForStatus(o->StatusFull(), o->IdString(), ppid));
-        gUserManager.DropOwner(ppid);
+        gUserManager.DropOwner(o);
       }
       FOR_EACH_PROTO_PLUGIN_END
 
       myStatusField->update();
-
-      o = gUserManager.FetchOwner(nPPID, LOCK_R);
     }
-
-    gUserManager.DropOwner(nPPID);
   }
   else
@@ -892 +889 @@
         continue;
       myStatusField->addPixmap(iconman->iconForStatus(o->StatusFull(), o->IdString(), ppid));
-      gUserManager.DropOwner(ppid);
+      gUserManager.DropOwner(o);
     }
     FOR_EACH_PROTO_PLUGIN_END
@@ -911 +908 @@
 {
   //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)
@@ -917 +914 @@
 
   int status = o->Status();
-  gUserManager.DropOwner();
+  gUserManager.DropOwner(o);
 
   AwayMsgDlg::showAwayMsgDlg(status);

trunk/qt4-gui/src/core/systemmenu.cpp

@@ -384 +384 @@
       a->setChecked(true);
 
-  gUserManager.DropOwner();
+  gUserManager.DropOwner(o);
 }
 
@@ -670 +670 @@
     myStatusInvisibleAction->setChecked(o->StatusInvisible());
 
-  gUserManager.DropOwner(myPpid);
+  gUserManager.DropOwner(o);
 }
 
@@ -680 +680 @@
 
   QString userid = o->IdString();
-  gUserManager.DropOwner(myPpid);
+  gUserManager.DropOwner(o);
   LicqGui::instance()->showInfoDialog(mnuUserGeneral, userid, myPpid);
 }
@@ -691 +691 @@
 
   QString userid = o->IdString();
-  gUserManager.DropOwner(myPpid);
+  gUserManager.DropOwner(o);
   new HistoryDlg(userid, myPpid);
 }