[balsa/gtk3] Set gpg mode correctly



commit 611138880850f68e1c173090f993c1dbb435d406
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Tue Aug 13 18:09:02 2013 -0400

    Set gpg mode correctly
    
        * src/sendmsg-window.c (bsmsg_setup_gpg_ui_by_mode): set gpg
        mode correctly.

 ChangeLog            |    5 +++++
 src/sendmsg-window.c |    9 ++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 27138cc..29c2ba3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,11 @@
 
 2013-08-13  Peter Bloomfield
 
+       * src/sendmsg-window.c (bsmsg_setup_gpg_ui_by_mode): set gpg
+       mode correctly.
+
+2013-08-13  Peter Bloomfield
+
        * src/sendmsg-window.c (init_menus): add transition code to read
        old message header choices.
 
diff --git a/src/sendmsg-window.c b/src/sendmsg-window.c
index c8eaced..48344c7 100644
--- a/src/sendmsg-window.c
+++ b/src/sendmsg-window.c
@@ -6505,6 +6505,8 @@ bsmsg_setup_gpg_ui(BalsaSendmsg *bsmsg)
 static void
 bsmsg_setup_gpg_ui_by_mode(BalsaSendmsg *bsmsg, gint mode)
 {
+    GAction *action;
+
     /* do nothing if we don't support crypto */
     if (!balsa_app.has_openpgp && !balsa_app.has_smime)
        return;
@@ -6513,15 +6515,16 @@ bsmsg_setup_gpg_ui_by_mode(BalsaSendmsg *bsmsg, gint mode)
     sw_action_set_active(bsmsg, "sign", mode & LIBBALSA_PROTECT_SIGN);
     sw_action_set_active(bsmsg, "encrypt", mode & LIBBALSA_PROTECT_ENCRYPT);
 
+    action = sw_get_action(bsmsg, "gpg-mode");
 #ifdef HAVE_SMIME
     if (mode & LIBBALSA_PROTECT_SMIMEV3)
-        sw_action_set_active(bsmsg, "smime", TRUE);
+        g_action_change_state(action, g_variant_new_string("smime"));
     else
 #endif
     if (mode & LIBBALSA_PROTECT_OPENPGP)
-        sw_action_set_active(bsmsg, "OldOpenPgpMode", TRUE);
+        g_action_change_state(action, g_variant_new_string("open-pgp"));
     else
-        sw_action_set_active(bsmsg, "MimeMode", TRUE);
+        g_action_change_state(action, g_variant_new_string("mime"));
 }
 #endif /* HAVE_GPGME */
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]