Changeset 6216

Timestamp:

05/26/08 03:06:39 (8 months ago)

Author:

eugene

Message:

Fixed user handling in GPG key management classes, this fixes several crash cases.

Location:

trunk/qt4-gui/src/dialogs

Files:

• gpgkeymanager.cpp (modified) (3 diffs)
• gpgkeymanager.h (modified) (2 diffs)

trunk/qt4-gui/src/dialogs/gpgkeymanager.cpp

@@ -98 +98 @@
 
   // create the keylist
-  lst_keyList = new KeyList();
+  lst_keyList = new KeyList(this);
   lst_keyList->setAllColumnsShowFocus(true);
   QStringList headers;
@@ -182 +182 @@
     return;
 
-  ICQUser* u = gUserManager.FetchUser(tmp->szId.toLatin1(), tmp->nPPID, LOCK_R);
-  if ( u )
-  {
-    editUser( u );
+  editUser(tmp->szId, tmp->nPPID);
+}
+
+void GPGKeyManager::editUser(QString id, unsigned long ppid)
+{
+  KeyListItem* item = NULL;
+  bool found = false;
+
+  for (int i = 0; i < lst_keyList->topLevelItemCount(); ++i)
+  {
+    item = dynamic_cast<KeyListItem*>(lst_keyList->topLevelItem(i));
+
+    if (item->getszId() == id && item->getnPPID() == ppid)
+    {
+      found = true;
+      break;
+    }
+  }
+
+  if (!found)
+  {
+    ICQUser* u = gUserManager.FetchUser(id.toLatin1(), ppid, LOCK_R);
+    if (u == NULL)
+      return;
+    item = new KeyListItem(lst_keyList, u);
     gUserManager.DropUser(u);
   }
-}
-
-void GPGKeyManager::editUser(ICQUser* u)
-{
-  for (int i = 0; i < lst_keyList->topLevelItemCount(); ++i)
-  {
-    KeyListItem* item = dynamic_cast<KeyListItem*>(lst_keyList->topLevelItem(i));
-
-    if (item->getszId() == u->IdString() && item->getnPPID() == u->PPID())
-    {
-      item->edit();
-      return;
-    }
-  }
-
-  (new KeyListItem(lst_keyList, u))->edit();
+
+  item->edit();
 };
 
@@ -278 +285 @@
   QString szId = text.mid(4);
 
-  ICQUser* u = gUserManager.FetchUser(szId.toLatin1(), nPPID, LOCK_R);
-
-  if (u != NULL)
-  {
-    bool found = false;
-    for (int i = 0; i < topLevelItemCount(); ++i)
-    {
-      KeyListItem* item = dynamic_cast<KeyListItem*>(topLevelItem(i));
-      if (item->getszId() == szId && item->getnPPID() == nPPID)
-      {
-        item->edit();
-        found = true;
-        break;
-      }
-    }
-    if (!found)
-      (new KeyListItem(this, u))->edit();
-    gUserManager.DropUser(u);
-  }
+  GPGKeyManager* km = dynamic_cast<GPGKeyManager*>(nativeParentWidget());
+  if (km != NULL)
+    km->editUser(szId, nPPID);
 }
 

trunk/qt4-gui/src/dialogs/gpgkeymanager.h

@@ -45 +45 @@
   QLabel* lbl_passphrase;
   QLabel* lbl_dragndrop;
-  void editUser(ICQUser* u);
+  void editUser(QString id, unsigned long ppid);
   void initKeyList();
 
@@ -55 +55 @@
   void slot_remove();
   void slot_doubleClicked(QTreeWidgetItem* item);
+
+  friend class KeyList;
 };