[kleopatra] [Bug 175980] --query and --external command line options missing

[Andre Heinecke via KDE Bugzilla]

https://bugs.kde.org/show_bug.cgi?id=175980

--- Comment #10 from Andre Heinecke <aheinecke at intevation.de> ---
Git commit 0df8c74d5869612667e6f72b3de368fa8a77c9b4 by Andre Heinecke.
Committed on 27/01/2016 at 10:58.
Pushed by aheinecke into branch 'vendor/intevation/4.14'.

Backport fixes for search external certificates

Do not prefix query with 0x and show prefix info.

This generalizes the lookupcertificatescommand again so that
it can be used with a generic query. Prefixing 0x this low was wrong
and is also not necessary at least with SKS Keyservers.

Accordingly don't show the information text about how adding
or leaving out the 0x prefix might change results. Only show
it in case a search for a keyid or fingerprint does not return
a result.

(cherry picked from commit c2a6ef0c41598ef801a5b8a0438e59a7e2ae9b97)

Conflicts:
    kleopatra/commands/lookupcertificatescommand.cpp

Add --search command line option.

This option runs the lookupcertificatescommand with the provided
search string. This basically opens the external keysearch dialog.

The option implements the KDE 3 behavior of kleopatras
--query --external but I found it easier to understand if It is
named like the GnuPG --search option and does not mix the
"open certificate details / search on keyserver" options.

Behavior of the --query option is not documented a bit more
detailed in the help string.
(cherry picked from commit fcf92035b9a44f51d89e02268f1fdbc3e4c2ca3a)

Conflicts:
    kleopatra/kleopatra_options.h
    kleopatra/kleopatraapplication.cpp

Make "Search for External Certificates" work again

This uses the newly added search option to open kleopatra's
Keyserver search dialog instead of just opening Kleopatra.
(cherry picked from commit d591b2bbfa132632901870dedf00994009a37666)

Conflicts:
    libkleo/src/ui/keyselectiondialog.cpp

M  +43   -34   kleopatra/commands/lookupcertificatescommand.cpp
M  +30   -14   kleopatra/kleopatraapplication.cpp
M  +1    -6    libkleo/ui/keyselectiondialog.cpp

http://commits.kde.org/kdepim/0df8c74d5869612667e6f72b3de368fa8a77c9b4

-- 
You are receiving this mail because:
You are on the CC list for the bug.