balsa r7936 - in trunk: . src

[PeterB svn gnome org]

Author: PeterB
Date: Sun Jun  1 22:32:02 2008
New Revision: 7936
URL: http://svn.gnome.org/viewvc/balsa?rev=7936&view=rev

Log:
more shown-headers fixes

Modified:
   trunk/ChangeLog
   trunk/src/main-window.c
   trunk/src/message-window.c

Modified: trunk/src/main-window.c
==============================================================================
--- trunk/src/main-window.c	(original)
+++ trunk/src/main-window.c	Sun Jun  1 22:32:02 2008
@@ -5053,15 +5053,11 @@
 {
     BalsaWindow *bw = BALSA_WINDOW(data);
 
-    if (gtk_toggle_action_get_active(action)) {
-        balsa_app.show_all_headers = TRUE;
-        balsa_message_set_displayed_headers(BALSA_MESSAGE(bw->preview),
-                                            HEADERS_ALL);
-    } else {
-        balsa_app.show_all_headers = FALSE;
-        balsa_message_set_displayed_headers(BALSA_MESSAGE(bw->preview),
-                                            balsa_app.shown_headers);
-    }
+    balsa_app.show_all_headers = gtk_toggle_action_get_active(action);
+    balsa_message_set_displayed_headers(BALSA_MESSAGE(bw->preview),
+                                        balsa_app.show_all_headers ?
+                                        HEADERS_ALL :
+                                        balsa_app.shown_headers);
 }
 
 static void

Modified: trunk/src/message-window.c
==============================================================================
--- trunk/src/message-window.c	(original)
+++ trunk/src/message-window.c	Sun Jun  1 22:32:02 2008
@@ -820,7 +820,7 @@
             gtk_radio_action_get_current_value(GTK_RADIO_ACTION(action));
         MessageWindow *mw = (MessageWindow *) data;
 
-        balsa_app.shown_headers = sh;
+        mw->headers_shown = sh;
         reset_show_all_headers(mw);
         balsa_message_set_displayed_headers(BALSA_MESSAGE(mw->bmessage),
                                             sh);
@@ -986,16 +986,10 @@
 show_all_headers_tool_cb(GtkToggleAction * action, gpointer data)
 {
     MessageWindow *mw = (MessageWindow *) (data);
-
-    if (gtk_toggle_action_get_active(action)) {
-        mw->show_all_headers = TRUE;
-	balsa_message_set_displayed_headers(BALSA_MESSAGE(mw->bmessage),
-					    HEADERS_ALL);
-    } else {
-        mw->show_all_headers = FALSE;
-	balsa_message_set_displayed_headers(BALSA_MESSAGE(mw->bmessage),
-					    mw->headers_shown);
-    }
+    mw->show_all_headers = gtk_toggle_action_get_active(action);
+    balsa_message_set_displayed_headers(BALSA_MESSAGE(mw->bmessage),
+                                        mw->show_all_headers ?
+                                        HEADERS_ALL : mw->headers_shown);
 }
 
 static void