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

Diff of /trunk/Src/wptMAPI.cpp

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

revision 22 by twoaday, Wed Aug 10 11:33:35 2005 UTC revision 24 by twoaday, Sat Oct 8 10:43:08 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  #include <windows.h>  #include <windows.h>
21  #include <stdio.h>  #include <stdio.h>
22  #include <mapi.h>  #include <mapi.h>
# Line 73  mapi_deinit (void) Line 72  mapi_deinit (void)
72      }      }
73  } /* mapi_deinit */  } /* mapi_deinit */
74    
75    #if 0 /* low:priority XXX port the code */
76  int  int
77  mapi_send_ascfile (char * ascfile)  mapi_send_ascfile (char *ascfile)
78  {  {
79      LHANDLE hd;      LHANDLE hd;
80      int rc;      int rc;
# Line 101  fail: Line 100  fail:
100    
101    
102  int  int
103  mapi_send_pubkey (const char * keyid, char * keyfile)  mapi_send_pubkey (const char *keyid, char *keyfile)
104  {  {
105      LHANDLE hd;      LHANDLE hd;
106      const char * fmt;      const char * fmt;
# Line 146  free_mapi_msg (MapiMessage * msg) Line 145  free_mapi_msg (MapiMessage * msg)
145    
146    
147  static void  static void
148  free_recip_tab (MapiRecipDesc * recip, size_t n)  free_recip_tab (MapiRecipDesc *recip, size_t n)
149  {  {
150      size_t i;      size_t i;
151    
# Line 209  conv_recipients (gpgme_recipients_t rset Line 208  conv_recipients (gpgme_recipients_t rset
208    
209    
210  static char *  static char *
211  secure_attachment (gpgme_recipients_t rset, const char * fname)  secure_attachment (gpgme_recipients_t rset, const char *fname)
212  {  {
213      char tmpdir[512+32], * p;      char tmpdir[512+32], * p;
214      gpgme_recipients_t addrs;      gpgme_recipients_t addrs;
# Line 229  secure_attachment (gpgme_recipients_t rs Line 228  secure_attachment (gpgme_recipients_t rs
228      rc = gpgme_new (&ctx);      rc = gpgme_new (&ctx);
229      if (rc)      if (rc)
230          return NULL;          return NULL;
231      gpgme_control (ctx, GPGME_CTRL_ARMOR, 1);      gpgme_set_armor (ctx, 1);
     gpgme_control (ctx, GPGME_CTRL_FORCETRUST, 1);  
232      addrs = conv_recipients (rset);      addrs = conv_recipients (rset);
233      if (!addrs) {      if (!addrs) {
234          msg_box (NULL, _("No valid mail addresses found."), _("Secure Attachment"), MB_ERR);          msg_box (NULL, _("No valid mail addresses found."), _("Secure Attachment"), MB_ERR);
# Line 259  secure_message (gpgme_recipients_t rset, Line 257  secure_message (gpgme_recipients_t rset,
257      rc = gpgme_new (&ctx);      rc = gpgme_new (&ctx);
258      if (rc)      if (rc)
259          return NULL;          return NULL;
260      gpgme_control (ctx, GPGME_CTRL_ARMOR, 1);      gpgme_set_armor (ctx, 1);
     gpgme_control (ctx, GPGME_CTRL_FORCETRUST, 1);  
261    
262      addrs = conv_recipients (rset);      addrs = conv_recipients (rset);
263      rc = gpgme_data_new_from_mem (&in, data, strlen (data), 1);      rc = gpgme_data_new_from_mem (&in, data, strlen (data), 1);
# Line 269  secure_message (gpgme_recipients_t rset, Line 266  secure_message (gpgme_recipients_t rset,
266          return NULL;          return NULL;
267      }      }
268      gpgme_data_new (&out);      gpgme_data_new (&out);
269            rc = gpgme_op_encrypt (ctx, addrs, GPGME_ENCRYPT_ALWAYS_TRUST, in, out);
     rc = gpgme_op_encrypt (ctx, addrs, in, out);  
270      if (rc)      if (rc)
271          log_box (_("Secure Message"), MB_ERR, "Could not encrypt the data");          log_box (_("Secure Message"), MB_ERR, "Could not encrypt the data");
272    
273      p = gpgme_data_release_and_return_string (out);      p = gpgme_data_release_and_get_mem (&n);
274        p[n] = 0;
275    
276      gpgme_data_release (in);      gpgme_data_release (in);
277      gpgme_release (ctx);      gpgme_release (ctx);
# Line 286  secure_message (gpgme_recipients_t rset, Line 283  secure_message (gpgme_recipients_t rset,
283    
284  int  int
285  mapi_send_message (gpgme_recipients_t rset, const char * msgtxt,  mapi_send_message (gpgme_recipients_t rset, const char * msgtxt,
286                     const char * subject, const char ** files, size_t nfiles)                     const char * subject, const char **files, size_t nfiles)
287  {  {
288      LHANDLE hd;      LHANDLE hd;
289      MapiMessage * msg;      MapiMessage * msg;
# Line 381  add_recipient (gpgme_recipients_t * r_rs Line 378  add_recipient (gpgme_recipients_t * r_rs
378          log_box (_("Add Recipient"), MB_ERR, _("Could not find key for '%s'"), addr);          log_box (_("Add Recipient"), MB_ERR, _("Could not find key for '%s'"), addr);
379          return -1;          return -1;
380      }      }
381      s = gpgme_key_get_string_attr (key, GPGME_ATTR_USERID, NULL, 0);      s = key->uids->uid;
382      if (s)      if (s)
383          gpgme_recipients_add_name (*r_rset, s);          gpgme_recipients_add_name (*r_rset, s);
384      return 0;      return 0;
# Line 416  winpt_mail_proc (HWND dlg, UINT msg, WPA Line 413  winpt_mail_proc (HWND dlg, UINT msg, WPA
413    
414      switch (msg) {      switch (msg) {
415      case WM_INITDIALOG:      case WM_INITDIALOG:
416          center_window (dlg);          center_window (dlg, NULL);
417          SetForegroundWindow (dlg);          SetForegroundWindow (dlg);
418          break;          break;
419    
# Line 455  winpt_mail_proc (HWND dlg, UINT msg, WPA Line 452  winpt_mail_proc (HWND dlg, UINT msg, WPA
452    
453      return FALSE;      return FALSE;
454  } /* winpt_mail_proc */  } /* winpt_mail_proc */
455    #endif
Legend:
Removed from v.22  
changed lines
  Added in v.24
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26