* src/messageview.[ch]

  src/summaryview.c
	  reflect changes to Show all headers to main view
	  and message view (only affects detached message
	  view). see also bug #473, 'Show All Headers
	  "problem"'.

diff --git a/ChangeLog.claws b/ChangeLog.claws
index f64924eafb5ffada6acbb5155a8588ae4032e065..2f0c83bf501d75bb650be7d47b2be5bdd630703e 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,12 @@
+2004-04-06 [alfons]    0.9.10claws40
+
+       * src/messageview.[ch]
+         src/summaryview.c
+               reflect changes to Show all headers to main view
+               and message view (only affects detached message
+               view). see also bug #473, 'Show All Headers 
+               "problem"'.
+
 2004-04-03 [alfons]    0.9.10claws39
 
        * src/matcher.c

diff --git a/configure.ac b/configure.ac
index 236e7130f9f0c2d19085c582e22e8da296ccacd3..62d752cc5d8e0782dd63f9fd49e74e1798db4135 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=39
+EXTRA_VERSION=40
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else

diff --git a/src/messageview.c b/src/messageview.c
index a38a9701d6680b88991d62b8e4725c523d4b1cf4..df8d71fe1e04366b5e1831d21383cf3d6288eb67 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -239,7 +239,7 @@ static GtkItemFactoryEntry msgview_entries[] =
 
        {N_("/_View/---"),              NULL, NULL, 0, "<Separator>"},
        {N_("/_View/Mess_age source"),  NULL, view_source_cb, 0, NULL},
-       {N_("/_View/Show all _header"), NULL, show_all_header_cb, 0, "<ToggleItem>"},
+       {N_("/_View/Show all _headers"),NULL, show_all_header_cb, 0, "<ToggleItem>"},
 
        {N_("/_Message"),               NULL, NULL, 0, "<Branch>"},
        {N_("/_Message/Compose _new message"),
@@ -1203,6 +1203,7 @@ static void show_all_header_cb(gpointer data, guint action, GtkWidget *widget)
        messageview_show(messageview, msginfo,
                         GTK_CHECK_MENU_ITEM(widget)->active);
        procmsg_msginfo_free(msginfo);
+       main_window_set_menu_sensitive(messageview->mainwin);
 }
 
 static void compose_cb(gpointer data, guint action, GtkWidget *widget)
@@ -1398,3 +1399,22 @@ static gboolean messageview_update_msg(gpointer source, gpointer data)
 
        return FALSE;
 }
+
+void messageview_set_menu_sensitive(MessageView *messageview)
+{
+       GtkItemFactory *ifactory;
+       GtkWidget *menuitem;
+
+       if (!messageview && !messageview->new_window) 
+               return;
+       /* do some smart things */
+       if (!messageview->menubar) return;
+       ifactory = gtk_item_factory_from_widget(messageview->menubar);
+       if (!ifactory) return;
+       if (messageview->mainwin->type == SEPARATE_MESSAGE) {
+               menuitem = gtk_item_factory_get_widget(ifactory, "/View/Show all headers");
+               gtk_check_menu_item_set_active
+                       (GTK_CHECK_MENU_ITEM(menuitem),
+                        messageview->mimeview->textview->show_all_headers);
+       }
+}

diff --git a/src/messageview.h b/src/messageview.h
index b0ec0d9c92773398920add0e68b414b2ba810976..a4d59f0c7279323828f11be7952b39c1cb5a4f55 100644 (file)
--- a/src/messageview.h
+++ b/src/messageview.h
@@ -106,4 +106,7 @@ void messageview_add_toolbar                        (MessageView    *msgview,
                                                 GtkWidget      *vbox);
 void messageview_reflect_prefs_pixmap_theme    (void);
 gchar *messageview_get_selection               (MessageView    *msgview);
+
+void messageview_set_menu_sensitive            (MessageView    *msgview);
+
 #endif /* __MESSAGEVIEW_H__ */

diff --git a/src/summaryview.c b/src/summaryview.c
index 4c9a12f1700db6e576380e4505bbc17deb246723..ca4fa7a45fcc1029b8a9d9b7ec464f8ab38bf965 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -2536,6 +2536,7 @@ static void summary_display_msg_full(SummaryView *summaryview,
 
        summary_set_menu_sensitive(summaryview);
        toolbar_main_set_sensitive(summaryview->mainwin);
+       messageview_set_menu_sensitive(summaryview->messageview);
 
        summary_unlock(summaryview);
 }