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

Diff of /trunk/Src/wptGPG.cpp

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

revision 41 by twoaday, Fri Oct 28 07:15:26 2005 UTC revision 66 by twoaday, Thu Nov 3 17:55:18 2005 UTC
# Line 17  Line 17 
17   * along with WinPT; if not, write to the Free Software Foundation,   * along with WinPT; if not, write to the Free Software Foundation,
18   * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA   * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19   */   */
20    #ifdef HAVE_CONFIG_H
21    #include <config.h>
22    #endif
23    
24  #include <windows.h>  #include <windows.h>
25    #include <shlobj.h>
26  #include <string.h>  #include <string.h>
27  #include <stdio.h>  #include <stdio.h>
28  #include <shlobj.h>  #include <shlobj.h>
# Line 26  Line 31 
31  #include <time.h>  #include <time.h>
32    
33  #include "wptGPG.h"  #include "wptGPG.h"
34  #include "wptGPGCmds.h"  #include "wptGpgCmds.h"
35  #include "wptGPGOptSkel.h"  #include "wptGPGOptSkel.h"
36  #include "wptTypes.h"  #include "wptTypes.h"
37  #include "wptNLS.h"  #include "wptNLS.h"
# Line 151  get_gnupg_keyring (int pub, int strict) Line 156  get_gnupg_keyring (int pub, int strict)
156          free_if_alloc (path);          free_if_alloc (path);
157          return keyring;          return keyring;
158      }      }
159      if (file_exist_check (keyring) || get_file_size (keyring) == 0) {      if (file_exist_check (keyring) || pub && get_file_size (keyring) == 0) {
160          free_if_alloc (keyring);          free_if_alloc (keyring);
161          optfile = make_filename (path, GPG_CONF, NULL);          optfile = make_filename (path, GPG_CONF, NULL);
162          keyring = get_gnupg_keyring_from_options (optfile, pub);          keyring = get_gnupg_keyring_from_options (optfile, pub);
# Line 165  get_gnupg_keyring (int pub, int strict) Line 170  get_gnupg_keyring (int pub, int strict)
170  /* Return the full path (with the gpg exe name). First the registry is scanned  /* Return the full path (with the gpg exe name). First the registry is scanned
171     for the entry 'gpgProgram'. If it wasn't set, the default path is the     for the entry 'gpgProgram'. If it wasn't set, the default path is the
172     appended string 'gpg.exe' is used. */     appended string 'gpg.exe' is used. */
173    
174    /* FIXME:  Use gpgme's engine info here. */
175  char*  char*
176  get_gnupg_prog (void)  get_gnupg_prog (void)
177  {      {    
# Line 210  default_key_from_cache (int *ret_no_usea Line 217  default_key_from_cache (int *ret_no_usea
217              break;              break;
218          }          }
219      }      }
220      if (!keyid) {      if (!keyid)
221          *ret_no_useable = 1;          *ret_no_useable = 1;
         msg_box (NULL, _("No useable secret key found."), _("GPG Error"), MB_ERR);  
     }  
222      return keyid;      return keyid;
223  }  }
224    
# Line 353  check_gnupg_engine (int *r_major, int *r Line 358  check_gnupg_engine (int *r_major, int *r
358          gpgme_release (ctx);          gpgme_release (ctx);
359          return rc;          return rc;
360      }      }
361    
362        /* FIXME: This check is wrong! */
363      if (major < *r_major || minor < *r_minor)      if (major < *r_major || minor < *r_minor)
364          rc = 1;          rc = 1;
365      else {      else {
Legend:
Removed from v.41  
changed lines
  Added in v.66
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26