[Winpt-commits] r168 - in trunk: . PTD Po Src
scm-commit at wald.intevation.org
scm-commit at wald.intevation.org
Fri Jan 27 11:08:12 CET 2006
Author: twoaday
Date: 2006-01-27 11:08:10 +0100 (Fri, 27 Jan 2006)
New Revision: 168
Modified:
trunk/NEWS
trunk/PTD/versioninfo.rc.in
trunk/Po/de.po
trunk/Src/ChangeLog
trunk/Src/WinPT-en.rc
trunk/Src/WinPT.cpp
trunk/Src/resource.h
trunk/Src/wptKeyCache.cpp
trunk/Src/wptKeyManagerDlg.cpp
trunk/THANKS
trunk/TODO
trunk/configure.ac
Log:
2006-01-27 Timo Schulz <ts at g10code.de>
* WinPT.cpp (WinMain): Set minimal list mode as default.
* wptKeyCache.cpp (gpg_keycache_sync): Handle special v3 keys.
Prepare a new release.
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2006-01-26 10:17:17 UTC (rev 167)
+++ trunk/NEWS 2006-01-27 10:08:10 UTC (rev 168)
@@ -736,3 +736,6 @@
if they were chaged.
* Allow to drop files into the Key Manager to import keys.
* Automatically select the default key in secret key boxes.
+* Fix the mysterious crash on startup. This was related to
+ a problem with special v3 keys.
+
\ No newline at end of file
Modified: trunk/PTD/versioninfo.rc.in
===================================================================
--- trunk/PTD/versioninfo.rc.in 2006-01-26 10:17:17 UTC (rev 167)
+++ trunk/PTD/versioninfo.rc.in 2006-01-27 10:08:10 UTC (rev 168)
@@ -36,7 +36,7 @@
VALUE "FileDescription", "PTD - Privacy Tray Dynamic\0"
VALUE "FileVersion", "@VERSION@\0"
VALUE "InternalName", "WinPT\0"
- VALUE "LegalCopyright", " Copyright (C) 2005 Timo Schulz\0"
+ VALUE "LegalCopyright", " Copyright (C) 2006 Timo Schulz\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "PTD.dll\0"
VALUE "PrivateBuild", "\0"
Modified: trunk/Po/de.po
===================================================================
--- trunk/Po/de.po 2006-01-26 10:17:17 UTC (rev 167)
+++ trunk/Po/de.po 2006-01-27 10:08:10 UTC (rev 168)
@@ -15,7 +15,7 @@
msgstr ""
"Project-Id-Version: WinPT 0.11.6\n"
"Report-Msgid-Bugs-To: winpt at freakmail.de\n"
-"POT-Creation-Date: 2006-01-26 11:21+0100\n"
+"POT-Creation-Date: 2006-01-27 10:02+0100\n"
"PO-Revision-Date: 2005-12-28 16:10+0100\n"
"Last-Translator: Timo Schulz <ts at g10code.de>\n"
"Language-Team: DE <twoaday at freakmail.de>\n"
@@ -28,9 +28,9 @@
msgstr "Konnte GPG-Heimatverzeichnis nicht erstellen"
#: Src/WinPT.cpp:167 Src/WinPT.cpp:198 Src/WinPT.cpp:248 Src/WinPT.cpp:252
-#: Src/WinPT.cpp:415 Src/WinPT.cpp:422 Src/WinPT.cpp:464 Src/WinPT.cpp:492
-#: Src/WinPT.cpp:501 Src/WinPT.cpp:505 Src/WinPT.cpp:522 Src/WinPT.cpp:592
-#: Src/WinPT.cpp:605 Src/WinPT.cpp:652 Src/WinPT.cpp:678 Src/WinPT.cpp:695
+#: Src/WinPT.cpp:415 Src/WinPT.cpp:422 Src/WinPT.cpp:467 Src/WinPT.cpp:495
+#: Src/WinPT.cpp:504 Src/WinPT.cpp:508 Src/WinPT.cpp:525 Src/WinPT.cpp:595
+#: Src/WinPT.cpp:608 Src/WinPT.cpp:655 Src/WinPT.cpp:681 Src/WinPT.cpp:698
#: Src/wptErrors.cpp:141 Src/wptGPG.cpp:912 Src/wptGPG.cpp:923
#: Src/wptGPG.cpp:932 Src/wptGPG.cpp:942 Src/wptMainProc.cpp:345
#: Src/wptMainProc.cpp:527
@@ -86,7 +86,7 @@
msgid "A newer GPGME version is needed; at least "
msgstr "Eine neuere GPGME version wird benötigt; mindestens "
-#: Src/WinPT.cpp:465
+#: Src/WinPT.cpp:468
#, c-format
msgid ""
"GPG home directory is not set correctly.\n"
@@ -97,17 +97,17 @@
"Bitte überprüfen Sie die GPG Registryseinträge:\n"
"%s"
-#: Src/WinPT.cpp:469
+#: Src/WinPT.cpp:472
msgid "Select GPG Public Keyring"
msgstr "Öffentlichen GPG-Schlüsselbund auswählen"
# XXX: the \0\0 problem
# c:\oss\winpt-gpgme\src\WinPT.cpp:313
-#: Src/WinPT.cpp:491
+#: Src/WinPT.cpp:494
msgid "GPG home directory could not be determited."
msgstr "GPG-Home-Dir konnte nicht bestimmt werden."
-#: Src/WinPT.cpp:499
+#: Src/WinPT.cpp:502
msgid ""
"Could not find the GPG binary (gpg.exe).\n"
"Do you want to start the GPG preferences to correct this problem?"
@@ -116,7 +116,7 @@
"öffnen um das Problem zu beheben?"
# c:\oss\winpt-gpgme\src\WinPT.cpp:339
-#: Src/WinPT.cpp:514
+#: Src/WinPT.cpp:517
msgid ""
"Could not access and/or find the public and secret keyring.\n"
"If this is an accident, quit the program and fix it.\n"
@@ -131,20 +131,20 @@
# c:\oss\winpt-gpgme\src\WinPT.cpp:376
# c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:426
# c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:711
-#: Src/WinPT.cpp:547 Src/wptFileManagerDlg.cpp:487
+#: Src/WinPT.cpp:550 Src/wptFileManagerDlg.cpp:487
#: Src/wptFileManagerDlg.cpp:801
msgid "Wipe Free Space"
msgstr "Freien Speicher Löschen"
-#: Src/WinPT.cpp:591
+#: Src/WinPT.cpp:594
msgid "Could not register window class"
msgstr "Konnte keine Fensterklasse registrieren"
-#: Src/WinPT.cpp:605
+#: Src/WinPT.cpp:608
msgid "Could not create window"
msgstr "Konnte Fenster nicht erstellen"
-#: Src/WinPT.cpp:676
+#: Src/WinPT.cpp:679
msgid ""
"The keycache was not initialized or is empty.\n"
"Please check your GPG config (keyrings, pathes...)"
@@ -152,7 +152,7 @@
"Der Schlüsselspeicher wurde nicht initialisiert oder ist leer.\n"
"Bitte checken Sie die GPG Konfiguration (Schlüsselbunde, Pfade)"
-#: Src/WinPT.cpp:679
+#: Src/WinPT.cpp:682
msgid ""
"It seems that GPG is not set properly.\n"
"Do you want to start the GPG preferences dialog?"
@@ -160,7 +160,7 @@
"GPG ist nicht richtig konfiguriert.\n"
"Den GPG-Einstellungsdialog starten?"
-#: Src/WinPT.cpp:696
+#: Src/WinPT.cpp:699
#, c-format
msgid ""
"Default key from the GPG options file could not be found.\n"
@@ -1922,7 +1922,7 @@
#: Src/wptKeyManagerDlg.cpp:1612 Src/wptKeyManagerDlg.cpp:1641
#: Src/wptKeyManagerDlg.cpp:1700 Src/wptKeyManagerDlg.cpp:1718
#: Src/wptKeyManagerDlg.cpp:1723 Src/wptKeyManagerDlg.cpp:1728
-#: Src/wptKeyManagerDlg.cpp:1815 Src/wptKeyManagerDlg.cpp:1998
+#: Src/wptKeyManagerDlg.cpp:1815 Src/wptKeyManagerDlg.cpp:1996
#: Src/wptKeysigDlg.cpp:93 Src/wptKeysigDlg.cpp:105 Src/wptKeysigDlg.cpp:277
#: Src/wptKeysigDlg.cpp:354 Src/wptKeysigDlg.cpp:363 Src/wptKeysigDlg.cpp:407
#: Src/wptMainProc.cpp:398 Src/wptMainProc.cpp:551 Src/wptMainProc.cpp:559
Modified: trunk/Src/ChangeLog
===================================================================
--- trunk/Src/ChangeLog 2006-01-26 10:17:17 UTC (rev 167)
+++ trunk/Src/ChangeLog 2006-01-27 10:08:10 UTC (rev 168)
@@ -1,3 +1,8 @@
+2006-01-27 Timo Schulz <ts at g10code.de>
+
+ * WinPT.cpp (WinMain): Set minimal list mode as default.
+ * wptKeyCache.cpp (gpg_keycache_sync): Handle special v3 keys.
+
2006-01-25 Timo Schulz <ts at g10code.com>
* wptRegistry.cpp (get_reg_entry_gpg): Return NULL if
Modified: trunk/Src/WinPT-en.rc
===================================================================
--- trunk/Src/WinPT-en.rc 2006-01-26 10:17:17 UTC (rev 167)
+++ trunk/Src/WinPT-en.rc 2006-01-27 10:08:10 UTC (rev 168)
@@ -56,7 +56,6 @@
// remains consistent on all systems.
IDI_FILE_ENC ICON DISCARDABLE "Safe.ico"
IDI_FILE_SIG ICON DISCARDABLE "Sign.ico"
-IDI_KEY_DELETE ICON DISCARDABLE "key_delete.ico"
IDI_KEY_EXPORT ICON DISCARDABLE "key_export.ico"
IDI_KEY_IMPORT ICON DISCARDABLE "key_import.ico"
IDI_KEY_PROPS ICON DISCARDABLE "key_props.ico"
@@ -68,6 +67,7 @@
IDI_KEY_SEARCH ICON DISCARDABLE "key_search.ico"
IDI_KEY_NEW ICON DISCARDABLE "key_new.ico"
IDI_COMPUTER ICON DISCARDABLE "computer.ico"
+IDI_KEY_DELETE ICON DISCARDABLE "key_delete.ico"
/////////////////////////////////////////////////////////////////////////////
//
@@ -1909,8 +1909,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,11,5,0
- PRODUCTVERSION 0,11,5,0
+ FILEVERSION 0,11,7,0
+ PRODUCTVERSION 0,11,7,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -1930,12 +1930,12 @@
VALUE "FileDescription", "Windows Privacy Tray (WinPT)\0"
VALUE "FileVersion", "0.11.7\0"
VALUE "InternalName", "WinPT\0"
- VALUE "LegalCopyright", " Copyright (C) 2005 Timo Schulz\0"
+ VALUE "LegalCopyright", " Copyright (C) 2006 Timo Schulz\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "WinPT.exe\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Windows Privacy Tray\0"
- VALUE "ProductVersion", "0.11.7\0"
+ VALUE "ProductVersion", "0.11.6\0"
VALUE "SpecialBuild", "\0"
END
END
Modified: trunk/Src/WinPT.cpp
===================================================================
--- trunk/Src/WinPT.cpp 2006-01-26 10:17:17 UTC (rev 167)
+++ trunk/Src/WinPT.cpp 2006-01-27 10:08:10 UTC (rev 168)
@@ -455,6 +455,9 @@
hotkeys_modify ();
gnupg_load_config ();
}
+ else { /* default settings. */
+ reg_prefs.keylist_mode = 1;
+ }
if (is_gpg4win_installed ())
load_gpg_env (); /* XXX: check return code. */
Modified: trunk/Src/resource.h
===================================================================
--- trunk/Src/resource.h 2006-01-26 10:17:17 UTC (rev 167)
+++ trunk/Src/resource.h 2006-01-27 10:08:10 UTC (rev 168)
@@ -810,7 +810,7 @@
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 240
+#define _APS_NEXT_RESOURCE_VALUE 241
#define _APS_NEXT_COMMAND_VALUE 40186
#define _APS_NEXT_CONTROL_VALUE 1512
#define _APS_NEXT_SYMED_VALUE 101
Modified: trunk/Src/wptKeyCache.cpp
===================================================================
--- trunk/Src/wptKeyCache.cpp 2006-01-26 10:17:17 UTC (rev 167)
+++ trunk/Src/wptKeyCache.cpp 2006-01-27 10:08:10 UTC (rev 168)
@@ -717,7 +717,8 @@
c_sec->gloflags.divert_to_card = c->gloflags.divert_to_card;
if (!c->gloflags.divert_to_card)
c->gloflags.divert_to_card = key_divert_to_card (key);
- c->sym_prefs = copy_uid_prefs (c_sec->sym_prefs);
+ if (c_sec->sym_prefs)
+ c->sym_prefs = copy_uid_prefs (c_sec->sym_prefs);
c->pubpart = c_sec;
c->pubpart->key = key;
}
Modified: trunk/Src/wptKeyManagerDlg.cpp
===================================================================
--- trunk/Src/wptKeyManagerDlg.cpp 2006-01-26 10:17:17 UTC (rev 167)
+++ trunk/Src/wptKeyManagerDlg.cpp 2006-01-27 10:08:10 UTC (rev 168)
@@ -1924,8 +1924,6 @@
km_refresh_from_keyserver (kmi->lv, dlg);
if (updated_keys_avail ())
refresh_keylist (kmi);
- else
- msg_box (NULL, "no updates", "", MB_OK);
break;
case ID_KEYCTX_UID_COPY:
Modified: trunk/THANKS
===================================================================
--- trunk/THANKS 2006-01-26 10:17:17 UTC (rev 167)
+++ trunk/THANKS 2006-01-27 10:08:10 UTC (rev 168)
@@ -40,6 +40,7 @@
Mark sonarte at applink.net
Markus Gerwinski markus.gerwinsiki at sercon.de
Marcus Junk Marcus.Junk at bkk-der-partner.de
+Markus Spehling
Markus Winkelmann mwinkelmann at ofi-ag.ch
Michael Daigle mdaigle at canada.com
Michael Roth mroth at gnupg.org
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2006-01-26 10:17:17 UTC (rev 167)
+++ trunk/TODO 2006-01-27 10:08:10 UTC (rev 168)
@@ -8,9 +8,8 @@
* Handle the case that while WinPT tries to change GPG data,
but before GPG is executed, an external event changed the
keyring. So do not use BUG but issue an error.
- * winpt --keymanager aborts when the keyring is empty on the
- first start.
* implement property sheets at some places to improve usability.
+ * Implement a mechanism to download and update language files.
-1.0.0-
* The key cache reload is much faster when no progress callback
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2006-01-26 10:17:17 UTC (rev 167)
+++ trunk/configure.ac 2006-01-27 10:08:10 UTC (rev 168)
@@ -15,7 +15,7 @@
# Version number: Remember to change it immediately *after* a release.
# Add a "-cvs" prefix for non-released code.
-AC_INIT(WinPT, 0.11.7-cvs, http://www.winpt.org)
+AC_INIT(WinPT, 0.11.7, http://www.winpt.org)
NEED_GPG_VERSION=1.4.2
NEED_GPGME_API=1
NEED_GPGME_VERSION=1.1.1
@@ -185,7 +185,6 @@
# Add some extra libs here so that previous tests don't fail for
# mysterious reasons - the final link step should bail out.
if test "$have_w32_system" = yes; then
- #W32LIBS="-lwsock32"
W32LIBS="-lws2_32"
fi
More information about the Winpt-commits
mailing list