[Winpt-commits] r85 - in trunk: . Po Src w32gpgme

scm-commit at wald.intevation.org scm-commit at wald.intevation.org
Fri Nov 18 08:20:43 CET 2005


Author: twoaday
Date: 2005-11-18 08:20:40 +0100 (Fri, 18 Nov 2005)
New Revision: 85

Removed:
   trunk/Makefiles/
   trunk/WinPT.dsp
   trunk/WinPT.dsw
Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/Po/de.po
   trunk/Src/ChangeLog
   trunk/Src/WinPT-en.rc
   trunk/Src/resource.h
   trunk/Src/wptClipVerifyDlg.cpp
   trunk/Src/wptFileManagerDlg.cpp
   trunk/Src/wptFileVerifyDlg.cpp
   trunk/Src/wptGPG.cpp
   trunk/Src/wptGPGOptDlg.cpp
   trunk/Src/wptKeyCacheDlg.cpp
   trunk/Src/wptKeyManagerDlg.cpp
   trunk/Src/wptPassphraseCB.cpp
   trunk/Src/wptRegistry.cpp
   trunk/w32gpgme/w32-clip.c
Log:
2005-11-17  Timo Schulz  <ts at g10code.com>
 
        * wptGPG.cpp (check_last_gnupg_access): Kludge to avoid that
        the cache will be loaded twice.
        * wptRegistry.cpp (regist_inst_winpt): More comments.
        * wptKeyManagerDlg.cpp (do_center_window): Make sure that
        neg. coordinates are never used.
        * wptClipVerifyDlg.cpp (clip_verify_dlg_proc): Localize all
        strings.
        * wptPassphraseCB.cpp (passphrase_callback_proc): Likewise.
        * wptFileManagerDlg.cpp (filemanager_dlg_proc): Localize menu
        and save 'AlwaysOnTop' in the registry.
         


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2005-11-16 13:13:41 UTC (rev 84)
+++ trunk/ChangeLog	2005-11-18 07:20:40 UTC (rev 85)
@@ -1,3 +1,10 @@
+2005-11-17  Timo Schulz  <ts at g10code.com>
+
+	* Makefiles/: Deleted. Support for Borland compiler makes
+	no sense with this directory structure.
+	* WinPT.dsw, WinPT.dsp: Removed. Store MSVC specific files
+	outside of the repository.
+	
 2005-11-03  Werner Koch  <wk at g10code.com>
 
 	* configure.ac (AM_INIT_AUTOMAKE): Fixed.

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2005-11-16 13:13:41 UTC (rev 84)
+++ trunk/NEWS	2005-11-18 07:20:40 UTC (rev 85)
@@ -662,4 +662,11 @@
 * Allow again to use the MAPI.
 * Fix problem with caching passphrases for signing operations.
 
+(0.11.1)
 
+* Fix problem that the Key Manager is something not displayed
+  because negative x/y coordinates were used.
+* Correct the GPG version checking code.
+* Fix problem that the Key Manager did not display disabled keys
+  after reloading.
+

Modified: trunk/Po/de.po
===================================================================
--- trunk/Po/de.po	2005-11-16 13:13:41 UTC (rev 84)
+++ trunk/Po/de.po	2005-11-18 07:20:40 UTC (rev 85)
@@ -623,7 +623,7 @@
 
 #, c-format
 msgid "Could not encrypt '%s'"
-msgstr "Konnte '%s' nicht verschluesseln."
+msgstr "Konnte '%s' nicht verschlüsseln."
 
 msgid "Could not execute Cryptdisk Server."
 msgstr "Konnte Cryptdisk Server nicht starten"
@@ -1044,7 +1044,7 @@
 
 
 msgid "E&xport Secret Key"
-msgstr "E&xportiere geheimen Schluessel"
+msgstr "E&xportiere geheimen Schlüssel"
 
 msgid "Edit"
 msgstr "Bearbeiten"
@@ -2464,7 +2464,7 @@
 "Symmetric encryption.\n"
 "%s encrypted data."
 msgstr "Symmetrisch verschlüsselt.\n"
-"%s verschluesselte Daten."
+"%s verschlüsselte Daten."
 
 msgid "Text Input"
 msgstr "Texteingabe"
@@ -3113,3 +3113,27 @@
 msgid "(CTRL+ALT+F to clear the cache)"
 msgstr "(STRG+ALT+F löscht den Cache)"
 
+msgid "Expire date"
+msgstr "Ablaufdatum"
+
+msgid "Issuer key"
+msgstr "Schlüssel des Ausstellers"
+
+msgid "Issuer key ID"
+msgstr "Key ID des Ausstellers"
+
+msgid "Signature Properties"
+msgstr "Signatur Eigenschaften"
+
+
+msgid "&Exit"
+msgstr "&Beenden"
+
+msgid "&Help"
+msgstr "&Hilfe"
+
+msgid "View"
+msgstr "Ansicht"
+
+msgid "Key"
+msgstr "Schlüssel"

Modified: trunk/Src/ChangeLog
===================================================================
--- trunk/Src/ChangeLog	2005-11-16 13:13:41 UTC (rev 84)
+++ trunk/Src/ChangeLog	2005-11-18 07:20:40 UTC (rev 85)
@@ -1,3 +1,16 @@
+2005-11-17  Timo Schulz  <ts at g10code.com>
+
+	* wptGPG.cpp (check_last_gnupg_access): Kludge to avoid that
+	the cache will be loaded twice.
+	* wptRegistry.cpp (regist_inst_winpt): More comments.
+	* wptKeyManagerDlg.cpp (do_center_window): Make sure that
+	neg. coordinates are never used.
+	* wptClipVerifyDlg.cpp (clip_verify_dlg_proc): Localize all
+	strings.
+	* wptPassphraseCB.cpp (passphrase_callback_proc): Likewise.
+	* wptFileManagerDlg.cpp (filemanager_dlg_proc): Localize menu
+	and save 'AlwaysOnTop' in the registry.
+	
 2005-11-16  Timo Schulz  <ts at g10code.com>
 
 	* WinPT.cpp (check_crypto_engine): Min is now GPG 1.4.2.

Modified: trunk/Src/WinPT-en.rc
===================================================================
--- trunk/Src/WinPT-en.rc	2005-11-16 13:13:41 UTC (rev 84)
+++ trunk/Src/WinPT-en.rc	2005-11-18 07:20:40 UTC (rev 85)
@@ -147,35 +147,35 @@
     PUSHBUTTON      "&Cancel",IDCANCEL,130,129,50,14
 END
 
-IDD_WINPT_SIGPROPS DIALOG DISCARDABLE  0, 0, 223, 129
+IDD_WINPT_SIGPROPS DIALOG DISCARDABLE  0, 0, 242, 130
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Signature Properties"
 FONT 8, "MS Sans Serif"
 BEGIN
-    GROUPBOX        "Signature Info",IDC_STATIC,2,3,216,102
-    EDITTEXT        IDC_SIGPROPS_INFO,8,18,203,13,ES_AUTOHSCROLL | 
+    GROUPBOX        "Signature Info",IDC_STATIC,2,3,235,102
+    EDITTEXT        IDC_SIGPROPS_INFO,8,18,219,13,ES_AUTOHSCROLL | 
                     ES_READONLY
-    LTEXT           "Issuer key",IDC_STATIC,8,36,33,8
+    LTEXT           "Issuer key",IDC_SIGPROPS_KEYINF,8,36,111,8
     EDITTEXT        IDC_SIGPROPS_ISSUER,8,49,146,12,ES_AUTOHSCROLL | 
                     ES_READONLY
-    LTEXT           "Expire date",IDC_SIGPROPS_EXPSTR,8,70,36,8
+    LTEXT           "Expire date",IDC_SIGPROPS_EXPSTR,8,70,40,8
     CONTROL         "DateTimePicker1",IDC_SIGPROPS_EXPDATE,"SysDateTimePick32",
                     DTS_RIGHTALIGN | WS_DISABLED | WS_TABSTOP,49,68,60,12
     CONTROL         "Exportable",IDC_SIGPROPS_EXP,"Button",BS_AUTOCHECKBOX | 
-                    BS_FLAT | WS_DISABLED | WS_TABSTOP,8,91,49,10
+                    BS_FLAT | WS_DISABLED | WS_TABSTOP,5,91,53,10
     CONTROL         "Non-revocably",IDC_SIGPROPS_NREV,"Button",
                     BS_AUTOCHECKBOX | BS_FLAT | WS_DISABLED | WS_TABSTOP,60,
-                    91,62,10
+                    91,67,10
     CONTROL         "Revoked",IDC_SIGPROPS_REV,"Button",BS_AUTOCHECKBOX | 
-                    BS_FLAT | WS_DISABLED | WS_TABSTOP,125,91,45,10
+                    BS_FLAT | WS_DISABLED | WS_TABSTOP,129,91,50,10
     CONTROL         "Expired",IDC_SIGPROPS_EXPIRED,"Button",BS_AUTOCHECKBOX | 
-                    BS_FLAT | WS_DISABLED | WS_TABSTOP,176,91,39,10
-    DEFPUSHBUTTON   "OK",IDOK,168,107,50,14
-    LTEXT           "Class",IDC_STATIC,155,70,18,8
-    EDITTEXT        IDC_SIGPROPS_CLASS,176,69,35,12,ES_AUTOHSCROLL | 
+                    BS_FLAT | WS_DISABLED | WS_TABSTOP,183,91,50,10
+    DEFPUSHBUTTON   "OK",IDOK,187,107,50,14
+    LTEXT           "Class",IDC_SIGPROPS_CLASSINF,161,70,25,8
+    EDITTEXT        IDC_SIGPROPS_CLASS,188,69,40,12,ES_AUTOHSCROLL | 
                     ES_READONLY
-    LTEXT           "Issuer key ID",IDC_STATIC,155,36,42,8
-    EDITTEXT        IDC_SIGPROPS_KEYID,155,49,56,12,ES_AUTOHSCROLL | 
+    LTEXT           "Issuer key ID",IDC_SIGPROPS_KEYIDINF,155,36,73,8
+    EDITTEXT        IDC_SIGPROPS_KEYID,155,49,73,12,ES_AUTOHSCROLL | 
                     ES_READONLY
 END
 
@@ -236,9 +236,9 @@
     IDD_WINPT_SIGPROPS, DIALOG
     BEGIN
         LEFTMARGIN, 2
-        RIGHTMARGIN, 218
+        RIGHTMARGIN, 237
         TOPMARGIN, 3
-        BOTTOMMARGIN, 122
+        BOTTOMMARGIN, 123
     END
 
     IDD_WINPT_KEYEDIT_SHOWPREF, DIALOG
@@ -438,7 +438,7 @@
     CONTROL         "List1",IDC_SIGNENC_KEYLIST,"SysListView32",LVS_REPORT | 
                     LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,368,147
     CONTROL         "Select key for signing",IDC_SIGNENC_SELKEY,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,156,83,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,156,169,10
     LTEXT           "Signing key:",IDC_SIGNENC_SECLISTINF,7,173,40,8
     COMBOBOX        IDC_SIGNENC_SECLIST,51,171,178,59,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
@@ -1938,8 +1938,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,11,0,0
- PRODUCTVERSION 0,11,0,0
+ FILEVERSION 0,11,1,0
+ PRODUCTVERSION 0,11,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -1957,14 +1957,14 @@
             VALUE "Comments", "This is free software under the terms of the GNU GPL v2\0"
             VALUE "CompanyName", "\0"
             VALUE "FileDescription", "Windows Privacy Tray (WinPT)\0"
-            VALUE "FileVersion", "0.11.0\0"
+            VALUE "FileVersion", "0.11.1\0"
             VALUE "InternalName", "WinPT\0"
             VALUE "LegalCopyright", " Copyright (C) 2005 Timo Schulz\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "WinPT.exe\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "Windows Privacy Tray\0"
-            VALUE "ProductVersion", "0.11.0\0"
+            VALUE "ProductVersion", "0.11.1\0"
             VALUE "SpecialBuild", "\0"
         END
     END

Modified: trunk/Src/resource.h
===================================================================
--- trunk/Src/resource.h	2005-11-16 13:13:41 UTC (rev 84)
+++ trunk/Src/resource.h	2005-11-18 07:20:40 UTC (rev 85)
@@ -585,6 +585,9 @@
 #define IDC_PREFS_KSINF                 1471
 #define IDC_PREFS_CACHEINF              1472
 #define IDC_PREFS_CACHEHINT             1473
+#define IDC_SIGPROPS_CLASSINF           1474
+#define IDC_SIGPROPS_KEYINF             1475
+#define IDC_SIGPROPS_KEYIDINF           1476
 #define ID_GPG_ENCRYPT                  40003
 #define ID_GPG_DECRYPT                  40004
 #define ID_GPG_SIGN                     40005
@@ -755,7 +758,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        230
 #define _APS_NEXT_COMMAND_VALUE         40176
-#define _APS_NEXT_CONTROL_VALUE         1474
+#define _APS_NEXT_CONTROL_VALUE         1477
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif

Modified: trunk/Src/wptClipVerifyDlg.cpp
===================================================================
--- trunk/Src/wptClipVerifyDlg.cpp	2005-11-16 13:13:41 UTC (rev 84)
+++ trunk/Src/wptClipVerifyDlg.cpp	2005-11-18 07:20:40 UTC (rev 85)
@@ -17,7 +17,6 @@
  * along with WinPT; if not, write to the Free Software Foundation, 
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -155,9 +154,8 @@
     
     switch( msg ) {
     case WM_INITDIALOG:
-    #ifndef LANG_DE
         SetWindowText (dlg, _("Verify"));
-    #endif
+	SetDlgItemText (dlg, IDC_VERIFY_SAVE, _("&Save"));
         kc = keycache_get_ctx (KEYCACHE_PUB);
         if (!kc)
 	    BUG (NULL);

Modified: trunk/Src/wptFileManagerDlg.cpp
===================================================================
--- trunk/Src/wptFileManagerDlg.cpp	2005-11-16 13:13:41 UTC (rev 84)
+++ trunk/Src/wptFileManagerDlg.cpp	2005-11-18 07:20:40 UTC (rev 85)
@@ -413,14 +413,19 @@
     static HWND statbar;
     static listview_ctrl_t lv = NULL;
     static HMENU menu = NULL;
-    static int always_ontop = 1;
+    static int always_ontop = 0;
     HWND fl;
     
     switch (msg) {
     case WM_INITDIALOG:
-	always_ontop = 1;
+	always_ontop = get_reg_winpt_flag ("AlwaysOnTop");
+	if (always_ontop == -1)
+	    always_ontop = 0;
+	SetWindowText (dlg, _("File Manager (use drag & drop to add files)"));
 	menu = LoadMenu (glob_hinst, (LPCSTR)IDR_WINPT_FILEMISC);
-        SetWindowText (dlg, _("File Manager (use drag & drop to add files)"));
+	set_menu_text_bypos (menu, 0, _("File"));
+	set_menu_text_bypos (menu, 1, _("Edit"));
+	set_menu_text_bypos (menu, 2, _("View"));
         set_menu_text (menu, ID_FILEMISC_OPEN, _("&Open...") );
         set_menu_text (menu, ID_FILEMISC_ENCRYPT, _("&Encrypt") );
         set_menu_text (menu, ID_FILEMISC_DECRYPT, _("&Decrypt") );
@@ -452,6 +457,8 @@
 	    }
 	}
         SetMenu (dlg, menu);
+	if (!always_ontop)
+	    set_menu_state (menu, ID_FILEMISC_ONTOP, MFS_UNCHECKED);
         fm_build (&lv, GetDlgItem (dlg, IDC_FILE_LIST));
 	center_window2 (dlg, NULL, HWND_TOPMOST);
 	center_window (dlg, NULL);
@@ -469,6 +476,7 @@
             DestroyMenu (menu);
             menu = NULL;
         }
+	set_reg_winpt_flag ("AlwaysOnTop", always_ontop);
         return FALSE;
         
     case WM_DROPFILES:
@@ -539,8 +547,8 @@
         
     case WM_INITMENUPOPUP:
 	if ((UINT)LOWORD (lparam) == 0) {
-	    HMENU h = (HMENU)wparam;
-	    set_menu_text_bypos (h, 2, _("&Calc Digest"));
+	    HMENU hm = (HMENU)wparam;
+	    set_menu_text_bypos (hm, 2, _("&Calc Digest"));
 	}
 	return FALSE;
 

Modified: trunk/Src/wptFileVerifyDlg.cpp
===================================================================
--- trunk/Src/wptFileVerifyDlg.cpp	2005-11-16 13:13:41 UTC (rev 84)
+++ trunk/Src/wptFileVerifyDlg.cpp	2005-11-18 07:20:40 UTC (rev 85)
@@ -17,7 +17,6 @@
  * along with WinPT; if not, write to the Free Software Foundation, 
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -47,12 +46,10 @@
     static listview_ctrl_t lv = NULL;
     int rc = 0;
     
-    switch( msg ) {
+    switch (msg) {
     case WM_INITDIALOG:
-	#ifndef LANG_DE
         SetWindowText (dlg, _("File Verify"));
 	SetDlgItemText (dlg, IDC_VERIFY_SAVE, _("&Save"));
-	#endif
         rc = verlist_build (&lv, GetDlgItem (dlg, IDC_VERIFY_SIGLIST), 1);
 	if (rc)
 	    BUG (dlg);

Modified: trunk/Src/wptGPG.cpp
===================================================================
--- trunk/Src/wptGPG.cpp	2005-11-16 13:13:41 UTC (rev 84)
+++ trunk/Src/wptGPG.cpp	2005-11-18 07:20:40 UTC (rev 85)
@@ -671,7 +671,12 @@
     if (ctx->last_access.dwHighDateTime != ctx->access.dwHighDateTime &&
 	ctx->last_access.dwLowDateTime != ctx->access.dwLowDateTime)
 	ctx->modified = 1;
-
+    
+    /* XXX: find a better way. without it, winpt --keymanager loads
+            the key cache twice otherwise. */
+    if (ctx->last_access.dwLowDateTime == 0)
+	ctx->modified = 0;
+    
     ctx->last_access.dwLowDateTime = ctx->access.dwLowDateTime;
     ctx->last_access.dwHighDateTime = ctx->access.dwHighDateTime;
 }

Modified: trunk/Src/wptGPGOptDlg.cpp
===================================================================
--- trunk/Src/wptGPGOptDlg.cpp	2005-11-16 13:13:41 UTC (rev 84)
+++ trunk/Src/wptGPGOptDlg.cpp	2005-11-18 07:20:40 UTC (rev 85)
@@ -48,11 +48,9 @@
 	if (!optbuf)
 	    dlg_fatal_error (dlg,  _("Could not load GnuPG config file!"));
 	SetDlgItemText (dlg, IDC_GPGOPT_FILE, optbuf);
-	#ifndef LANG_DE
 	SetWindowText (dlg, _("GnuPG Configuration File" ));
 	SetDlgItemText (dlg, IDC_GPGOPT_SAVE, _("&Save"));
 	SetDlgItemText (dlg, IDC_GPGOPT_LOAD, _("&Load"));
-	#endif
 	free_if_alloc( optbuf );
 	SetForegroundWindow( dlg );
 	return TRUE;

Modified: trunk/Src/wptKeyCacheDlg.cpp
===================================================================
--- trunk/Src/wptKeyCacheDlg.cpp	2005-11-16 13:13:41 UTC (rev 84)
+++ trunk/Src/wptKeyCacheDlg.cpp	2005-11-18 07:20:40 UTC (rev 85)
@@ -50,9 +50,7 @@
         SetForegroundWindow (dlg);
         ShowWindow (dlg, SW_HIDE);
 	center_window (dlg, NULL);
-	#ifndef LANG_DE
         SetWindowText (dlg, _("WinPT Key Caching"));
-	#endif
         ShowWindow (GetDlgItem (dlg, IDC_KEYCACHE_INFO), SW_SHOW);
         SetDlgItemText (dlg, IDC_KEYCACHE_INFO, 
 			_("Caching keyrings, please wait..."));

Modified: trunk/Src/wptKeyManagerDlg.cpp
===================================================================
--- trunk/Src/wptKeyManagerDlg.cpp	2005-11-16 13:13:41 UTC (rev 84)
+++ trunk/Src/wptKeyManagerDlg.cpp	2005-11-18 07:20:40 UTC (rev 85)
@@ -191,6 +191,7 @@
 } /* load_toolbar */
 
 
+/* Center window @dlg. */
 static void
 do_center_window (HWND dlg, struct km_info * kmi)
 {
@@ -204,35 +205,37 @@
 
     kmi->ypos_sep = rect.bottom;
 
-    p = get_reg_entry( HKEY_CURRENT_USER, "Software\\WinPT", "KM_Pos_X" );
-    if( p && !strcmp( p, " " ) ) {
-	free_if_alloc( p );	
-	center_window( dlg, NULL );
+    p = get_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "KM_Pos_X");
+    if (p && !strcmp (p, " ")) {
+	free_if_alloc (p);
+	center_window (dlg, NULL);
 	return;
     }
-    else if( p )
-	pos_x = atol( p );
+    else if (p)
+	pos_x = atol (p);
 
-    p = get_reg_entry( HKEY_CURRENT_USER, "Software\\WinPT", "KM_Pos_Y" );
-    if( p && !strcmp( p, " " ) ) {
-	free_if_alloc( p );
-	center_window( dlg, NULL );
+    p = get_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "KM_Pos_Y");
+    if (p && !strcmp (p, " ")) {
+	free_if_alloc (p);
+	center_window(dlg, NULL);
 	return;
     }
-    else if( p )
-	pos_y = atol( p );
+    else if (p)
+	pos_y = atol (p);
 
-    if( !pos_y && !pos_x ) {
-	center_window( dlg, NULL );
+    if (!pos_y && !pos_x) {
+	center_window (dlg, NULL);
 	return;
     }
     
-    if( pos_x > GetSystemMetrics( SM_CXSCREEN ) 
-	|| pos_y > GetSystemMetrics( SM_CYSCREEN ) ) {
+    if (pos_x < 0 || pos_y < 0)
 	pos_x = pos_y = 0;
+    if (pos_x > GetSystemMetrics (SM_CXSCREEN)
+	|| pos_y > GetSystemMetrics (SM_CYSCREEN)) {
+	pos_x = pos_y = 0;
     }
-    GetClientRect( dlg, &rect );
-    MoveWindow( dlg, pos_x, pos_y, rect.right, rect.bottom, TRUE );
+    GetClientRect (dlg, &rect);
+    MoveWindow (dlg, pos_x, pos_y, rect.right, rect.bottom, TRUE);
 }
 
 
@@ -682,11 +685,13 @@
 	kmi->hwnd_sep = regist_sep_wnd (dlg, kmi);
         imagelist_load (dlg);
 
-#ifndef LANG_DE
         SetWindowText( dlg, _("Key Manager") );
-#endif        
         menu = LoadMenu( glob_hinst, (LPCSTR)IDR_WINPT_KEYMISC );
-#ifndef LANG_DE
+	set_menu_text_bypos (menu, 0, _("File"));
+	set_menu_text_bypos (menu, 1, _("Edit"));
+	set_menu_text_bypos (menu, 2, _("View"));
+	set_menu_text_bypos (menu, 3, _("Key"));
+	set_menu_text (menu, ID_KEYMISC_EDITKEY, _("Edit"));
 	set_menu_text (menu, ID_KEYMISC_MAIL, _("Send Mail..."));
 	set_menu_text (menu, ID_KEYMISC_OT, _("Ownertrust")); /* XXX */
 	set_menu_text (menu, ID_KEYMISC_COPY, _("&Copy\tCtrl+C"));
@@ -715,8 +720,7 @@
 	set_menu_text (menu, ID_KEYMISC_REFRESH_KEYS, _("Refresh &Keys (Keyserver)"));
 	set_menu_text (menu, ID_KEYMISC_INFO, _("Info") );
 	set_menu_text (menu, ID_KEYMISC_HELP, _("&Help"));
-	
-#endif
+
         SetMenu (dlg, menu);
         if( keyring_check_last_access() )
             keycache_set_reload( 1 );

Modified: trunk/Src/wptPassphraseCB.cpp
===================================================================
--- trunk/Src/wptPassphraseCB.cpp	2005-11-16 13:13:41 UTC (rev 84)
+++ trunk/Src/wptPassphraseCB.cpp	2005-11-18 07:20:40 UTC (rev 85)
@@ -80,6 +80,7 @@
 	c = (passphrase_cb_s *)lparam;
 	if (!c)
 	    BUG (0);
+	SetDlgItemText (dlg, IDC_DECRYPT_HIDE, _("&Hide Typing"));
 	SetWindowText (dlg, c->title);
 	if (c->gpg_cmd == GPG_CMD_DECRYPT) {
 	    SetDlgItemText (dlg, IDC_DECRYPT_LISTINF,

Modified: trunk/Src/wptRegistry.cpp
===================================================================
--- trunk/Src/wptRegistry.cpp	2005-11-16 13:13:41 UTC (rev 84)
+++ trunk/Src/wptRegistry.cpp	2005-11-18 07:20:40 UTC (rev 85)
@@ -116,8 +116,11 @@
 } /* regist_inst_gpg */
 
 
-/* Install WinPT into the W32 registry, if the entry already 
-   exists the function returns immediately.*/
+/* Install WinPT into the W32 registry, if the entry already
+   exists the function returns immediately. @with_ext can be
+   used to register some file types (if 1). @created contains
+   1 if the registry key was created.
+   Return value: 0 on success. */
 int
 regist_inst_winpt (int with_ext, int * created)
 {
@@ -126,45 +129,45 @@
     char modpath[MAX_PATH+1];
     int rc, i, id, n = 0;
 
-    if( created )
+    if (created)
 	*created = 0;
 
     p = get_reg_entry (HKEY_CURRENT_USER, WINPT_REG, "Extensions");
     if (p && *p == '1')
 	with_ext = 0;
-    free_if_alloc( p );
+    free_if_alloc (p);
 
-    if( with_ext ) {
-	id = msg_box( NULL, _("WinPT can register some GPG file types for you so they can "
+    if (with_ext) {
+	id = msg_box (NULL, _("WinPT can register some GPG file types for you so they can "
 	                      "be processed with a double click in the explorer.\n"
-			      "Do you want to continue?"), _("WinPT"), MB_YESNO|MB_INFO );
-	if( id == IDNO ) {
-	    set_reg_entry( HKEY_CURRENT_USER, WINPT_REG, "Extensions", "1" );
+			      "Do you want to continue?"), _("WinPT"), MB_YESNO|MB_INFO);
+	if (id == IDNO) {
+	    set_reg_entry (HKEY_CURRENT_USER, WINPT_REG, "Extensions", "1");
 	    goto start;
 	}
-	for( i = 0; gpg_filetypes[i].ext; i++ ) {
-	    rc = RegOpenKeyEx( HKEY_CLASSES_ROOT, gpg_filetypes[i].ext, 0, KEY_READ, &reg );
-	    if( rc_ok( rc ) ) {
-		RegCloseKey( reg );
-		id = log_box( _("WinPT WARNING"), MB_YESNO|MB_INFO, 
+	for (i = 0; gpg_filetypes[i].ext; i++) {
+	    rc = RegOpenKeyEx (HKEY_CLASSES_ROOT, gpg_filetypes[i].ext, 0, KEY_READ, &reg);
+	    if (rc_ok (rc)) {
+		RegCloseKey (reg);
+		id = log_box (_("WinPT WARNING"), MB_YESNO|MB_INFO, 
 			      _("It seems there was already a '%s' file type registered by another application.\n"
-			        "Do you want to overwrite it?"), gpg_filetypes[i].ext );
-		if( id == IDNO )
+			        "Do you want to overwrite it?"), gpg_filetypes[i].ext);
+		if (id == IDNO)
 		    continue;
 	    }
-	    regist_single_filetype( &gpg_filetypes[i] );
+	    regist_single_filetype (&gpg_filetypes[i]);
 	    n++;
 	}
     }
 	
 start:
-    rc = RegOpenKeyEx( HKEY_CURRENT_USER, WINPT_REG, 0, KEY_READ, &reg );
-    if( rc_ok( rc ) ) {	
-	RegCloseKey( reg );
-	rc = RegOpenKeyEx( HKEY_CURRENT_USER, WINPT_REG"\\Keyserver", 0, KEY_READ, &reg );
-	if( !rc_ok( rc ) ) {
-	    RegCreateKey( HKEY_CURRENT_USER, WINPT_REG"\\Keyserver", &reg );
-	    RegCloseKey( reg );
+    rc = RegOpenKeyEx (HKEY_CURRENT_USER, WINPT_REG, 0, KEY_READ, &reg);
+    if (rc_ok (rc)) {	
+	RegCloseKey (reg);
+	rc = RegOpenKeyEx (HKEY_CURRENT_USER, WINPT_REG"\\Keyserver", 0, KEY_READ, &reg);
+	if (!rc_ok (rc)) {
+	    RegCreateKey (HKEY_CURRENT_USER, WINPT_REG"\\Keyserver", &reg);
+	    RegCloseKey (reg);
 	}
 	p = get_reg_entry_keyserver ("Default");
 	if (!p) {
@@ -173,19 +176,19 @@
 	    set_reg_entry_keyserver ("Default_Port", buf);
 	    set_reg_entry_keyserver ("Default", DEF_HKP_KEYSERVER);
 	}
-	free_if_alloc( p );
-	if( n )
-	    set_reg_entry( HKEY_CURRENT_USER, WINPT_REG, "Extensions", "1" );
+	free_if_alloc (p);
+	if (n)
+	    set_reg_entry (HKEY_CURRENT_USER, WINPT_REG, "Extensions", "1");
 	return 0;
     }
-    rc = RegCreateKey( HKEY_CURRENT_USER, WINPT_REG, &reg );
-    if( !rc_ok( rc ) )
+    rc = RegCreateKey(HKEY_CURRENT_USER, WINPT_REG, &reg);
+    if (!rc_ok (rc))
 	return WPTERR_REGISTRY;
-    if( created )
+    if (created)
 	*created = 1;
-    RegCloseKey( reg );
-    if( n )
-	set_reg_entry( HKEY_CURRENT_USER, WINPT_REG, "Extensions", "1" );
+    RegCloseKey (reg);
+    if (n)
+	set_reg_entry (HKEY_CURRENT_USER, WINPT_REG, "Extensions", "1");
     if ((n=GetModuleFileName (NULL, modpath, MAX_PATH-1)) > 0) {
 	while (n-- > 0) {
 	    if (modpath[n] == '\\') {

Deleted: trunk/WinPT.dsp
===================================================================
--- trunk/WinPT.dsp	2005-11-16 13:13:41 UTC (rev 84)
+++ trunk/WinPT.dsp	2005-11-18 07:20:40 UTC (rev 85)
@@ -1,617 +0,0 @@
-# Microsoft Developer Studio Project File - Name="WinPT" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** NICHT BEARBEITEN **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=WinPT - Win32 Debug
-!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
-!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
-!MESSAGE 
-!MESSAGE NMAKE /f "WinPT.mak".
-!MESSAGE 
-!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
-!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
-!MESSAGE 
-!MESSAGE NMAKE /f "WinPT.mak" CFG="WinPT - Win32 Debug"
-!MESSAGE 
-!MESSAGE Für die Konfiguration stehen zur Auswahl:
-!MESSAGE 
-!MESSAGE "WinPT - Win32 Release" (basierend auf  "Win32 (x86) Application")
-!MESSAGE "WinPT - Win32 Debug" (basierend auf  "Win32 (x86) Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "WinPT - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "c:\oss\w32root\include" /I "Src" /I "MyGPGME" /I "Include" /I "Gnupg" /I "PTD" /I "w32gpgme" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "HAVE_DOSISH_SYSTEM" /U "LANG_DE" /U "AFX_TARG_DEU" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x407 /d "NDEBUG"
-# ADD RSC /l 0x407 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 ptd/release/ptd.lib c:\oss\w32root\lib\libgpgme-11.lib comctl32.lib ws2_32.lib kernel32.lib user32.lib comdlg32.lib advapi32.lib shell32.lib gdi32.lib oleaut32.lib /nologo /subsystem:windows /machine:I386
-# SUBTRACT LINK32 /profile /nodefaultlib
-
-!ELSEIF  "$(CFG)" == "WinPT - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "c:\oss\w32root\include" /I "Src" /I "MyGPGME" /I "Include" /I "Gnupg" /I "PTD" /I "w32gpgme" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "HAVE_DOSISH_SYSTEM" /YX /FD /GZ /c
-# SUBTRACT CPP /Fr
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x407 /d "_DEBUG"
-# ADD RSC /l 0x407 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 ptd/release/ptd.lib c:\oss\w32root\lib\libgpgme-11.lib comctl32.lib ws2_32.lib kernel32.lib user32.lib comdlg32.lib advapi32.lib shell32.lib gdi32.lib oleaut32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "WinPT - Win32 Release"
-# Name "WinPT - Win32 Debug"
-# Begin Group "Resources"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\Src\ChangeLog
-# End Source File
-# Begin Source File
-
-SOURCE=.\resource.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Safe.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\Sign.ico
-# End Source File
-# Begin Source File
-
-SOURCE=".\WinPT-en.rc"
-# End Source File
-# Begin Source File
-
-SOURCE=.\winpt2.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\winpt_km.bmp
-# End Source File
-# End Group
-# Begin Group "Dialogs"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\Src\wptAboutDlgs.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptCardDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptClipDecryptDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptClipEditDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptClipEncryptDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptClipImportDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptClipSignDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptClipSignEncDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptClipVerifyDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptCommonDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptDateDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptFileManagerDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptFileSaveDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptFileStatDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptFileVerifyDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptFirstRunDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptGPGOptDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptGPGPrefsDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptGroupsDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptKeyCacheDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptKeyEditDlgs.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptKeyEditOwnertrustDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptKeyeditSetPrefDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptKeygenCBDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptKeygenDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptKeyImportStatusDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptKeyManagerDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptKeyPropsDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptKeyRevokeDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptKeyRevokersDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptKeyserverDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptKeyserverSearchDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptKeysigDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptKeysignDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptKeyTrustPathDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptMDSumDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptOwnertrustDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptPassphraseDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptPINDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptPreferencesDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptProgressDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptProxySettingsDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptTextInputDlg.cpp
-# End Source File
-# End Group
-# Begin Group "Headerfiles"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\Include\wptAgent.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Include\wptCard.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Include\wptCardEdit.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Include\wptCommonCtl.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Include\wptContext.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Include\wptCryptdisk.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Include\wptCrypto.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Include\wptDlgs.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Include\wptErrors.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Include\wptFileManager.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Include\wptGPG.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Include\wptGpgCmds.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Include\WptGPGOptSkel.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Include\wptHotkey.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Include\wptHTTP.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Include\wptImport.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Include\wptKeyCache.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Include\wptKeyEdit.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Include\wptKeylist.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Include\wptKeyManager.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Include\wptKeyserver.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Include\wptNLS.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Include\wptRegistry.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Include\wptTypes.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Include\wptUTF8.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Include\wptVersion.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Include\wptW32API.h
-# End Source File
-# End Group
-# Begin Group "Icons"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\icons\key_delete.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\icons\key_export.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\icons\key_import.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\icons\key_props.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\icons\key_sign.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\icons\sort_downarrow.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\icons\sort_uparrow.ico
-# End Source File
-# End Group
-# Begin Group "W32-GPGME"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\w32gpgme\clip.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\w32gpgme\data.c
-# End Source File
-# Begin Source File
-
-SOURCE=".\w32gpgme\w32-clip.c"
-# End Source File
-# Begin Source File
-
-SOURCE=.\w32gpgme\w32gpgme.h
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=.\Src\WinPT.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptCardEdit.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptCardEditCB.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptCardManager.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptCardPCSC.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptCryptdisk.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptCurrWnd.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptErrors.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptFileCBS.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptFileManager.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptGPG.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptGPGME.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptGPGParser.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptGPGUtil.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptHotkey.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptHTTP.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptImagelist.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptImportList.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptKeyCache.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptKeyEdit.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptKeyEditCB.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptKeylist.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptKeyManager.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptKeyserver.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptListView.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptMainProc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptMAPI.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptNLS.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptPassCache.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptPassphraseCB.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptRegistry.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptSigList.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptSymEnc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptTrayPop.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptUTF8.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptUtil.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptVerifyList.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Src\wptW32API.cpp
-# End Source File
-# End Target
-# End Project

Deleted: trunk/WinPT.dsw
===================================================================
--- trunk/WinPT.dsw	2005-11-16 13:13:41 UTC (rev 84)
+++ trunk/WinPT.dsw	2005-11-18 07:20:40 UTC (rev 85)
@@ -1,65 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNUNG: DIESE ARBEITSBEREICHSDATEI DARF NICHT BEARBEITET ODER GELÖSCHT WERDEN!
-
-###############################################################################
-
-Project: "PTD"=".\PTD\PTD.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "WinPT"=".\WinPT.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "gnupg"=".\gnupg\gnupg.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "tests"=".\tests\tests.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-

Modified: trunk/w32gpgme/w32-clip.c
===================================================================
--- trunk/w32gpgme/w32-clip.c	2005-11-16 13:13:41 UTC (rev 84)
+++ trunk/w32gpgme/w32-clip.c	2005-11-18 07:20:40 UTC (rev 85)
@@ -24,7 +24,7 @@
 int gpg_data_wrap_lines (gpgme_data_t *r_dh, size_t wraplen);
 
 //FIXME #include "wptVersion.h"
-#define PGM_VERSION "0.11.0-beta"
+#define PGM_VERSION "0.11.1-beta"
 
 /* Retrieve the thext of the clipboard.
    Return value: the text as a string, NULL otherwise. */



More information about the Winpt-commits mailing list