/[winpt]/trunk/Src/WinPT.cpp
ViewVC logotype

Diff of /trunk/Src/WinPT.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 47 by werner, Mon Oct 31 14:04:59 2005 UTC revision 58 by werner, Wed Nov 2 13:36:03 2005 UTC
# Line 22  Line 22 
22  #endif  #endif
23    
24  #include <windows.h>  #include <windows.h>
 #include <windows.h>  
25    
26  #include "resource.h"  #include "resource.h"
27  #include "wptTypes.h"  #include "wptTypes.h"
# Line 39  Line 38 
38  #include "wptFileManager.h"  #include "wptFileManager.h"
39  #include "wptContext.h"  #include "wptContext.h"
40  #include "wptCardEdit.h"  #include "wptCardEdit.h"
41    #include "wptCrypto.h"
42    
43  #define MIN_GPG_VER   "1.4.3"   /* Minimal GPG version. */  #define MIN_GPG_VER   "1.4.3"   /* Minimal GPG version. */
44  #define MIN_GPGME_VER "1.2.0"   /* Minimal GPGME version. */  #define MIN_GPGME_VER "1.2.0"   /* Minimal GPGME version. */
# Line 188  check_crypto_engine (void) Line 187  check_crypto_engine (void)
187          return rc;          return rc;
188      }      }
189      /* We enable smartcard support for GPG: 1.9 or >= 1.4 */      /* We enable smartcard support for GPG: 1.9 or >= 1.4 */
190      if (ma >= 1 && mi >= 4)      if ((ma == 1 && mi >= 4) || ma > 1)
191          scard_support = 1;          scard_support = 1;
192    
193      gpgver[0] = ma;      gpgver[0] = ma;
# Line 255  WinMain (HINSTANCE hinst, HINSTANCE hpre Line 254  WinMain (HINSTANCE hinst, HINSTANCE hpre
254    
255      glob_hinst = hinst;      glob_hinst = hinst;
256    
257      #ifdef _DEBUG  #ifdef _DEBUG
258      gpg_set_debug_mode (1);      gpg_set_debug_mode (1);
259      debug = 1;      debug = 1;
260      #endif  #endif
261    
262      s = PTD_get_version ();      s = PTD_get_version ();
263      if (strcmp (s, MIN_PTD_VER)) {      // FIXME: Using strcmp here is wrong
264          log_box (_("Privacy Tray Dynamic (PTD)"), MB_ERR,  //     if (strcmp (s, MIN_PTD_VER)) {
265                   _("Please update your PTD.dll to the newest version, "  //      log_box (_("Privacy Tray Dynamic (PTD)"), MB_ERR,
266                     "the version (%s) you use is too old."), s);  //               _("Please update your PTD.dll to the newest version, "
267          return 0;  //                 "the version (%s) you use is too old."), s);
268      }  //      return 0;
269    //     }
270    
271      if (gpg_md_selftest ()) {      if (gpg_md_selftest ()) {
272          msg_box (NULL, _("Cryptographic selftest failed."),          msg_box (NULL, _("Cryptographic selftest failed."),
# Line 319  WinMain (HINSTANCE hinst, HINSTANCE hpre Line 319  WinMain (HINSTANCE hinst, HINSTANCE hpre
319                   _("GPG home directory is not set correctly.\n"                   _("GPG home directory is not set correctly.\n"
320                     "Please check the GPG registry settings:\n%s."),                     "Please check the GPG registry settings:\n%s."),
321                   winpt_strerror (rc));                   winpt_strerror (rc));
322          const char * s = get_fileopen_dlg (GetActiveWindow (),          s = get_fileopen_dlg (GetActiveWindow (),
323                                             _("Select GPG Public Keyring"),                                _("Select GPG Public Keyring"),
324                                             _("GPG Keyrings (*.gpg)\0*.gpg\0\0"),                                _("GPG Keyrings (*.gpg)\0*.gpg\0\0"),
325                                             NULL);                                NULL);
326          if (s != NULL) {          if (s != NULL) {
327              size_t n;              size_t n;
328              char * p = strrchr (s, '\\');              char * p = strrchr (s, '\\');
# Line 479  WinMain (HINSTANCE hinst, HINSTANCE hpre Line 479  WinMain (HINSTANCE hinst, HINSTANCE hpre
479            
480      if (start_gpgprefs) {      if (start_gpgprefs) {
481          char *ring;          char *ring;
482          size_t size = 0;  
483          DialogBoxParam (glob_hinst, (LPCTSTR)IDD_WINPT_GPGPREFS, hwnd,          DialogBoxParam (glob_hinst, (LPCTSTR)IDD_WINPT_GPGPREFS, hwnd,
484                          gpgprefs_dlg_proc, 0);                          gpgprefs_dlg_proc, 0);
485          ring = get_gnupg_keyring (0, !NO_STRICT);          ring = get_gnupg_keyring (0, !NO_STRICT);
Legend:
Removed from v.47  
changed lines
  Added in v.58
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26