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

Diff of /trunk/Src/wptMainProc.cpp

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

revision 121 by twoaday, Mon Dec 12 11:19:56 2005 UTC revision 129 by twoaday, Fri Dec 30 13:56:10 2005 UTC
# Line 44  Line 44 
44  #include "wptCard.h"  #include "wptCard.h"
45  #include "wptCryptdisk.h"  #include "wptCryptdisk.h"
46  #include "wptCardEdit.h"  #include "wptCardEdit.h"
 #include "wptCrypto.h"  
47    
48  static int cmd = 0;  static int cmd = 0;
49  static int wipe_contents = 0;  static int wipe_contents = 0;
# Line 193  clip_gpg_dlg (HWND hwnd, UINT id) Line 192  clip_gpg_dlg (HWND hwnd, UINT id)
192      gpgme_error_t err;      gpgme_error_t err;
193      int type;      int type;
194            
195      if( (id == ID_WINPT_SIGN || id == ID_WINPT_SIGNENCRYPT)      if ((id == ID_WINPT_SIGN || id == ID_WINPT_SIGNENCRYPT)
196          && gnupg_access_keyring (0) ) {          && gnupg_access_keyring (0)) {
197          msg_box( hwnd, _("Could not access secret keyring."), _("Sign"), MB_ERR );          msg_box (hwnd, _("Could not access secret keyring."), _("Sign"), MB_ERR);
198          return;          return;
199      }      }
200            
201      switch( id ) {      switch( id ) {
202      case ID_WINPT_SYMENC:      case ID_WINPT_SYMENC:
203          gpg_encrypt_symmetric();          gpg_encrypt_symmetric ();
204          break;          break;
205                    
206      case ID_WINPT_ENCRYPT:      case ID_WINPT_ENCRYPT:
# Line 321  winpt_main_proc (HWND hwnd, UINT msg, WP Line 320  winpt_main_proc (HWND hwnd, UINT msg, WP
320  {                {              
321      static NOTIFYICONDATA NID;      static NOTIFYICONDATA NID;
322      static int use_hotkey = 0;          static int use_hotkey = 0;    
     reminder_ctx_s ctx;  
323      LPARAM param;      LPARAM param;
324      curr_wnd_ctx currwnd = {0};      curr_wnd_ctx currwnd = {0};
325      int rc, set_wc = 0, has_data = 0;      int rc, set_wc = 0, has_data = 0;
# Line 515  winpt_main_proc (HWND hwnd, UINT msg, WP Line 513  winpt_main_proc (HWND hwnd, UINT msg, WP
513                  msg_box( hwnd, winpt_strerror (WPTERR_CLIP_EMPTY),_("Clipboard"), MB_ERR );                  msg_box( hwnd, winpt_strerror (WPTERR_CLIP_EMPTY),_("Clipboard"), MB_ERR );
514                  break;                  break;
515              }              }
516              ctx.msecs = 500;              clip_gpg_dlg (hwnd, (int)wparam);
             window_reminder( &ctx );                      
             clip_gpg_dlg( hwnd, (int)wparam );  
517              break;              break;
518                            
519              /** Current window operations **/              /** Current window operations **/
# Line 534  winpt_main_proc (HWND hwnd, UINT msg, WP Line 530  winpt_main_proc (HWND hwnd, UINT msg, WP
530                          winpt_strerror( WPTERR_CURR_WND ) );                          winpt_strerror( WPTERR_CURR_WND ) );
531                  break;                  break;
532              }              }
533              ctx.msecs = 500;              rc = currwnd_gpg_dlg (hwnd, (UINT)wparam, &set_wc);
534              window_reminder( &ctx );              if (!rc && set_wc)
535              rc = currwnd_gpg_dlg( hwnd, (UINT)wparam, &set_wc );                  set_window_contents (hwnd, &currwnd);
             if( !rc && set_wc )  
                 set_window_contents( hwnd, &currwnd );  
536              break;              break;
537                            
538              /** File handling **/              /** File handling **/
Legend:
Removed from v.121  
changed lines
  Added in v.129
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26