Changeset 6374 for trunk/qt4-gui/src/core/mainwin.cpp

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.

Files:

• trunk/qt4-gui/src/core/mainwin.cpp (modified) (8 diffs)

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);