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

trunk/qt-gui/src/securitydlg.cpp

@@ -49 +49 @@
   ePasswordChange = 0;
 
-  unsigned long nUin = gUserManager.OwnerUin();
-  QString strUin;
-  if (nUin)
-    strUin.setNum(nUin);
+  QString strUin = gUserManager.OwnerId(LICQ_PPID);;
 
   QVBoxLayout *lay = new QVBoxLayout(this, 8);
@@ -92 +89 @@
   // UIN
   edtUin->setValidator(new QIntValidator(10000, 2147483647, edtUin));
-  if (nUin) 
-    edtUin->setText(strUin);
+  edtUin->setText(strUin);
 
   // Owner password
-  ICQOwner *o = gUserManager.FetchOwner(LOCK_R);
+  ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
   if (o != NULL)
   {
@@ -149 +145 @@
     chkWebAware->setChecked(o->WebAware());
     chkHideIp->setChecked(o->HideIp());
-    gUserManager.DropOwner();
+    gUserManager.DropOwner(o);
   }
   else
@@ -193 +189 @@
 void SecurityDlg::ok()
 {
-  ICQOwner* o = gUserManager.FetchOwner(LOCK_R);
+  ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
   if(o == 0) return;
   unsigned short status = o->Status();
-  gUserManager.DropOwner();
+  gUserManager.DropOwner(o);
 
   // validate password
@@ -247 +243 @@
     if (chkOnlyLocal->isChecked())
     {
-      o = gUserManager.FetchOwner(LOCK_W);
+      o = gUserManager.FetchOwner(LICQ_PPID, LOCK_W);
       gUserManager.SetOwnerUin(edtUin->text().toULong());
       o->SetPassword(edtFirst->text().latin1());
-      gUserManager.DropOwner();
+      gUserManager.DropOwner(o);
       close();
     }