/[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 65 by werner, Wed Nov 2 13:36:03 2005 UTC revision 66 by twoaday, Thu Nov 3 17:55:18 2005 UTC
# Line 156  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 217  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    

Legend:
Removed from v.65  
changed lines
  Added in v.66

[email protected]
ViewVC Help
Powered by ViewVC 1.1.26