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

Diff of /trunk/Src/wptPassphraseCB.cpp

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

revision 214 by twoaday, Sun May 14 18:40:36 2006 UTC revision 217 by twoaday, Mon May 22 14:21:39 2006 UTC
# Line 70  passphrase_callback_proc (HWND dlg, UINT Line 70  passphrase_callback_proc (HWND dlg, UINT
70      static passphrase_cb_s *c;      static passphrase_cb_s *c;
71      gpgme_decrypt_result_t res=NULL;      gpgme_decrypt_result_t res=NULL;
72      gpgme_sign_result_t res_sig=NULL;      gpgme_sign_result_t res_sig=NULL;
     gpgme_key_t key;  
73      gpgme_recipient_t recip=NULL, r;      gpgme_recipient_t recip=NULL, r;
74        winpt_key_s key;
75      void *item;      void *item;
76      const char *id;      const char *id;
77      char *info;      char *info;
# Line 115  passphrase_callback_proc (HWND dlg, UINT Line 115  passphrase_callback_proc (HWND dlg, UINT
115          }          }
116          if (recip != NULL && c->gpg_cmd == GPG_CMD_DECRYPT) {          if (recip != NULL && c->gpg_cmd == GPG_CMD_DECRYPT) {
117              for (r = recip; r; r = r->next) {              for (r = recip; r; r = r->next) {
118                  get_pubkey (r->keyid, &key);                  memset (&key, 0, sizeof (key));
119                  if (key) {                  if (!winpt_get_pubkey (r->keyid, &key)) {
120                      gpgme_user_id_t u = key->uids;                      gpgme_user_id_t u = key.ctx->uids;
121    
122                      id = u->name;                      id = u->name;
123                      if (!id)                      if (!id)
# Line 144  passphrase_callback_proc (HWND dlg, UINT Line 144  passphrase_callback_proc (HWND dlg, UINT
144                  }                  }
145                  ListBox_AddString_utf8 (GetDlgItem (dlg, IDC_DECRYPT_LIST), info);                  ListBox_AddString_utf8 (GetDlgItem (dlg, IDC_DECRYPT_LIST), info);
146                  free_if_alloc (info);                  free_if_alloc (info);
147                    winpt_release_pubkey (&key);
148              }              }
149          }          }
150          else if (c->gpg_cmd == GPG_CMD_DECRYPT)          else if (c->gpg_cmd == GPG_CMD_DECRYPT)

Legend:
Removed from v.214  
changed lines
  Added in v.217

[email protected]
ViewVC Help
Powered by ViewVC 1.1.26