sync with 0.7.6cvs14

diff --git a/ChangeLog b/ChangeLog
index 238ac3d4b5d52a7929f384947ffae8dcb6164218..adade3d8f460a44c709f88da72bb1941d68e6587 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-05-23
+
+       * src/textview.c: textview_show_message(), textview_show_part():
+         fixed a bug that GtkSText *text pointed the incorrect object.
+         textview_add_part(): freeze GtkSText while adding RFC822 headers.
+         textview_show_part(): fixed a bug that couldn't display single
+         part MIME message as text.
+
 2002-05-22
 
        * src/compose.c: compose_redirect_write_to_file(): correct the target

diff --git a/ChangeLog.claws b/ChangeLog.claws
index eda8e3503fa0c88305f64ff842ad34a6842fa0e3..1df9175b583917ed074b1677f690bc7cf55a3c6a 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2002-05-25 [paul]      0.7.6claws16
+
+       * sync with 0.7.6cvs14
+               see ChangeLog 2002-05-23
+
 2002-05-24 [paul]      0.7.6claws15
 
        * README.claws

diff --git a/ChangeLog.jp b/ChangeLog.jp
index 2748f92fee68babca00e04b1c28bcc94b6061ee3..7bf045a93dbcf71174f9b408a2304a764c18a43f 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,12 @@
+2002-05-23
+
+       * src/textview.c: textview_show_message(), textview_show_part():
+         GtkSText *text ¤¬Àµ¤·¤¯¤Ê¤¤¥ª¥Ö¥¸¥§¥¯¥È¤ò»Ø¤·¤Æ¤¤¤¿¥Ð¥°¤ò½¤Àµ¡£
+         textview_add_part(): RFC822 ¥Ø¥Ã¥À¤òÄɲ乤ë¤È¤­¤Ë GtkSText ¤ò
+         ¥Õ¥ê¡¼¥º¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+         textview_show_part(): ¥·¥ó¥°¥ë¥Ñ¡¼¥È MIME ¥á¥Ã¥»¡¼¥¸¤ò¥Æ¥­¥¹¥È¤È
+         ¤·¤Æɽ¼¨¤Ç¤­¤Ê¤¤¥Ð¥°¤ò½¤Àµ¡£
+
 2002-05-22
 
        * src/compose.c: compose_redirect_write_to_file():

diff --git a/configure.in b/configure.in
index 40f8b404ad481fc384d5a469f36e4c59e09c0a23..b13462ab9e3297e25c5a3d3f4a04743ee9badb8d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws15
+EXTRA_VERSION=claws16
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/textview.c b/src/textview.c
index c07ebe64129f97f6251d2c5aeed30370a8d2cb0e..531e39609eaf0b3ac99f00301828992ce555e093 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -297,7 +297,7 @@ void textview_update_message_colors(void)
 void textview_show_message(TextView *textview, MimeInfo *mimeinfo,
                           const gchar *file)
 {
-       GtkSText *text = GTK_STEXT(textview->text);
+       GtkSText *text;
        FILE *fp;
        const gchar *charset = NULL;
        GPtrArray *headers = NULL;
@@ -314,6 +314,8 @@ void textview_show_message(TextView *textview, MimeInfo *mimeinfo,
        textview_set_font(textview, charset);
        textview_clear(textview);
 
+       text = GTK_STEXT(textview->text);
+
        gtk_stext_freeze(text);
 
        if (fseek(fp, mimeinfo->fpos, SEEK_SET) < 0) perror("fseek");
@@ -333,12 +335,13 @@ void textview_show_message(TextView *textview, MimeInfo *mimeinfo,
 
 void textview_show_part(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
 {
-       GtkSText *text = GTK_STEXT(textview->text);
+       GtkSText *text;
        gchar buf[BUFFSIZE];
        const gchar *boundary = NULL;
        gint boundary_len = 0;
        const gchar *charset = NULL;
        GPtrArray *headers = NULL;
+       gboolean is_rfc822_part = FALSE;
 
        g_return_if_fail(mimeinfo != NULL);
        g_return_if_fail(fp != NULL);
@@ -398,6 +401,7 @@ void textview_show_part(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
                }
                headers = textview_scan_header(textview, fp);
                mimeinfo = mimeinfo->sub;
+               is_rfc822_part = TRUE;
        }
 
        if (prefs_common.force_charset)
@@ -406,8 +410,10 @@ void textview_show_part(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
                charset = mimeinfo->charset;
        textview_set_font(textview, charset);
 
-       textview_clear(textview);
+       text = GTK_STEXT(textview->text);
+
        gtk_stext_freeze(text);
+       textview_clear(textview);
 
        if (headers) {
                textview_show_header(textview, headers);
@@ -417,7 +423,7 @@ void textview_show_part(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
                        gtk_stext_insert(text, NULL, NULL, NULL, "\n", 1);
        }
 
-       if (mimeinfo->mime_type == MIME_MULTIPART || mimeinfo->main)
+       if (mimeinfo->mime_type == MIME_MULTIPART || is_rfc822_part)
                textview_add_parts(textview, mimeinfo, fp);
        else
                textview_write_body(textview, mimeinfo, fp, charset);
@@ -461,9 +467,11 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
        if (mimeinfo->mime_type == MIME_MESSAGE_RFC822) {
                headers = textview_scan_header(textview, fp);
                if (headers) {
+                       gtk_stext_freeze(text);
                        gtk_stext_insert(text, NULL, NULL, NULL, "\n", 1);
                        textview_show_header(textview, headers);
                        procheader_header_array_destroy(headers);
+                       gtk_stext_thaw(text);
                }
                return;
        }