Make sending of messages working again. Removed cruft.
authorWerner Koch <wk@gnupg.org>
Fri, 23 Sep 2005 14:48:38 +0000 (14:48 +0000)
committerWerner Koch <wk@gnupg.org>
Fri, 23 Sep 2005 14:48:38 +0000 (14:48 +0000)
configure.ac
src/ChangeLog
src/gpgol-rsrcs.rc
src/intern.h
src/recipient-dialog.c

index 8422aee..28e85ff 100644 (file)
@@ -15,7 +15,7 @@ min_automake_version="1.9.4"
 
 # Version number: Remember to change it immediately *after* a release.
 #                 Add a "-cvs" prefix for non-released code.
-AC_INIT(gpgol, 0.9.2, bug-gpgol@g10code.com)
+AC_INIT(gpgol, 0.9.3-cvs, bug-gpgol@g10code.com)
 
 NEED_GPGME_API=1
 NEED_GPGME_VERSION=1.1.0
index 1d191ba..1326106 100644 (file)
@@ -1,3 +1,11 @@
+2005-09-23  Werner Koch  <wk@g10code.com>
+
+       * recipient-dialog.c (recipient_dlg_proc): Removed
+       IDC_ENC_OPTARMOR stuff; it was not used.
+       (load_rsetbox): Fixed detection of encryption capability.
+
+       * gpgol-ids.h, gpgol-rsrcs.rc: Ditto.
+       
 2005-09-22  Werner Koch  <wk@g10code.com>
 
        * engine-gpgme.c (decrypt_stream): Use gpgme_op_decrypt_verify.
index 2c41ebc..0de49dc 100644 (file)
@@ -53,9 +53,6 @@ BEGIN
                     128,8
     LISTBOX         IDC_ENC_NOTFOUND,8,158,313,22,LBS_SORT | 
                     LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Optionen",IDC_STATIC,8,185,108,24
-    CONTROL         "Ausgabe als &Text",IDC_ENC_OPTARMOR,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,20,195,71,10
     DEFPUSHBUTTON   "&OK",IDOK,221,196,50,14
     PUSHBUTTON      "&Abbrechen",IDCANCEL,273,196,50,14
 END
@@ -276,9 +273,6 @@ BEGIN
                     8
     LISTBOX         IDC_ENC_NOTFOUND,8,158,313,22,LBS_SORT | 
                     LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Options",IDC_STATIC,8,185,108,24
-    CONTROL         "&Text Output",IDC_ENC_OPTARMOR,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,20,195,53,10
     DEFPUSHBUTTON   "&OK",IDOK,221,196,50,14
     PUSHBUTTON      "&Cancel",IDCANCEL,273,196,50,14
 END
index f439456..29a5cbf 100644 (file)
@@ -40,7 +40,6 @@ extern "C" {
 
 enum
   {
-    OPT_FLAG_ARMOR    =  1,
     OPT_FLAG_TEXT     =  2,
     OPT_FLAG_FORCE    =  4,
     OPT_FLAG_CANCEL   =  8
index 1a319ba..1f66bfb 100644 (file)
@@ -109,7 +109,7 @@ load_rsetbox (HWND hwnd)
     {
       if (enum_gpg_keys(&key, &ctx))
        doloop = 0;
-      if (!key->subkeys->can_encrypt)
+      if (!key->can_encrypt)
        continue;
       
       /* check that the primary key is *not* revoked, expired or invalid */
@@ -234,7 +234,6 @@ recipient_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
     static int rset_state = 1;
     NMHDR * notify;
     HWND hrset;
-    BOOL flag;
     const char *warn;
     int i;
 
@@ -250,8 +249,6 @@ recipient_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
        }
        else
            initialize_keybox (dlg, rset_cb);
-       CheckDlgButton (dlg, IDC_ENC_OPTARMOR, BST_CHECKED);
-       EnableWindow (GetDlgItem (dlg, IDC_ENC_OPTARMOR), FALSE);
        center_window (dlg, NULL);
        SetForegroundWindow (dlg);
        return TRUE;
@@ -289,9 +286,6 @@ recipient_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
                            "Recipient Dialog", MB_ICONINFORMATION|MB_OK);
                return FALSE;
            }
-           flag = IsDlgButtonChecked (dlg, IDC_ENC_OPTARMOR);
-           if (flag)
-               rset_cb->opts |= OPT_FLAG_ARMOR;
            keycache_new (&rset_cb->rset);
 
            for (i=0; i < ListView_GetItemCount (hrset); i++) {