From fa141f2780a51987ce450802581401a9d849b388 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Mon, 16 Jul 2007 19:28:20 +0000 Subject: [PATCH] 2007-07-16 [colin] 2.10.0cvs31 * src/messageview.c Prevent double-loading of the same part under some conditions; hide statusbar on Maemo --- ChangeLog | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/messageview.c | 15 ++++++++++----- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 47b9b019a..2ed931330 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-07-16 [colin] 2.10.0cvs31 + + * src/messageview.c + Prevent double-loading of the same part under some + conditions; hide statusbar on Maemo + 2007-07-16 [colin] 2.10.0cvs30 * src/edittags.c diff --git a/PATCHSETS b/PATCHSETS index d94ae780b..0de3d37f2 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2684,3 +2684,4 @@ ( cvs diff -u -r 1.274.2.197 -r 1.274.2.198 src/mainwindow.c; ) > 2.10.0cvs28.patchset ( cvs diff -u -r 1.1.2.54 -r 1.1.2.55 src/wizard.c; cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/gtk/icon_legend.c; ) > 2.10.0cvs29.patchset ( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/edittags.c; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/edittags.h; cvs diff -u -r 1.274.2.198 -r 1.274.2.199 src/mainwindow.c; cvs diff -u -r 1.83.2.110 -r 1.83.2.111 src/mimeview.c; cvs diff -u -r 1.20.2.21 -r 1.20.2.22 src/mimeview.h; cvs diff -u -r 1.25.2.41 -r 1.25.2.42 src/stock_pixmap.c; cvs diff -u -r 1.395.2.311 -r 1.395.2.312 src/summaryview.c; cvs diff -u -r 1.5.2.10 -r 1.5.2.11 src/gtk/gtkvscrollbutton.c; ) > 2.10.0cvs30.patchset +( cvs diff -u -r 1.94.2.138 -r 1.94.2.139 src/messageview.c; ) > 2.10.0cvs31.patchset diff --git a/configure.ac b/configure.ac index bbcc07929..58779513f 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=10 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=30 +EXTRA_VERSION=31 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/messageview.c b/src/messageview.c index 58c189636..ffd4b075e 100644 --- a/src/messageview.c +++ b/src/messageview.c @@ -404,7 +404,7 @@ void messageview_add_toolbar(MessageView *msgview, GtkWidget *window) GtkWidget *handlebox; GtkWidget *vbox; GtkWidget *menubar; - GtkWidget *statusbar; + GtkWidget *statusbar = NULL; guint n_menu_entries; vbox = gtk_vbox_new(FALSE, 0); @@ -427,17 +427,19 @@ void messageview_add_toolbar(MessageView *msgview, GtkWidget *window) #ifdef MAEMO msgview->toolbar = toolbar_create(TOOLBAR_MSGVIEW, window, (gpointer)msgview); + msgview->statusbar = NULL; + msgview->statusbar_cid = 0; #else msgview->toolbar = toolbar_create(TOOLBAR_MSGVIEW, handlebox, (gpointer)msgview); -#endif - statusbar = gtk_statusbar_new(); gtk_widget_show(statusbar); gtk_box_pack_end(GTK_BOX(vbox), statusbar, FALSE, FALSE, 0); msgview->statusbar = statusbar; msgview->statusbar_cid = gtk_statusbar_get_context_id (GTK_STATUSBAR(statusbar), "Message View"); +#endif + msgview->handlebox = handlebox; msgview->menubar = menubar; @@ -908,8 +910,11 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo, noticeview_hide(messageview->noticeview); mimeinfo = procmime_mimeinfo_next(mimeinfo); - if (!all_headers && mimeinfo && (mimeinfo->type != MIMETYPE_TEXT || - strcasecmp(mimeinfo->subtype, "plain"))) { + if (!all_headers && mimeinfo + && (mimeinfo->type != MIMETYPE_TEXT || + strcasecmp(mimeinfo->subtype, "plain")) + && (mimeinfo->type != MIMETYPE_MULTIPART || + strcasecmp(mimeinfo->subtype, "signed"))) { if (strcasecmp(mimeinfo->subtype, "html")) mimeview_show_part(messageview->mimeview,mimeinfo); else if (prefs_common.invoke_plugin_on_html) -- 2.25.1