Changeset 6381 for trunk/qt-gui/src/wharf.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/wharf.cpp (modified) (6 diffs)

trunk/qt-gui/src/wharf.cpp

@@ -219 +219 @@
 {
   QPixmap m;
-  ICQOwner *o = gUserManager.FetchOwner(LOCK_R);
+  ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
   if (o == 0) return;
   switch (o->Status())
@@ -232 +232 @@
   }
   if (o->StatusInvisible()) m = QPixmap((const char **)iconInvisible_xpm);
-  gUserManager.DropOwner();
+  gUserManager.DropOwner(o);
   QPainter painter(wharfIcon->vis);
   if (!m_bFortyEight)
@@ -264 +264 @@
 QPixmap *IconManager_Default::GetDockIconStatusIcon()
 {
-  ICQOwner *o = gUserManager.FetchOwner(LOCK_R);
+  ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
   if (o == 0) return NULL;
-  
+
   unsigned long s = o->Status();
-  gUserManager.DropOwner();
+  gUserManager.DropOwner(o);
   switch (s)
   {
@@ -548 +548 @@
 {
   QPixmap *p = NULL;
-  ICQOwner *o = gUserManager.FetchOwner(LOCK_R);
+  ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
   if (o == 0) return;
   switch (o->Status())
@@ -561 +561 @@
   }
   if (o->StatusInvisible()) p = pixInvisible;
-  gUserManager.DropOwner();
+  gUserManager.DropOwner(o);
   if (p != NULL)
   {
@@ -667 +667 @@
 {
   //TODO make general for all plugins
-  ICQOwner *o = gUserManager.FetchOwner(LOCK_R);
+  ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
   if (o == 0) return;
   m_statusIcon = CMainWindow::iconForStatus(o->StatusFull());
   m_ownerStatus = o->Status();
   m_bStatusInvisible = o->StatusInvisible();
-  gUserManager.DropOwner();
+  gUserManager.DropOwner(o);
 
   updateTooltip();