sync with 0.7.8cvs3

diff --git a/ChangeLog b/ChangeLog
index 4f4fedf3256c2c76638b2b2346f758e8f641237b..027236732d806f2669623effa2116f8c3d4cfd17 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2002-06-19
+
+       * src/compose.c: if the Content-Type of a file is text/*, check
+         its content and set the optimal Content-Transfer-Encoding (thanks
+         to Yoichi Yuasa).
+
+2002-06-18
+
+       * src/textview.c: textview_key_pressed(): pass key press event to
+         main window to activate menu shortcuts (thanks to Alfons).
+
 2002-06-18
 
        * src/folder.c: folder_build_tree(): use strtoul() instead of atoi()

diff --git a/ChangeLog.claws b/ChangeLog.claws
index ec78b3fabca58dd9501a71892f289976f6c0e2fd..32213c999095fe3788df4fddc220635e6a758837 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,4 +1,9 @@
-2002-06-18 [paul]      0.7.8claws8
+2002-06-19 [paul]      0.7.8claws9
+
+       * sync with 0.7.8claws9
+               see ChangeLog 2002-06-18 and 2002-06-19
+
+2002-06-19 [paul]      0.7.8claws8
 
        * sync with 0.7.8cvs1
                see ChangeLog 2002-06-18

diff --git a/ChangeLog.jp b/ChangeLog.jp
index 9967f778453e0fd701d901cf4245f3b23fa7d537..2202667769f7ec0b2a36190b62f3de151b7c0297 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,15 @@
+2002-06-19
+
+       * src/compose.c: ¥Õ¥¡¥¤¥ë¤Î Content-Type ¤¬ text/* ¤Î¾ì¹ç¤Ï¡¢¤½¤Î
+         ÆâÍƤò¥Á¥§¥Ã¥¯¤·¤ÆºÇŬ¤Ê Content-Transfer-Encoding ¤ò»ØÄê
+         (ÅòÀõ¤µ¤ó thanks)¡£
+
+2002-06-18
+
+       * src/textview.c: textview_key_pressed(): ¥á¥Ë¥å¡¼¥·¥ç¡¼¥È¥«¥Ã¥È¤ò
+         ºîÆ°¤µ¤»¤ë¤¿¤á¤Ë¥­¡¼¥×¥ì¥¹¥¤¥Ù¥ó¥È¤ò¥á¥¤¥ó¥¦¥£¥ó¥É¥¦¤ËÅϤ¹¤è¤¦¤Ë
+         ¤·¤¿(Alfons ¤µ¤ó thanks)¡£
+
 2002-06-18
 
        * src/folder.c: folder_build_tree(): ·«¤ê²¼¤²¤òËɤ°¤¿¤á¤Ë mtime ¤Ë

diff --git a/configure.in b/configure.in
index 6b886347b35564708dadbb7bb10e2ce0221965e8..b63f62d51e1b4f6b2c86d6294fbb059500464568 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws8
+EXTRA_VERSION=claws9
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/compose.c b/src/compose.c
index 2366e2dad70d40ac39e96da3edc140c65e5681fa..4c8288888353ccefa205d585cd8d6ea1f6bd3e19 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -1966,16 +1966,24 @@ static void compose_attach_append(Compose *compose, const gchar *file,
                                (_("Message: %s"),
                                 g_basename(filename ? filename : file));
                } else {
-                       ainfo->encoding = ENC_BASE64;
+                       if (!g_strncasecmp(content_type, "text", 4))
+                               ainfo->encoding =
+                                       procmime_get_encoding_for_file(file);
+                       else
+                               ainfo->encoding = ENC_BASE64;
                        ainfo->name = g_strdup
                                (g_basename(filename ? filename : file));
                }
        } else {
                ainfo->content_type = procmime_get_mime_type(file);
-               if (!ainfo->content_type)
+               if (!ainfo->content_type) {
                        ainfo->content_type =
                                g_strdup("application/octet-stream");
-               ainfo->encoding = ENC_BASE64;
+                       ainfo->encoding = ENC_BASE64;
+               } else if (!g_strncasecmp(ainfo->content_type, "text", 4))
+                       ainfo->encoding = procmime_get_encoding_for_file(file);
+               else
+                       ainfo->encoding = ENC_BASE64;
                ainfo->name = g_strdup(g_basename(filename ? filename : file)); 
        }
        ainfo->size = size;

diff --git a/src/procmime.c b/src/procmime.c
index 503466a4ad60a0f3900e5b7dfd5a5ba467e8334d..f0038bce3d09161d15279d178253342a4e64df2e 100644 (file)
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -1262,6 +1262,33 @@ EncodingType procmime_get_encoding_for_charset(const gchar *charset)
                /* return ENC_QUOTED_PRINTABLE; */
 }
 
+EncodingType procmime_get_encoding_for_file(const gchar *file)
+{
+       FILE *fp;
+       guchar buf[BUFSIZ];
+       size_t len;
+
+       if ((fp = fopen(file, "rb")) == NULL) {
+               FILE_OP_ERROR(file, "fopen");
+               return ENC_UNKNOWN;
+       }
+
+       while ((len = fread(buf, sizeof(gchar), sizeof(buf), fp)) > 0) {
+               guchar *p;
+               gint i;
+
+               for (p = buf, i = 0; i < len; p++, i++) {
+                       if (*p & 0x80) {
+                               fclose(fp);
+                               return ENC_BASE64;
+                       }
+               }
+       }
+
+       fclose(fp);
+       return ENC_7BIT;
+}
+
 const gchar *procmime_get_encoding_str(EncodingType encoding)
 {
        static const gchar *encoding_str[] = {

diff --git a/src/procmime.h b/src/procmime.h
index 56cd66a0338e3afbd17c4018b3dc8b00d5d20d83..8373a12e3001efa36c129948c6bdafb52f246310 100644 (file)
--- a/src/procmime.h
+++ b/src/procmime.h
@@ -177,6 +177,7 @@ gchar *procmime_get_mime_type               (const gchar    *filename);
 GList *procmime_get_mime_type_list     (void);
 
 EncodingType procmime_get_encoding_for_charset (const gchar    *charset);
+EncodingType procmime_get_encoding_for_file    (const gchar    *file);
 const gchar *procmime_get_encoding_str         (EncodingType    encoding);
 
 void renderer_read_config(void);

diff --git a/src/textview.c b/src/textview.c
index 531e39609eaf0b3ac99f00301828992ce555e093..df92f55c9a0ff922e0519aafbbbacf7732196abd 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -1660,7 +1660,8 @@ static gint textview_key_pressed(GtkWidget *widget, GdkEventKey *event,
        case GDK_y:
        case GDK_t:
        case GDK_l:
-               if (messageview->type == MVIEW_MIME) {
+               if (messageview->type == MVIEW_MIME &&
+                   textview == messageview->mimeview->textview) {
                        KEY_PRESS_EVENT_STOP();
                        mimeview_pass_key_press_event(messageview->mimeview,
                                                      event);
@@ -1668,8 +1669,15 @@ static gint textview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                }
                /* fall through */
        default:
-               if (summaryview)
-                       summary_pass_key_press_event(summaryview, event);
+               if (summaryview &&
+                   event->window != messageview->mainwin->window->window) {
+                       GdkEventKey tmpev = *event;
+
+                       tmpev.window = messageview->mainwin->window->window;
+                       KEY_PRESS_EVENT_STOP();
+                       gtk_widget_event(messageview->mainwin->window,
+                                        (GdkEvent *)&tmpev);
+               }
                break;
        }