2005-02-09 [colin] 1.0.1cvs1.1

	* src/messageview.c
	* src/mimeview.c
	* src/mimeview.h
		Sync with HEAD

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index ebc7da7d83ec47f9b97cb20142ae7c9c082c6a3c..ef0878e0bfc44369ce903187563ae61697e5a31f 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,10 @@
+2005-02-09 [colin]     1.0.1cvs1.1
+
+       * src/messageview.c
+       * src/mimeview.c
+       * src/mimeview.h
+               Sync with HEAD
+
 2005-02-08 [colin]     1.0.1.1
 
        * ChangeLog.claws

diff --git a/PATCHSETS b/PATCHSETS
index ef0e4f4ec6acf1b4c6d7eb0945d6ab44e305a0a6..6feb286aa43aa16d3601f18742a76f85a348b0be 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -363,3 +363,4 @@
 ( cvs diff -u -r 1.382.2.95 -r 1.382.2.96 src/compose.c; ) > 1.0.0cvs28.3.patchset
 ( cvs diff -u -r 1.58.2.6 -r 1.58.2.7 po/de.po; cvs diff -u -r 1.60.2.7 -r 1.60.2.8 po/es.po; cvs diff -u -r 1.42.2.7 -r 1.42.2.8 po/fr.po; cvs diff -u -r 1.34.2.6 -r 1.34.2.7 po/it.po; cvs diff -u -r 1.2.2.8 -r 1.2.2.9 po/sk.po; cvs diff -u -r 1.17.2.8 -r 1.17.2.9 po/sr.po; ) > 1.0.0cvs29.1.patchset
 ( cvs diff -u -r 1.2504.2.46 -r 1.2504.2.47 ChangeLog.claws; cvs diff -u -r 1.50.2.5 -r 1.50.2.6 po/pt_BR.po; ) > 1.0.1.1.patchset
+( cvs diff -u -r 1.94.2.42 -r 1.94.2.43 src/messageview.c; cvs diff -u -r 1.83.2.27 -r 1.83.2.28 src/mimeview.c; cvs diff -u -r 1.20.2.2 -r 1.20.2.3 src/mimeview.h; ) > 1.0.1cvs1.1.patchset

diff --git a/configure.ac b/configure.ac
index bcea121331e23ff4809be6e421536c1d36437a63..db29f342ee6100266df1987570e8877f8608e82e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=0
+EXTRA_VERSION=1
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 

diff --git a/src/messageview.c b/src/messageview.c
index b6b444cd4991898cabc1fc51ed312b17050de888..44700e34c74a3410a3890491dd298f7aff57e460 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -749,6 +749,12 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
        else 
                noticeview_hide(messageview->noticeview);
 
+       mimeinfo = procmime_mimeinfo_next(mimeinfo);
+       if (mimeinfo && (mimeinfo->type != MIMETYPE_TEXT || 
+           strcmp(mimeinfo->subtype, "plain"))) {
+               mimeview_show_part(messageview->mimeview,mimeinfo);
+       }
+
        g_free(file);
 
        return 0;

diff --git a/src/mimeview.c b/src/mimeview.c
index 383ea47cf701331ac66c9b5ce2bf708efb6de343..187ff460a647f6e81e55b5c548166a79af5ed3b3 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -552,7 +552,7 @@ static MimeViewer *get_viewer_for_mimeinfo(MimeView *mimeview, MimeInfo *partinf
        return viewer;
 }
 
-static gboolean mimeview_show_part(MimeView *mimeview, MimeInfo *partinfo)
+gboolean mimeview_show_part(MimeView *mimeview, MimeInfo *partinfo)
 {
        MimeViewer *viewer;
        

diff --git a/src/mimeview.h b/src/mimeview.h
index 70633e595dcb6f50211199e5f898d2658142731b..09b47d853f828a069ddcc23c47a151d86878fb59 100644 (file)
--- a/src/mimeview.h
+++ b/src/mimeview.h
@@ -115,6 +115,8 @@ void mimeview_init          (MimeView       *mimeview);
 void mimeview_show_message     (MimeView       *mimeview,
                                 MimeInfo       *mimeinfo,
                                 const gchar    *file);
+gboolean mimeview_show_part    (MimeView       *mimeview, 
+                                MimeInfo       *partinfo);
 void mimeview_destroy          (MimeView       *mimeview);
 void mimeview_update           (MimeView       *mimeview);
 void mimeview_clear            (MimeView       *mimeview);