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

Diff of /trunk/Src/WinPT.cpp

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

revision 6 by twoaday, Mon Apr 4 06:59:24 2005 UTC revision 14 by twoaday, Wed May 4 07:59:42 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    
22  #include "../resource.h"  #include "../resource.h"
# Line 45  int mobile = 0; Line 44  int mobile = 0;
44  int gpg_read_only = 0;  int gpg_read_only = 0;
45  char gpgver[3];  char gpgver[3];
46    
47    /* Internal IPC */
48    int start_keymanager = 0;
49    
50  static void  static void
51  update_keycache (HWND hwnd)  update_keycache (HWND hwnd)
# Line 158  check_crypto_engine (void) Line 159  check_crypto_engine (void)
159          return rc;          return rc;
160      }      }
161      /* We enable smartcard support for GPG: 1.9.x or >= 1.4.0 */      /* We enable smartcard support for GPG: 1.9.x or >= 1.4.0 */
162      if (ma > 1 || mi >= 9 || mi >= 4)      if (ma >= 1 && mi >= 4)
163          scard_support = 1;          scard_support = 1;
164    
165      gpgver[0] = ma;      gpgver[0] = ma;
# Line 203  enable_mobile_mode (void) Line 204  enable_mobile_mode (void)
204      reg_prefs.use_viewer = 0; /* XXX */      reg_prefs.use_viewer = 0; /* XXX */
205  }  }
206    
207    char* get_subkey_fingerprint (gpgme_ctx_t ctx, const char *keyid);
208    
209  int WINAPI  int WINAPI
210    #ifndef WINPT_IPC
211  WinMain (HINSTANCE hinst, HINSTANCE hprev, LPSTR cmdline, int showcmd)  WinMain (HINSTANCE hinst, HINSTANCE hprev, LPSTR cmdline, int showcmd)
212    #else
213    win_main (HINSTANCE hinst, HINSTANCE hprev, LPSTR cmdline, int showcmd)
214    #endif
215  {  {
216      WNDCLASS wc = {0, winpt_main_proc, 0, 0, hinst, 0, 0, 0, 0, PGM_NAME};      WNDCLASS wc = {0, winpt_main_proc, 0, 0, hinst, 0, 0, 0, 0, PGM_NAME};
217      HACCEL accel_tab;      HACCEL accel_tab;
# Line 357  WinMain (HINSTANCE hinst, HINSTANCE hpre Line 363  WinMain (HINSTANCE hinst, HINSTANCE hpre
363      }      }
364    
365      load_keyserver_conf (cmdline? 1 : 0);      load_keyserver_conf (cmdline? 1 : 0);
366        if (start_keymanager) {
367            dialog_box_param (glob_hinst, (LPCTSTR)IDD_WINPT_KEYMISC,
368                                GetDesktopWindow(), keymanager_dlg_proc, NULL,
369                                _("Key Manager"), IDS_WINPT_KEYMISC);
370            keycache_release ();
371            free_gnupg_table ();
372            return 0;
373        }
374    
375      if (cmdline && (stristr (cmdline, "--keymanager")      if (cmdline && (stristr (cmdline, "--keymanager")
376                  || stristr (cmdline, "--cardmanager"))) {                  || stristr (cmdline, "--cardmanager"))) {
377          update_keycache (GetDesktopWindow ());          update_keycache (GetDesktopWindow ());
378          if (stristr (cmdline, "keymanager"))          if (stristr (cmdline, "keymanager"))
379              dialog_box_param (glob_hinst, (LPCTSTR)IDD_WINPT_KEYMISC,              dialog_box_param (glob_hinst, (LPCTSTR)IDD_WINPT_KEYMISC,
380                              GetDesktopWindow(), keymanager_dlg_proc, NULL,                              GetDesktopWindow(), keymanager_dlg_proc, NULL,
381                              _("Key Manager"), IDS_WINPT_KEYMISC);                              _("Key Manager"), IDS_WINPT_KEYMISC);  
382          else {          else {
383              gpgme_card_t crd = smartcard_init ();              gpgme_card_t crd = smartcard_init ();
384              if (crd)              if (crd)
Legend:
Removed from v.6  
changed lines
  Added in v.14
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26