[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 16:17:00
Message-ID: 1199117820.838112.19767.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 755183 by dakon:

Fix enumeration of uids

Uids and Uats are in the same "namespace". Fix enumeration to reflect this.
Else you get Uids after Uats numbered wrong.

Backport of r755173


 M  +2 -4      kgpginterface.cpp  


--- trunk/KDE/kdeutils/kgpg/kgpginterface.cpp #755182:755183
@@ -457,7 +457,6 @@
 {
     QStringList lsp;
     int items;
-    unsigned int uidnum = 0;
 
     while ((items = p->readln(lsp)) >= 0)
     {
@@ -533,7 +532,7 @@
             cycle = "pub";
 
             // the first uid is merged into the public key
-            uidnum = 1;
+            m_numberid = 1;
         }
         else
         if ((lsp.at(0) == "fpr") && (items >= 10))
@@ -605,7 +604,7 @@
             else
                 uid.setValid(true);
 
-            uid.setIndex(++uidnum);
+            uid.setIndex(++m_numberid);
             QString fullname = lsp.at(9);
             if (fullname.contains('<') )
             {
@@ -643,7 +642,6 @@
 
             m_publickey.uidList()->append(uid);
 
-            m_numberid++;
             cycle = "uid";
         }
         else
[prev in list] [next in list] [prev in thread] [next in thread]