code clean up

diff --git a/ChangeLog.claws b/ChangeLog.claws
index b64d06190d538a27c00d2a3ce75d442264eebaf1..3a4e753fbe0550add2558c59ea661389f4e3f93e 100644 (file)
--- 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
 2002-03-14 [paul]      0.7.4claws6
 
        * src/compose.c

diff --git a/configure.in b/configure.in
index 1945544dc168476d258e4a3bc0b9f37cc263ba4b..89c9af41644fcfd203cc8d72a77bb397ce58508f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
 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
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/compose.c b/src/compose.c
index bdc2cea23534fb06f64ceaacf4816af8130b8916..891b2a4c2f2308111a5f41487e13b138a7e1dc5f 100644 (file)
--- 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
                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/Sign", TRUE);

+                       menu_set_sensitive(ifactory,
+                                          "/Message/Encrypt", TRUE);
+

                        menuitem = gtk_item_factory_get_item(ifactory, "/Message/Sign");
                        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);
                        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);
                        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");
                        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);
                        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);
                        gtk_check_menu_item_set_active
                                (GTK_CHECK_MENU_ITEM(menuitem), FALSE);

-               }

 #endif /* USE_GPGME */
 
 }
 #endif /* USE_GPGME */
 
 }