From 67009f4a28e22389230a5a4685011c27f1d3c0cc Mon Sep 17 00:00:00 2001
From: Paul Mangan <paul@claws-mail.org>
Date: Thu, 14 Mar 2002 17:46:31 +0000
Subject: [PATCH] code clean up

---
 ChangeLog.claws |  5 +++++
 configure.in    |  2 +-
 src/compose.c   | 27 +++++++++------------------
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index b64d06190..3a4e753fb 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2002-03-14 [paul]	0.7.4claws7
+
+	* src/compose.c
+		clean up the last commit (ahem)
+
 2002-03-14 [paul]	0.7.4claws6
 
 	* src/compose.c
diff --git a/configure.in b/configure.in
index 1945544dc..89c9af416 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws6
+EXTRA_VERSION=claws7
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/compose.c b/src/compose.c
index bdc2cea23..891b2a4c2 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -5774,36 +5774,27 @@ static void select_account(Compose * compose, PrefsAccount * ac)
 		gtk_widget_queue_resize(compose->table_vbox);
 #endif
 #if USE_GPGME
-		if (ac->default_sign) {
-			ifactory = gtk_item_factory_from_widget(compose->menubar);
+		ifactory = gtk_item_factory_from_widget(compose->menubar);
 			menu_set_sensitive(ifactory,
 					   "/Message/Sign", TRUE);
+			menu_set_sensitive(ifactory,
+					   "/Message/Encrypt", TRUE);
+
 			menuitem = gtk_item_factory_get_item(ifactory, "/Message/Sign");
+		if (ac->default_sign)
 			gtk_check_menu_item_set_active
 				(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
-		} else {
-			ifactory = gtk_item_factory_from_widget(compose->menubar);
-			menu_set_sensitive(ifactory,
-					   "/Message/Sign", TRUE);
-			menuitem = gtk_item_factory_get_item(ifactory, "/Message/Sign");
+		else
 			gtk_check_menu_item_set_active
 				(GTK_CHECK_MENU_ITEM(menuitem), FALSE);
-		}
-		if (ac->default_encrypt) {
-			ifactory = gtk_item_factory_from_widget(compose->menubar);
-			menu_set_sensitive(ifactory,
-					   "/Message/Encrypt", TRUE);
+
 			menuitem = gtk_item_factory_get_item(ifactory, "/Message/Encrypt");
+		if (ac->default_encrypt)
 			gtk_check_menu_item_set_active
 				(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
-		} else {
-			ifactory = gtk_item_factory_from_widget(compose->menubar);
-			menu_set_sensitive(ifactory,
-					   "/Message/Encrypt", TRUE);
-			menuitem = gtk_item_factory_get_item(ifactory, "/Message/Encrypt");
+		else
 			gtk_check_menu_item_set_active
 				(GTK_CHECK_MENU_ITEM(menuitem), FALSE);
-		}
 #endif /* USE_GPGME */
 
 }
-- 
2.25.1