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

List:       kde-commits
Subject:    kdeutils/kgpg [POSSIBLY UNSAFE]
From:       Jean-Baptiste Mardelle <bj () altern ! org>
Date:       2004-07-28 0:33:27
Message-ID: 20040728003327.5E09D99EB () office ! kde ! org
[Download RAW message or body]

CVS commit by mardelle: 

* show key name comment in key lists
CCMAIL: 85994-done@bugs.kde.org
* small speed improvement in public key list


  M +5 -4      listkeys.cpp   1.222
  M +8 -5      popuppublic.cpp   1.51 [POSSIBLY UNSAFE: popen]


--- kdeutils/kgpg/listkeys.cpp  #1.221:1.222
@@ -306,8 +306,8 @@ KgpgSelKey::KgpgSelKey(QWidget *parent, 
                         keyMail.truncate(keyMail.length()-1);
                         keyName=fullname.section('<',0,0);
-                        keyName=keyName.section('(',0,0);
+                        //keyName=keyName.section('(',0,0);
                         } else {
                         keyMail=QString::null;
-                        keyName=fullname.section('(',0,0);
+                        keyName=fullname;//.section('(',0,0);
                         }
 
@@ -3044,8 +3044,9 @@ gpgKey KeyView::extractKey(QString keyCo
                 ret.gpgkeymail.truncate(ret.gpgkeymail.length()-1);
                 ret.gpgkeyname=fullname.section('<',0,0);
-                ret.gpgkeyname=ret.gpgkeyname.section('(',0,0);
+                //ret.gpgkeyname=ret.gpgkeyname.section('(',0,0);
         } else {
                 ret.gpgkeymail=QString::null;
-                ret.gpgkeyname=fullname.section('(',0,0);
+                ret.gpgkeyname=fullname;
+                //ret.gpgkeyname=fullname.section('(',0,0);
         }
 

--- kdeutils/kgpg/popuppublic.cpp  #1.50:1.51
@@ -210,7 +210,10 @@ KDialogBase( Plain, i18n("Select Public 
         seclist=QString::null;
 
-        fp2 = popen("gpg --no-secmem-warning --no-tty --list-secret-keys ", "r");
+        fp2 = popen("gpg --no-secmem-warning --no-tty --with-colon --list-secret-keys ", "r");
         while ( fgets( line, sizeof(line), fp2))
-                seclist+=line;
+        {
+        QString readLine=line;
+        if (readLine.startsWith("sec")) seclist+=", 0x"+readLine.section(":",4,4).right(8);
+        }
         pclose(fp2);
 
@@ -423,9 +426,9 @@ void popupPublic::slotprocread(KProcIO *
                 keymail.truncate(keymail.length()-1);
                 keyname=tst.section('<',0,0);
-                if (keyname.find("(")!=-1)
-                        keyname=keyname.section('(',0,0);
+                //if (keyname.find("(")!=-1)
+                 //       keyname=keyname.section('(',0,0);
         } else {
                 keymail=QString::null;
-                keyname=tst.section('(',0,0);
+                keyname=tst;//.section('(',0,0);
         }
 


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