Changeset 6054 for branches/qt-gui_qt4/src/dialogs/ownereditdlg.cpp

Timestamp:

01/18/08 21:18:10 (10 months ago)

Author:

eugene

Message:

• Removed all password-related work from SecurityDlg?;
• Renamed ICQ-related options in system menu to reflect this fact;
• Removed id from OwnerEditDlg? ctor, made ppid optional and fixed some bugs;
• Made SignalManager? invoke OwnerEditDlg? upon logoff for wrong password reason.

Files:

• branches/qt-gui_qt4/src/dialogs/ownereditdlg.cpp (modified) (5 diffs)

branches/qt-gui_qt4/src/dialogs/ownereditdlg.cpp

@@ -42 +42 @@
 /* TRANSLATOR LicqQtGui::OwnerEditDlg */
 
-OwnerEditDlg::OwnerEditDlg(QString id, unsigned long ppid, QWidget* parent)
+OwnerEditDlg::OwnerEditDlg(unsigned long ppid, QWidget* parent)
   : QDialog(parent)
 {
@@ -76 +76 @@
   lay->addWidget(chkSave, 3, 0, 1, 3);
 
+  QString id;
   // Fill the combo list now
   FOR_EACH_PROTO_PLUGIN_START(gLicqDaemon)
@@ -81 +82 @@
     if (ppid != 0) // Modifying a user
     {
+      ICQOwner* o = gUserManager.FetchOwner(curPpid, LOCK_R);
+      if (o == NULL)
+        id = QString::null;
+      else
+      {
+        id = o->IdString();
+        gUserManager.DropOwner(curPpid);
+      }
+
       cmbProtocol->addItem(
-          iconman->iconForStatus(ICQ_STATUS_ONLINE, id.toLatin1(), ppid),
-          (*_ppit)->Name(), QString::number(ppid));
+          iconman->iconForStatus(ICQ_STATUS_ONLINE, id.toLatin1(), curPpid),
+          (*_ppit)->Name(), QString::number(curPpid));
 
       // Check if this is the current protocol
@@ -102 +112 @@
 
   // Set the fields
-  if (!id.isEmpty() && ppid != 0)
+  if (ppid != 0)
   {
-    edtId->setText(id);
     ICQOwner* o = gUserManager.FetchOwner(ppid, LOCK_R);
     if (o)
     {
+      edtId->setText(o->IdString());
       edtPassword->setText(o->Password());
       chkSave->setChecked(o->SavePassword());
@@ -146 +156 @@
   setTabOrder(cmbProtocol, btnOk);
   setTabOrder(btnOk, btnCancel);
+
+  show();
 }