[Pkg-kde-commits] rev 476 - in trunk/packages/kdeutils/debian: . patches

[Adeodato Simó]

Author: dato-guest
Date: 2005-02-23 21:48:02 +0100 (Wed, 23 Feb 2005)
New Revision: 476

Added:
   trunk/packages/kdeutils/debian/patches/08_kgpg_good_fingerprint.diff
Modified:
   trunk/packages/kdeutils/debian/changelog
Log:
debian/patches/08_kgpg_good_fingerprint.diff:

  * Backport patch to make kgpg display the correct fingerprint for a key even
    if '--fingerprint' is specified in the configuration file. Formerly, always
    the last fingerprint was displayed. (Closes: #251342)


Modified: trunk/packages/kdeutils/debian/changelog
===================================================================
--- trunk/packages/kdeutils/debian/changelog	2005-02-23 02:03:54 UTC (rev 475)
+++ trunk/packages/kdeutils/debian/changelog	2005-02-23 20:48:02 UTC (rev 476)
@@ -4,6 +4,12 @@
 
   * Change kgpg's section to kde. (Closes: #292399)
 
+  +++ Changes by Adeodato Simó:
+
+  * Backport patch to make kgpg display the correct fingerprint for a key even
+    if '--fingerprint' is specified in the configuration file. Formerly, always
+    the last fingerprint was displayed. (Closes: #251342)
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Date
 
 kdeutils (4:3.3.2-1) unstable; urgency=low

Added: trunk/packages/kdeutils/debian/patches/08_kgpg_good_fingerprint.diff
===================================================================
--- trunk/packages/kdeutils/debian/patches/08_kgpg_good_fingerprint.diff	2005-02-23 02:03:54 UTC (rev 475)
+++ trunk/packages/kdeutils/debian/patches/08_kgpg_good_fingerprint.diff	2005-02-23 20:48:02 UTC (rev 476)
@@ -0,0 +1,25 @@
+===================================================================
+RCS file: /home/kde/kdeutils/kgpg/keyinfowidget.cpp,v
+retrieving revision 1.19
+retrieving revision 1.20
+diff -u -r1.19 -r1.20
+--- kdeutils/kgpg/keyinfowidget.cpp	2005/02/20 11:34:22	1.19
++++ kdeutils/kgpg/keyinfowidget.cpp	2005/02/20 11:42:00	1.20
+@@ -107,7 +107,7 @@
+ void KgpgKeyInfo::loadKey(QString Keyid)
+ {
+ QColor trustColor;
+-QString fingervalue;
++QString fingervalue=QString::null;
+ FILE *pass;
+ char line[200]="";
+ QString gpgOutput,fullID;
+@@ -268,7 +268,7 @@
+ 			prop->tLName->setText("<qt><b>"+KgpgInterface::checkForUtf8(kname).replace(QRegExp("<"),"&lt;")+"</b></qt>");
+ 
+                 }
+-                if (gpgOutput.startsWith("fpr")) {
++		if (gpgOutput.startsWith("fpr") && (fingervalue==QString::null)) {
+                         fingervalue=gpgOutput.section(':',9,9);
+                         // format fingervalue in 4-digit groups
+                         uint len = fingervalue.length();