aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2006-03-10 02:51:15 +0000
committerhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2006-03-10 02:51:15 +0000
commit3803fc8d9845990819eefdcfd6c46c31658aa1b3 (patch)
tree285876dc6d94151e5b3bdfb86972fad5cd9ccff3 /src
parenta8dd8ec8af07826434cf28bca75b5261528f806d (diff)
printing messages now follows 'Show all headers'.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1038 ee746299-78ed-0310-b773-934348b2243d
Diffstat (limited to 'src')
-rw-r--r--src/mainwindow.c6
-rw-r--r--src/messageview.c8
-rw-r--r--src/summaryview.c5
3 files changed, 12 insertions, 7 deletions
diff --git a/src/mainwindow.c b/src/mainwindow.c
index 83b54dee..15f3fe4d 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -705,7 +705,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
{N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_View/Open in new _window"), "<control><alt>N", open_msg_cb, 0, NULL},
{N_("/_View/Mess_age source"), "<control>U", view_source_cb, 0, NULL},
- {N_("/_View/Show all _header"), "<control>H", show_all_header_cb, 0, "<ToggleItem>"},
+ {N_("/_View/Show all _headers"), "<control>H", show_all_header_cb, 0, "<ToggleItem>"},
{N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_View/_Update summary"), "<control><alt>U", update_summary_cb, 0, NULL},
@@ -1938,7 +1938,7 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
{"/View/Go to/Prev labeled message", M_MSG_EXIST},
{"/View/Go to/Next labeled message", M_MSG_EXIST},
{"/View/Open in new window" , M_SINGLE_TARGET_EXIST},
- {"/View/Show all header" , M_SINGLE_TARGET_EXIST},
+ {"/View/Show all headers" , M_SINGLE_TARGET_EXIST},
{"/View/Message source" , M_SINGLE_TARGET_EXIST},
{"/Message/Receive/Get from current account"
@@ -2065,7 +2065,7 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
(item != NULL));
}
- SET_CHECK_MENU_ACTIVE("/View/Show all header",
+ SET_CHECK_MENU_ACTIVE("/View/Show all headers",
mainwin->messageview->textview->show_all_headers);
SET_CHECK_MENU_ACTIVE("/View/Thread view", (state & M_THREADED) != 0);
diff --git a/src/messageview.c b/src/messageview.c
index 4365778b..508ff097 100644
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -242,7 +242,8 @@ 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"),
@@ -547,7 +548,7 @@ static void messageview_set_menu_state(MessageView *messageview)
messageview->menu_locked = TRUE;
ifactory = gtk_item_factory_from_widget(messageview->menubar);
menuitem = gtk_item_factory_get_widget
- (ifactory, "/View/Show all header");
+ (ifactory, "/View/Show all headers");
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
messageview->textview->show_all_headers);
messageview->menu_locked = FALSE;
@@ -770,7 +771,8 @@ static void print_cb(gpointer data, guint action, GtkWidget *widget)
return;
}
- procmsg_print_message(messageview->msginfo, cmdline);
+ procmsg_print_message(messageview->msginfo, cmdline,
+ messageview->textview->show_all_headers);
}
static void close_cb(gpointer data, guint action, GtkWidget *widget)
diff --git a/src/summaryview.c b/src/summaryview.c
index 14cda4ed..a49864ca 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -3448,6 +3448,7 @@ void summary_print(SummaryView *summaryview)
GSList *mlist, *cur;
const gchar *cmdline;
gchar *msg;
+ gboolean all_headers;
if (gtk_tree_selection_count_selected_rows(summaryview->selection) == 0)
return;
@@ -3471,11 +3472,13 @@ void summary_print(SummaryView *summaryview)
return;
}
+ all_headers = summaryview->messageview->textview->show_all_headers;
+
mlist = summary_get_selected_msg_list(summaryview);
for (cur = mlist; cur != NULL; cur = cur->next) {
msginfo = (MsgInfo *)cur->data;
if (msginfo)
- procmsg_print_message(msginfo, cmdline);
+ procmsg_print_message(msginfo, cmdline, all_headers);
}
g_slist_free(mlist);
}