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

trunk/qt-gui/src/ownermanagerdlg.cpp

@@ -87 +87 @@
         cmbProtocol->insertItem((*it)->Name(), n++);
       else
-        gUserManager.DropOwner((*it)->PPID());
+        gUserManager.DropOwner(o);
     }
   }
-  
+
   // Set the fields
   if (szId && nPPID)
@@ -99 +99 @@
     {
       edtPassword->setText(o->Password());
-      gUserManager.DropOwner(nPPID);
+      gUserManager.DropOwner(o);
     }
-    
+
     n = 0;
     for (it = pl.begin(); it != pl.end(); it++, n++)
@@ -188 +188 @@
       o->SetPassword(szPassword);
   }
-  
-  gUserManager.DropOwner(nPPID);
+
+  gUserManager.DropOwner(o);
   server->SaveConf();
-  
+
   close();
 }
@@ -333 +333 @@
 void OwnerManagerDlg::slot_registerClicked()
 {
-  if (gUserManager.OwnerUin() != 0)
+  if (!gUserManager.OwnerId(LICQ_PPID).empty())
   {
     QString buf = tr("You are currently registered as\n"
@@ -340 +340 @@
                     "Rerun licq with the -b option to select a new\n"
                     "base directory and then register a new user.")
-                    .arg(gUserManager.OwnerUin()).arg(BASE_DIR);
+                    .arg(gUserManager.OwnerId(LICQ_PPID).c_str()).arg(BASE_DIR);
     InformUser(this, buf);
     return;
@@ -376 +376 @@
     updateOwners();
 
-    char sz[20];
     //TODO which owner
-    sprintf(sz, "%lu", gUserManager.OwnerUin());
+    QString id = gUserManager.OwnerId(LICQ_PPID);
     InformUser(this, tr("Successfully registered, your user identification\n"
                         "number (UIN) is %1.\n"
-                        "Now set your personal information.").arg(gUserManager.OwnerUin()));
-    mainwin->callInfoTab(mnuUserGeneral, sz, LICQ_PPID);
+                        "Now set your personal information.").arg(id));
+    mainwin->callInfoTab(mnuUserGeneral, id, LICQ_PPID);
   }
   else