[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeutils/kgpg
From:       Rolf Eike Beer <kde () opensource ! sf-tec ! de>
Date:       2007-12-31 22:48:22
Message-ID: 1199141302.949488.30868.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 755280 by dakon:

Don't trigger Q_ASSERT() when trying to delete a signature from a key pair


 M  +8 -3      keysmanager.cpp  


--- trunk/KDE/kdeutils/kgpg/keysmanager.cpp #755279:755280
@@ -2122,11 +2122,16 @@
 
     QString uid;
     KeyListViewItem *parent = keysList2->currentItem()->parent();
-    if (parent->itemType() == KeyListViewItem::Public)
+    switch (parent->itemType()) {
+    case KeyListViewItem::Public:
+    case KeyListViewItem::Pair:
         uid = '1';
-    else {
-        Q_ASSERT(parent->itemType() == KeyListViewItem::Uid);
+        break;
+    case KeyListViewItem::Uid:
         uid = parent->text(6);
+        break;
+    default:
+        Q_ASSERT(1);
     }
 
     QString signID;
[prev in list] [next in list] [prev in thread] [next in thread]