[git] GpgOL - branch, master, updated. gpgol-1.4.0-236-g474f02a

[by Andre Heinecke]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG extension for MS Outlook".

The branch, master has been updated
       via  474f02a9278b8755bd99ba79fa018212be08baf1 (commit)
      from  1e42345f8fed6c9d9ec10c87b4b23d79dc7fb9de (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 474f02a9278b8755bd99ba79fa018212be08baf1
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Jan 5 17:42:50 2017 +0100

    Hide WKD Option for now
    
    --
    Does not work yet because of missing HTTPS support and
    we would also need to change the gpg.conf setting.
    Let's hope we can revert this soon.

diff --git a/src/addin-options.cpp b/src/addin-options.cpp
index d08b71a..083d89e 100644
--- a/src/addin-options.cpp
+++ b/src/addin-options.cpp
@@ -44,7 +44,7 @@ set_labels (HWND dlg)
     { IDC_SIGN_DEFAULT,     N_("&Sign new messages by default")},
     { IDC_INLINE_PGP,       N_("&Send OpenPGP mails without "
                                "attachments as inline-pgp")},
-    { IDC_AUTORRESOLVE,     N_("&Search for OpenPGP keys automatically when encrypting")},
+//    { IDC_AUTORRESOLVE,     N_("&Search for OpenPGP keys automatically when encrypting")},
 
 
     { IDC_GPG_OPTIONS,      N_("Debug...")},
@@ -94,8 +94,8 @@ options_window_proc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 #endif
           SendDlgItemMessage (hDlg, IDC_INLINE_PGP, BM_SETCHECK,
                               !!opt.inline_pgp, 0L);
-          SendDlgItemMessage (hDlg, IDC_AUTORRESOLVE, BM_SETCHECK,
-                              !!opt.autoresolve, 0L);
+//          SendDlgItemMessage (hDlg, IDC_AUTORRESOLVE, BM_SETCHECK,
+//                              !!opt.autoresolve, 0L);
           enable_disable_opts (hDlg);
           set_labels (hDlg);
           ShowWindow (GetDlgItem (hDlg, IDC_GPG_OPTIONS),
@@ -133,8 +133,8 @@ options_window_proc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
                 opt.inline_pgp = !!SendDlgItemMessage
                   (hDlg, IDC_INLINE_PGP, BM_GETCHECK, 0, 0L);
 
-                opt.autoresolve = !!SendDlgItemMessage
-                  (hDlg, IDC_AUTORRESOLVE, BM_GETCHECK, 0, 0L);
+//                opt.autoresolve = !!SendDlgItemMessage
+////                  (hDlg, IDC_AUTORRESOLVE, BM_GETCHECK, 0, 0L);
 
                 write_options ();
                 EndDialog (hDlg, TRUE);
diff --git a/src/dialogs.rc b/src/dialogs.rc
index a3ee628..ba8cb8c 100644
--- a/src/dialogs.rc
+++ b/src/dialogs.rc
@@ -329,7 +329,7 @@ BEGIN
 
     /* Send options box.  */
     GROUPBOX        "send-options", IDC_G_SEND,
-                    9, 50, 250, 60
+                    9, 50, 250, 50
 
     CONTROL         "encrypt-by-default", IDC_ENCRYPT_DEFAULT,
                     "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
@@ -343,9 +343,9 @@ BEGIN
                     "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
                     24, 82, 215, 10
 
-    CONTROL         "autoresolve", IDC_AUTORRESOLVE,
-                    "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    24, 93, 215, 10
+//    CONTROL         "autoresolve", IDC_AUTORRESOLVE,
+//                    "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
+//                    24, 93, 215, 10
 
     /* Stuff at the lower left corner.  */
     LTEXT           "GpgOL by Gpg4win", IDC_GPG4WIN_STRING,

-----------------------------------------------------------------------

Summary of changes:
 src/addin-options.cpp | 10 +++++-----
 src/dialogs.rc        |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
GnuPG extension for MS Outlook
http://git.gnupg.org