[svn] GpgOL - r202 - in trunk: . doc po src
svn author wk
cvs at cvs.gnupg.org
Mon Dec 10 10:56:30 CET 2007
Author: wk
Date: 2007-12-10 10:56:28 +0100 (Mon, 10 Dec 2007)
New Revision: 202
Modified:
trunk/ChangeLog
trunk/NEWS
trunk/configure.ac
trunk/doc/gpgol.texi
trunk/po/de.po
trunk/po/sv.po
trunk/src/ChangeLog
trunk/src/config-dialog.c
trunk/src/engine-assuan.c
trunk/src/engine.c
trunk/src/ext-commands.cpp
Log:
Preapring a release
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-12-05 12:24:44 UTC (rev 201)
+++ trunk/ChangeLog 2007-12-10 09:56:28 UTC (rev 202)
@@ -1,3 +1,7 @@
+2007-12-10 Werner Koch <wk at g10code.com>
+
+ Released 0.10.3 development version.
+
2007-11-12 Werner Koch <wk at g10code.com>
Released 0.10.2 development version.
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2007-12-05 12:24:44 UTC (rev 201)
+++ trunk/NEWS 2007-12-10 09:56:28 UTC (rev 202)
@@ -1,14 +1,21 @@
-Noteworthy changes for version 0.10.2 (2007-11-12)
+Noteworthy changes for version 0.10.3 (2007-12-10)
==================================================
UNDER HEAVY DEVELOPMENT - DO NOT USE FOR PRODUCTION!
- Under OL2007 some menu entries are missing.
+ * Minor fixes.
+
+
+Noteworthy changes for version 0.10.2 (2007-11-12)
+==================================================
+
* New menu items to select the default protocol.
* Code cleanups.
+
Noteworthy changes for version 0.10.1 (2007-10-22)
==================================================
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2007-12-05 12:24:44 UTC (rev 201)
+++ trunk/configure.ac 2007-12-10 09:56:28 UTC (rev 202)
@@ -16,7 +16,7 @@
# Remember to change the version number immediately *after* a release.
# Set my_issvn to "yes" for non-released code. Remember to run an
# "svn up" and "autogen.sh" right before creating a distribution.
-m4_define([my_version], [0.10.2])
+m4_define([my_version], [0.10.3])
m4_define([my_issvn], [no])
m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \
Modified: trunk/doc/gpgol.texi
===================================================================
--- trunk/doc/gpgol.texi 2007-12-05 12:24:44 UTC (rev 201)
+++ trunk/doc/gpgol.texi 2007-12-10 09:56:28 UTC (rev 202)
@@ -115,7 +115,15 @@
@chapter Introduction
To debug GpgOL you should set the Registry entry
- at code{HKCU\Software\Gnu\GnuPG:enableDebug} to the string value @code{1}.
+ at code{HKCU\Software\Gnu\GpgOL:enableDebug} to the string value @code{1}:
+
+ at cartouche
+ at example
+[HKEY_CURRENT_USER\Software\GNU\GpgOL]
+"enableDebug"="1"
+ at end example
+ at end cartouche
+
This allows easy setting of a debug file by using the extended options
menu and enables a few extra menu items.
@@ -154,12 +162,13 @@
@deffn Command RECIPIENT @var{string}
Set the recipient for the encryption. @var{string} is an RFC-2822
-recipient name. This command may or may not check the recipient for
-validity right away; if it does not all recipients are expected to be
-checked at the time of the @code{ENCRYPT} command. All @code{RECIPIENT}
-commands are cumulative until a successful @code{ENCRYPT} command or
-until a @code{RESET} command. Linefeeds are obviously not allowed in
- at var{string} and should be folded into spaces (which are equivalent).
+recipient name ("mailbox" as per section 3.4). This command may or may
+not check the recipient for validity right away; if it does not all
+recipients are expected to be checked at the time of the @code{ENCRYPT}
+command. All @code{RECIPIENT} commands are cumulative until a
+successful @code{ENCRYPT} command or until a @code{RESET} command.
+Linefeeds are obviously not allowed in @var{string} and should be folded
+into spaces (which are equivalent).
@end deffn
@noindent
@@ -205,7 +214,7 @@
encryption are all the recipients set so far. If any recipient is not
usable the server should take appropriate measures to notify the user
about the problem and may cancel the operation by returning an error
-code. The used file descriptors are a void after this command; the
+code. The used file descriptors are void after this command; the
recipient list is only cleared if the server returns success.
@noindent
@@ -331,7 +340,7 @@
@deffn {Status line} MICALG @var{string}
The @var{string} represents the hash algorithm used to create the
-signature. It is used with MOSS style signature messaged and defined by
+signature. It is used with MOSS style signature messages and defined by
PGP/MIME (RFC-3156) and S/MIME (RFC-3851). The GPGME library has a
supporting function @code{gpgme_hash_algo_name} to return the algorithm
name as a string. This string needs to be lowercased and for OpenPGP
@@ -379,7 +388,7 @@
The server needs to support the verification of opaque signatures as
well as detached signatures. The kind of input sources controls what
-kind message is to be verified.
+kind message is to be verified.
@deffn Command MESSAGE FD=@var{n}
This command is used with detached signatures to set the file descriptor
@@ -406,7 +415,7 @@
@noindent
The verification is then started using:
- at deffn Command VERIFY - at w{}-protocol=@var{name}
+ at deffn Command VERIFY - at w{}-protocol=@var{name} [- at w{}-silent]
@var{name} is the signing protocol used for the message. For a
description of the allowed protocols see the @code{ENCRYPT} command.
This argument is mandatory. Depending on the combination of
@@ -426,9 +435,10 @@
@end table
@end deffn
- at noindent
-The client expects the server to send at least this status information
-before the final OK response:
+With @option{--silent} the server shall not display any dialog; this is
+for example used by the client to get the content of opaque signed
+messages. The client expects the server to send at least this status
+information before the final OK response:
@deffn {Status line} SIGSTATUS @var{flag} @var{displaystring}
Returns the status for the signature and a short string explaining the
@@ -462,6 +472,7 @@
The server shall send one status line for every signature found on the
message.
+
@end deffn
@@ -615,13 +626,13 @@
@table @code
- at item HKLM\Software\Gnu\GnuPG:Install Directory
+ at item HKLM\Software\GNU\GnuPG:Install Directory
This is used by GnuPG to describe the directory where GnupG has been
installed. GpgOL requires this to get the location of the localedir
which is used to show translated strings (@file{gpgol.mo}). It is
further used to check whether GnuPG has been installed at all.
- at item HKCU\Software\Gnu\GnuPG:UI Server
+ at item HKCU\Software\GNU\GnuPG:UI Server
If the UI server could not be connected, GpgOL tries to start the one
given in this entry. It is assumed that the UI server is stored in the
@code{Install Directory} (as described above). This Registry entry
@@ -632,33 +643,33 @@
In case the UI server requires the socket name as an argument, the
placeholder @code{$s} may be used to indicate this. Due to this feature
-it is required that all verbatim dollar are too be doubled. If the
-actual program name contains spaces the program name nees to be enclosed
+it is required that all verbatim dollar signs are doubled. If the
+actual program name contains spaces the program name needs to be enclosed
in quotes.
- at item HKCU\Software\Gnu\GnuPG:enableDebug
+ at item HKCU\Software\GNU\GpgOL:enableDebug
Setting this key to the string @code{1} enables a few extra features in
the UI, useful only for debugging.
- at itemx HKCU\Software\Gnu\GnuPG:logFile
+ at itemx HKCU\Software\GNU\GpgOL:logFile
If the value is not empty, GpgOL takes this as a log file and appends
debug information to this file. The file may get very large.
- at itemx HKCU\Software\Gnu\GnuPG:compatFlags
+ at itemx HKCU\Software\GNU\GpgOL:compatFlags
This is a string consisting of @code{0} and @code{1} to enable certain
compatibility flags. Not generally useful; use the source for a
description.
- at item HKCU\Software\Gnu\GnuPG:enableSmime
- at itemx HKCU\Software\Gnu\GnuPG:defaultProtocol
- at itemx HKCU\Software\Gnu\GnuPG:encryptDefault
- at itemx HKCU\Software\Gnu\GnuPG:signDefault
- at itemx HKCU\Software\Gnu\GnuPG:previewDecrypt
- at itemx HKCU\Software\Gnu\GnuPG:storePasswdTime
- at itemx HKCU\Software\Gnu\GnuPG:encodingFormat
- at itemx HKCU\Software\Gnu\GnuPG:defaultKey
- at itemx HKCU\Software\Gnu\GnuPG:enableDefaultKey
- at itemx HKCU\Software\Gnu\GnuPG:preferHtml
+ at item HKCU\Software\GNU\GpgOL:enableSmime
+ at itemx HKCU\Software\GNU\GpgOL:defaultProtocol
+ at itemx HKCU\Software\GNU\GpgOL:encryptDefault
+ at itemx HKCU\Software\GNU\GpgOL:signDefault
+ at itemx HKCU\Software\GNU\GpgOL:previewDecrypt
+ at itemx HKCU\Software\GNU\GpgOL:storePasswdTime
+ at itemx HKCU\Software\GNU\GpgOL:encodingFormat
+ at itemx HKCU\Software\GNU\GpgOL:defaultKey
+ at itemx HKCU\Software\GNU\GpgOL:enableDefaultKey
+ at itemx HKCU\Software\GNU\GpgOL:preferHtml
These registry keys store the values from the configuration dialog.
@end table
Modified: trunk/po/de.po
===================================================================
--- trunk/po/de.po 2007-12-05 12:24:44 UTC (rev 201)
+++ trunk/po/de.po 2007-12-10 09:56:28 UTC (rev 202)
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: GpgOL 0.10.0\n"
"Report-Msgid-Bugs-To: bug-gpgol at g10code.com\n"
-"POT-Creation-Date: 2007-11-12 15:15+0100\n"
-"PO-Revision-Date: 2007-11-12 15:14+0100\n"
+"POT-Creation-Date: 2007-12-07 08:44+0100\n"
+"PO-Revision-Date: 2007-12-07 08:44+0100\n"
"Last-Translator: Werner Koch <wk at gnupg.org>\n"
"Language-Team: de\n"
"MIME-Version: 1.0\n"
@@ -53,8 +53,8 @@
msgstr "Debugausgabe (zur Problemanalyse)"
#: src/config-dialog.c:307
-msgid "Select GPG Key Manager"
-msgstr "Das Schlüsselverwaltungsprogramm festlegen"
+msgid "Select Certificate Manager"
+msgstr "GnuPG Zertifikats&verwaltung"
#: src/engine.c:363
msgid ""
@@ -70,7 +70,7 @@
"Diese ist allerdings sehr vereinfacht und kann z.B. keine S/MIME "
"verschlüsselten Nachrichten entschlüsseln."
-#: src/engine.c:367 src/ext-commands.cpp:659 src/main.c:603 src/main.c:609
+#: src/engine.c:367 src/ext-commands.cpp:663 src/main.c:603 src/main.c:609
msgid "GpgOL"
msgstr "GpgOL"
@@ -208,123 +208,115 @@
msgid "*** End Notation ***\n"
msgstr "*** Ende Notation ***\n"
-#: src/ext-commands.cpp:427
+#: src/ext-commands.cpp:431
msgid "&Decrypt and verify message"
msgstr "Entschlüsseln/Prüfen der Nachricht"
-#: src/ext-commands.cpp:428
+#: src/ext-commands.cpp:432
msgid "&Verify signature"
msgstr "&Unterschrift prüfen"
-#: src/ext-commands.cpp:429
+#: src/ext-commands.cpp:433
msgid "&Display crypto information"
msgstr "~Krypto Informationen anzeigen"
-#: src/ext-commands.cpp:436 src/ext-commands.cpp:787
+#: src/ext-commands.cpp:440 src/ext-commands.cpp:791
msgid "Decrypt message and verify signature"
msgstr "Nachricht entschlüsseln und Unterschrift prüfen"
-#: src/ext-commands.cpp:443
+#: src/ext-commands.cpp:447
msgid ">GnuPG protocol"
msgstr ">GnuPG Protokoll"
-#: src/ext-commands.cpp:444
+#: src/ext-commands.cpp:448
msgid "auto"
msgstr "automatisch"
-#: src/ext-commands.cpp:445
+#: src/ext-commands.cpp:449
msgid "PGP/MIME"
msgstr "PGP/MIME"
-#: src/ext-commands.cpp:446
+#: src/ext-commands.cpp:450
msgid "S/MIME"
msgstr "S/MIME"
-#: src/ext-commands.cpp:448
+#: src/ext-commands.cpp:452
msgid "&encrypt message with GnuPG"
msgstr "Nachricht mit GnuPG verschlüsseln"
-#: src/ext-commands.cpp:449
+#: src/ext-commands.cpp:453
msgid "&sign message with GnuPG"
msgstr "Nachricht mit GnuPG unterschreiben"
-#: src/ext-commands.cpp:453
+#: src/ext-commands.cpp:457 src/ext-commands.cpp:830
msgid "Encrypt message with GnuPG"
msgstr "Nachricht mit GnuPG verschlüsseln"
-#: src/ext-commands.cpp:454
+#: src/ext-commands.cpp:458 src/ext-commands.cpp:840
msgid "Sign message with GnuPG"
msgstr "Nachricht mit GnuPG unterschreiben"
-#: src/ext-commands.cpp:489
+#: src/ext-commands.cpp:493
msgid "GnuPG Certificate &Manager"
msgstr "GnuPG Zertifikats&verwaltung"
-#: src/ext-commands.cpp:493
+#: src/ext-commands.cpp:497
msgid "Open the certificate manager"
msgstr "Die Zertifikatsverwaltung öffnen"
-#: src/ext-commands.cpp:658
+#: src/ext-commands.cpp:662
msgid "Could not start certificate manager"
msgstr "Die Zertifikatsverwaltung konnte nicht aufgerufen werden"
-#: src/ext-commands.cpp:701
+#: src/ext-commands.cpp:705
msgid "Select this option to decrypt and verify the message."
msgstr ""
"Wählen Sie diese Option um die Nachricht zu entschlüsseln bzw. zu "
"verifizieren."
-#: src/ext-commands.cpp:708
+#: src/ext-commands.cpp:712
msgid "Select this option to show information on the crypto status"
msgstr ""
"Wählen Sie diese Option um Informationen über den Krypto-Status der "
"Nachricht anzuzeigen."
-#: src/ext-commands.cpp:716 src/ext-commands.cpp:806
+#: src/ext-commands.cpp:720 src/ext-commands.cpp:810
msgid "Check the signature now and display the result"
msgstr "Die digitale Unterschrift jetzt prüfen und das Resultat anzeigen"
-#: src/ext-commands.cpp:723
+#: src/ext-commands.cpp:727
msgid "Select this option to automatically select the protocol."
msgstr "Wählen Sie diese Option zum das Protokoll automatisch auszuwählen."
-#: src/ext-commands.cpp:730
+#: src/ext-commands.cpp:734
msgid "Select this option to select the PGP/MIME protocol."
msgstr "Wählen Sie diese Option zum das PGP/MIME Protokoll auszuwählen."
-#: src/ext-commands.cpp:737
+#: src/ext-commands.cpp:741
msgid "Select this option to select the S/MIME protocol."
msgstr "Wählen Sie diese Option zum das S/MIME Protokoll auszuwählen."
-#: src/ext-commands.cpp:744
+#: src/ext-commands.cpp:748
msgid "Select this option to encrypt the message."
msgstr "Wählen Sie diese Option zum Verschlüsseln der Nachricht."
-#: src/ext-commands.cpp:751
+#: src/ext-commands.cpp:755
msgid "Select this option to sign the message."
msgstr "Wählen Sie diese Option zum Unterschreiben der Nachricht."
-#: src/ext-commands.cpp:758
+#: src/ext-commands.cpp:762
msgid "Select this option to open the certificate manager"
msgstr "Wählen Sie diese Option zum die Zertifikatsverwaltung zu öffenen."
-#: src/ext-commands.cpp:796
+#: src/ext-commands.cpp:800
msgid "Show S/MIME status info"
msgstr "S/MIME Status Informationen anzeigen"
-#: src/ext-commands.cpp:816
+#: src/ext-commands.cpp:820
msgid "Use S/MIME for sign/encrypt"
msgstr "S/MIME zum signieren/verschlüsseln verwenden"
-#: src/ext-commands.cpp:826
-msgid "Encrypt message with GPG"
-msgstr "Nachricht mit GnuPG unterschreiben"
-
-#: src/ext-commands.cpp:836
-msgid "Sign message with GPG"
-msgstr "Nachricht mit GnuPG unterschreiben"
-
-#: src/ext-commands.cpp:846
+#: src/ext-commands.cpp:850
msgid "Open the GpgOL certificate manager"
msgstr "Zertifikatsverwaltung von GpgOL öffnen"
@@ -681,6 +673,15 @@
msgid "S/MIME Verification Result"
msgstr "S/MIME Prüfungsresultat"
+#~ msgid "Select GPG Key Manager"
+#~ msgstr "Das Schlüsselverwaltungsprogramm festlegen"
+
+#~ msgid "Encrypt message with GPG"
+#~ msgstr "Nachricht mit GnuPG verschlüsseln"
+
+#~ msgid "Sign message with GPG"
+#~ msgstr "Nachricht mit GnuPG unterschreiben"
+
#~ msgid "use S/MIME protocol"
#~ msgstr "S/MIME verwenden"
Modified: trunk/po/sv.po
===================================================================
--- trunk/po/sv.po 2007-12-05 12:24:44 UTC (rev 201)
+++ trunk/po/sv.po 2007-12-10 09:56:28 UTC (rev 202)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: GPGol\n"
"Report-Msgid-Bugs-To: bug-gpgol at g10code.com\n"
-"POT-Creation-Date: 2007-11-12 15:15+0100\n"
+"POT-Creation-Date: 2007-12-07 08:44+0100\n"
"PO-Revision-Date: 2006-12-12 23:52+0100\n"
"Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
"Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@ -53,8 +53,9 @@
msgstr ""
#: src/config-dialog.c:307
-msgid "Select GPG Key Manager"
-msgstr "Välj GPG-nyckelhanterare"
+#, fuzzy
+msgid "Select Certificate Manager"
+msgstr "GPG-nyckel&hanterare"
#: src/engine.c:363
msgid ""
@@ -65,7 +66,7 @@
"are not readable."
msgstr ""
-#: src/engine.c:367 src/ext-commands.cpp:659 src/main.c:603 src/main.c:609
+#: src/engine.c:367 src/ext-commands.cpp:663 src/main.c:603 src/main.c:609
msgid "GpgOL"
msgstr ""
@@ -206,134 +207,125 @@
msgid "*** End Notation ***\n"
msgstr "*** Notation slut ***\n"
-#: src/ext-commands.cpp:427
+#: src/ext-commands.cpp:431
msgid "&Decrypt and verify message"
msgstr "&Dekryptera och validera meddelandet"
-#: src/ext-commands.cpp:428
+#: src/ext-commands.cpp:432
#, fuzzy
msgid "&Verify signature"
msgstr "FELAKTIG signatur!"
-#: src/ext-commands.cpp:429
+#: src/ext-commands.cpp:433
msgid "&Display crypto information"
msgstr ""
-#: src/ext-commands.cpp:436 src/ext-commands.cpp:787
+#: src/ext-commands.cpp:440 src/ext-commands.cpp:791
msgid "Decrypt message and verify signature"
msgstr "Dekryptera meddelandet och validera signaturen"
-#: src/ext-commands.cpp:443
+#: src/ext-commands.cpp:447
msgid ">GnuPG protocol"
msgstr ""
-#: src/ext-commands.cpp:444
+#: src/ext-commands.cpp:448
msgid "auto"
msgstr ""
-#: src/ext-commands.cpp:445
+#: src/ext-commands.cpp:449
#, fuzzy
msgid "PGP/MIME"
msgstr "[PGP/MIME-meddelande]"
-#: src/ext-commands.cpp:446
+#: src/ext-commands.cpp:450
msgid "S/MIME"
msgstr ""
-#: src/ext-commands.cpp:448
+#: src/ext-commands.cpp:452
#, fuzzy
msgid "&encrypt message with GnuPG"
msgstr "Signera meddelandet med GPG"
-#: src/ext-commands.cpp:449
+#: src/ext-commands.cpp:453
#, fuzzy
msgid "&sign message with GnuPG"
msgstr "Signera meddelandet med GPG"
-#: src/ext-commands.cpp:453
+#: src/ext-commands.cpp:457 src/ext-commands.cpp:830
#, fuzzy
msgid "Encrypt message with GnuPG"
msgstr "Signera meddelandet med GPG"
-#: src/ext-commands.cpp:454
+#: src/ext-commands.cpp:458 src/ext-commands.cpp:840
#, fuzzy
msgid "Sign message with GnuPG"
msgstr "Signera meddelandet med GPG"
-#: src/ext-commands.cpp:489
+#: src/ext-commands.cpp:493
#, fuzzy
msgid "GnuPG Certificate &Manager"
msgstr "GPG-nyckel&hanterare"
-#: src/ext-commands.cpp:493
+#: src/ext-commands.cpp:497
msgid "Open the certificate manager"
msgstr ""
-#: src/ext-commands.cpp:658
+#: src/ext-commands.cpp:662
#, fuzzy
msgid "Could not start certificate manager"
msgstr "Kunde inte starta nyckelhanteraren"
-#: src/ext-commands.cpp:701
+#: src/ext-commands.cpp:705
#, fuzzy
msgid "Select this option to decrypt and verify the message."
msgstr "Välj det här alternativet för att kryptera meddelandet."
-#: src/ext-commands.cpp:708
+#: src/ext-commands.cpp:712
#, fuzzy
msgid "Select this option to show information on the crypto status"
msgstr "Välj det här alternativet för att signera meddelandet."
-#: src/ext-commands.cpp:716 src/ext-commands.cpp:806
+#: src/ext-commands.cpp:720 src/ext-commands.cpp:810
msgid "Check the signature now and display the result"
msgstr ""
-#: src/ext-commands.cpp:723
+#: src/ext-commands.cpp:727
#, fuzzy
msgid "Select this option to automatically select the protocol."
msgstr "Välj det här alternativet för att kryptera meddelandet."
-#: src/ext-commands.cpp:730
+#: src/ext-commands.cpp:734
#, fuzzy
msgid "Select this option to select the PGP/MIME protocol."
msgstr "Välj det här alternativet för att kryptera meddelandet."
-#: src/ext-commands.cpp:737
+#: src/ext-commands.cpp:741
#, fuzzy
msgid "Select this option to select the S/MIME protocol."
msgstr "Välj det här alternativet för att kryptera meddelandet."
-#: src/ext-commands.cpp:744
+#: src/ext-commands.cpp:748
msgid "Select this option to encrypt the message."
msgstr "Välj det här alternativet för att kryptera meddelandet."
-#: src/ext-commands.cpp:751
+#: src/ext-commands.cpp:755
msgid "Select this option to sign the message."
msgstr "Välj det här alternativet för att signera meddelandet."
-#: src/ext-commands.cpp:758
+#: src/ext-commands.cpp:762
#, fuzzy
msgid "Select this option to open the certificate manager"
msgstr "Välj det här alternativet för att kryptera meddelandet."
-#: src/ext-commands.cpp:796
+#: src/ext-commands.cpp:800
msgid "Show S/MIME status info"
msgstr ""
-#: src/ext-commands.cpp:816
+#: src/ext-commands.cpp:820
msgid "Use S/MIME for sign/encrypt"
msgstr ""
-#: src/ext-commands.cpp:826
-#, fuzzy
-msgid "Encrypt message with GPG"
-msgstr "Signera meddelandet med GPG"
-
-#: src/ext-commands.cpp:836
-msgid "Sign message with GPG"
-msgstr "Signera meddelandet med GPG"
-
-#: src/ext-commands.cpp:846
+#: src/ext-commands.cpp:850
msgid "Open the GpgOL certificate manager"
msgstr ""
@@ -656,7 +648,17 @@
msgid "S/MIME Verification Result"
msgstr "Resultat från validering"
+#~ msgid "Select GPG Key Manager"
+#~ msgstr "Välj GPG-nyckelhanterare"
+
#, fuzzy
+#~ msgid "Encrypt message with GPG"
+#~ msgstr "Signera meddelandet med GPG"
+
+#~ msgid "Sign message with GPG"
+#~ msgstr "Signera meddelandet med GPG"
+
+#, fuzzy
#~ msgid "Select this option to select the OpenPGP protocol."
#~ msgstr "Välj det här alternativet för att kryptera meddelandet."
Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog 2007-12-05 12:24:44 UTC (rev 201)
+++ trunk/src/ChangeLog 2007-12-10 09:56:28 UTC (rev 202)
@@ -1,3 +1,9 @@
+2007-12-07 Werner Koch <wk at g10code.com>
+
+ * ext-commands.cpp (InstallCommands): Removed toolbar button fro
+ decrypt as this is not anymore needed. Fixes bug#860.
+ (QueryHelpText): Ditto.
+
2007-11-12 Werner Koch <wk at g10code.com>
* olflange.h (class GpgolExt): Rename m_gpgSelectSmime to
Modified: trunk/src/config-dialog.c
===================================================================
--- trunk/src/config-dialog.c 2007-12-05 12:24:44 UTC (rev 201)
+++ trunk/src/config-dialog.c 2007-12-10 09:56:28 UTC (rev 202)
@@ -304,7 +304,7 @@
case WM_COMMAND:
switch (LOWORD (wparam)) {
case IDC_OPT_SEL_KEYMAN_PATH:
- buf = get_open_file_name (NULL, _("Select GPG Key Manager"));
+ buf = get_open_file_name (NULL, _("Select Certificate Manager"));
if (buf && *buf)
SetDlgItemText (dlg, IDC_OPT_KEYMAN_PATH, buf);
break;
Modified: trunk/src/engine-assuan.c
===================================================================
--- trunk/src/engine-assuan.c 2007-12-05 12:24:44 UTC (rev 201)
+++ trunk/src/engine-assuan.c 2007-12-10 09:56:28 UTC (rev 202)
@@ -733,9 +733,9 @@
{
if (errno == EAGAIN)
{
- log_debug ("%s:%s: [%s:%p] ignoring EAGAIN from callback",
- SRCNAME, __func__, item->name, item->hd);
- Sleep (0);
+/* log_debug ("%s:%s: [%s:%p] ignoring EAGAIN from callback", */
+/* SRCNAME, __func__, item->name, item->hd); */
+ Sleep (10);
retval = 1;
}
else
@@ -825,7 +825,7 @@
for (;;)
{
/* Process our queue and fire up async I/O requests. */
- log_debug ("%s:%s: processing work queue", SRCNAME, __func__);
+/* log_debug ("%s:%s: processing work queue", SRCNAME, __func__); */
EnterCriticalSection (&work_queue_lock);
hdarraylen = 0;
hdarray[hdarraylen++] = work_queue_event;
@@ -874,14 +874,14 @@
SRCNAME, __func__, count);
else
{
- log_debug ("%s:%s: %d items in queue; waiting for %d items:",
- SRCNAME, __func__, count, hdarraylen-1);
- for (item = work_queue; item; item = item->next)
- {
- if (item->waiting)
- log_debug ("%s:%s: [%s:%p]",
- SRCNAME, __func__, item->name, item->hd);
- }
+/* log_debug ("%s:%s: %d items in queue; waiting for %d items:", */
+/* SRCNAME, __func__, count, hdarraylen-1); */
+/* for (item = work_queue; item; item = item->next) */
+/* { */
+/* if (item->waiting) */
+/* log_debug ("%s:%s: [%s:%p]", */
+/* SRCNAME, __func__, item->name, item->hd); */
+/* } */
n = WaitForMultipleObjects (hdarraylen, hdarray, FALSE, INFINITE);
if (n == WAIT_FAILED)
{
@@ -890,7 +890,7 @@
}
else if (n >= 0 && n < hdarraylen)
{
- log_debug ("%s:%s: WFMO succeeded (res=%d)",SRCNAME,__func__, n);
+/* log_debug ("%s:%s: WFMO succeeded (res=%d)",SRCNAME,__func__, n); */
}
else
{
@@ -901,7 +901,7 @@
/* Handle completion status. */
EnterCriticalSection (&work_queue_lock);
- log_debug ("%s:%s: checking completion states", SRCNAME, __func__);
+/* log_debug ("%s:%s: checking completion states", SRCNAME, __func__); */
for (item = work_queue; item; item = item->next)
{
if (!item->io_pending)
@@ -950,7 +950,7 @@
Sleep (0);
EnterCriticalSection (&work_queue_lock);
- log_debug ("%s:%s: cleaning up work queue", SRCNAME, __func__);
+/* log_debug ("%s:%s: cleaning up work queue", SRCNAME, __func__); */
for (item = work_queue; item; item = item->next)
{
if (item->used && (item->got_ready || item->got_error))
Modified: trunk/src/engine.c
===================================================================
--- trunk/src/engine.c 2007-12-05 12:24:44 UTC (rev 201)
+++ trunk/src/engine.c 2007-12-10 09:56:28 UTC (rev 202)
@@ -41,7 +41,7 @@
SRCNAME, __func__, __LINE__); \
} while (0)
-static int debug_filter = 1;
+static int debug_filter = 0;
/* This variable indicates whether the assuan engine is used. */
static int use_assuan;
@@ -224,7 +224,7 @@
if (filter->in.nonblock)
{
errno = EAGAIN;
- if (debug_filter)
+ if (debug_filter > 1)
log_debug ("%s:%s: leave; result=EAGAIN\n", SRCNAME, __func__);
return -1;
}
@@ -280,7 +280,7 @@
if (filter->out.nonblock)
{
errno = EAGAIN;
- if (debug_filter)
+ if (debug_filter > 1)
log_debug ("%s:%s: leave; result=EAGAIN\n", SRCNAME, __func__);
return -1;
}
Modified: trunk/src/ext-commands.cpp
===================================================================
--- trunk/src/ext-commands.cpp 2007-12-05 12:24:44 UTC (rev 201)
+++ trunk/src/ext-commands.cpp 2007-12-10 09:56:28 UTC (rev 202)
@@ -262,6 +262,10 @@
tb_info->next = m_toolbar_info;
m_toolbar_info = tb_info;
+ log_debug ("%s:%s: ctx=%lx button_id=%d cmd_id=%d '%s'\n",
+ SRCNAME, __func__, m_lContext,
+ tb_info->button_id, tb_info->cmd_id, tb_info->desc);
+
}
}
va_end (arg_ptr);
@@ -431,10 +435,6 @@
opt.enable_debug? "Debug-1 (open_inspector)":"", &m_nCmdDebug1,
opt.enable_debug? "Debug-2 (n/a)":"", &m_nCmdDebug2,
NULL);
-
- add_toolbar (pTBEArray, nTBECnt,
- _("Decrypt message and verify signature"), IDB_DECRYPT, m_nCmdDecrypt,
- NULL, 0, 0);
}
else if (m_lContext == EECONTEXT_SENDNOTEMESSAGE)
{
@@ -778,16 +778,7 @@
LPTSTR pszText, UINT nCharCnt)
{
- if (nCommandID == m_nCmdDecrypt
- && m_lContext == EECONTEXT_READNOTEMESSAGE)
- {
- if (lFlags == EECQHT_STATUS)
- lstrcpyn (pszText, ".", nCharCnt);
- if (lFlags == EECQHT_TOOLTIP)
- lstrcpyn (pszText, _("Decrypt message and verify signature"),
- nCharCnt);
- }
- else if (nCommandID == m_nCmdShowInfo
+ if (nCommandID == m_nCmdShowInfo
&& m_lContext == EECONTEXT_READNOTEMESSAGE)
{
if (lFlags == EECQHT_STATUS)
@@ -823,7 +814,7 @@
lstrcpyn (pszText, ".", nCharCnt);
if (lFlags == EECQHT_TOOLTIP)
lstrcpyn (pszText,
- _("Encrypt message with GPG"),
+ _("Encrypt message with GnuPG"),
nCharCnt);
}
else if (nCommandID == m_nCmdSign
@@ -833,7 +824,7 @@
lstrcpyn (pszText, ".", nCharCnt);
if (lFlags == EECQHT_TOOLTIP)
lstrcpyn (pszText,
- _("Sign message with GPG"),
+ _("Sign message with GnuPG"),
nCharCnt);
}
else if (nCommandID == m_nCmdKeyManager
@@ -877,6 +868,10 @@
if (!tb_info)
return S_FALSE; /* Not one of our toolbar buttons. */
+ log_debug ("%s:%s: ctx=%lx tbid=%ld button_id(req)=%d got=%d cmd_id=%d '%s'\n",
+ SRCNAME, __func__, m_lContext, toolbarid, buttonid,
+ tb_info->button_id, tb_info->cmd_id, tb_info->desc);
+
pTBB->iBitmap = tb_info->bitmap;
pTBB->idCommand = tb_info->cmd_id;
pTBB->fsState = TBSTATE_ENABLED;
More information about the Gnupg-commits
mailing list