[svn] GPGol - r140 - in trunk: . src

[svn author wk]

Author: wk
Date: 2006-03-20 13:05:18 +0100 (Mon, 20 Mar 2006)
New Revision: 140

Modified:
   trunk/NEWS
   trunk/configure.ac
   trunk/src/ChangeLog
   trunk/src/main.c
   trunk/src/olflange.cpp
   trunk/src/passphrase-dialog.c
Log:
Additional test for old OL versions.


Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2006-03-14 12:13:21 UTC (rev 139)
+++ trunk/NEWS	2006-03-20 12:05:18 UTC (rev 140)
@@ -1,3 +1,8 @@
+Noteworthy changes for version 0.9.7
+=================================================
+
+
+
 Noteworthy changes for version 0.9.6 (2006-01-26)
 =================================================
 

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-03-14 12:13:21 UTC (rev 139)
+++ trunk/configure.ac	2006-03-20 12:05:18 UTC (rev 140)
@@ -16,7 +16,7 @@
 # Version number: Remember to change it immediately *after* a release.
 #                 Make sure to run  "svn up" before a "make dist".
 #                 Add a "-cvs" prefix for non-released code.
-AC_INIT(gpgol, 0.9.6, bug-gpgol at g10code.com)
+AC_INIT(gpgol, 0.9.7-cvs, bug-gpgol at g10code.com)
 
 NEED_GPGME_API=1
 NEED_GPGME_VERSION=1.1.0

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2006-03-14 12:13:21 UTC (rev 139)
+++ trunk/src/ChangeLog	2006-03-20 12:05:18 UTC (rev 140)
@@ -1,3 +1,11 @@
+2006-03-20  Werner Koch  <wk at g10code.com>
+
+	* olflange.cpp (Install): Also check major part of build version.
+
+2006-03-15  Werner Koch  <wk at g10code.com>
+
+	* olflange.cpp (Install): Print gpgol version for debugging.
+
 2006-03-14  Timo Schulz  <ts at g10code.com>
 
 	* passphrase-dialog.c (decrypt_dlg_proc): When used
@@ -4,6 +12,10 @@
 	as a signing key selection dialog, use a different title.
 	* gpgol-rsrcs.rc: Use German titles for German dialog versions.
 	
+2006-02-23  Werner Koch  <wk at g10code.com>
+
+	* main.c (read_options): Set default caching time to 10 minutes.
+
 2006-01-16  Werner Koch  <wk at g10code.com>
 
 	* verify-dialog.c (load_sigbox): Give a hint in case of a bad
@@ -13,7 +25,7 @@
 
 2005-12-07  Werner Koch  <wk at g10code.com>
 
-	* olflange.cpp (Install): Cehck the version and print a warning.
+	* olflange.cpp (Install): Check the version and print a warning.
 
 	* olflange-dlgs.cpp (GPGOptionsDlgProc): Simplified the default
 	key code.

Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c	2006-03-14 12:13:21 UTC (rev 139)
+++ trunk/src/main.c	2006-03-20 12:05:18 UTC (rev 140)
@@ -388,8 +388,10 @@
   opt.enable_default_key = val == NULL || *val != '1' ? 0 : 1;
   xfree (val); val = NULL;
 
-  load_extension_value ("storePasswdTime", &val);
-  opt.passwd_ttl = val == NULL || *val == '0'? 0 : atol (val);
+  if (load_extension_value ("storePasswdTime", &val) )
+    opt.passwd_ttl = 600; /* Initial default. */
+  else
+    opt.passwd_ttl = val == NULL || *val == '0'? 0 : atol (val);
   xfree (val); val = NULL;
 
   load_extension_value ("encodingFormat", &val);

Modified: trunk/src/olflange.cpp
===================================================================
--- trunk/src/olflange.cpp	2006-03-14 12:13:21 UTC (rev 139)
+++ trunk/src/olflange.cpp	2006-03-20 12:05:18 UTC (rev 140)
@@ -706,6 +706,7 @@
                lFlags);
   
   /* Check version. */
+  log_debug ("GPGol: this is %s\n", SRCNAME, __func__, PACKAGE_STRING);
   pEECB->GetVersion (&lBuildVersion, EECBGV_GETBUILDVERSION);
   pEECB->GetVersion (&lActualVersion, EECBGV_GETACTUALVERSION);
   pEECB->GetVersion (&lVirtualVersion, EECBGV_GETVIRTUALVERSION);
@@ -733,7 +734,8 @@
                    SRCNAME, __func__, lBuildVersion);
       return S_FALSE;
     }
-  if ((lBuildVersion & EECBGV_BUILDVERSION_MINOR_MASK) < 1573)
+  if ((lBuildVersion & EECBGV_BUILDVERSION_MAJOR_MASK) < 13
+      ||(lBuildVersion & EECBGV_BUILDVERSION_MINOR_MASK) < 1573)
     {
       static int shown;
       HWND hwnd;

Modified: trunk/src/passphrase-dialog.c
===================================================================
--- trunk/src/passphrase-dialog.c	2006-03-14 12:13:21 UTC (rev 139)
+++ trunk/src/passphrase-dialog.c	2006-03-20 12:05:18 UTC (rev 140)
@@ -559,7 +559,7 @@
 
 /* Display a signer dialog which contains all secret keys, useable for
    signing data.  The key is returned in R_KEY.  The passprase in
-   r_passwd.  IF Encrypting is true, the message will get encrypted
+   r_passwd.  If Encrypting is true, the message will get encrypted
    later. */
 int 
 signer_dialog_box (gpgme_key_t *r_key, char **r_passwd, int encrypting)
@@ -659,8 +659,8 @@
        For caching we need to use the long keyid from case 1; the main
        keyid can't be used because a key may have different
        passphrases on the subkeys.  Caching for symmetrical keys is
-       not possible becuase there is no information on what
-       key(i.e. passphrase) to use.  Caching of of PINs is not yet
+       not possible because there is no information on what
+       key(i.e. passphrase) to use.  Caching of PINs is not yet
        possible because we don't have information on the card's serial
        number yet; that must be solved by gpgme. 
 
@@ -710,7 +710,7 @@
   assert (strlen (keyidstr) < sizeof dec->keyid);
   strcpy (dec->keyid, keyidstr);
 
-  /* If we have no cached pssphrase, popup the passphrase dialog. */
+  /* If we have no cached passphrase, popup the passphrase dialog. */
   if (!dec->pass)
     {
       int rc;