sync with 0.9.0cvs7
authorPaul Mangan <paul@claws-mail.org>
Thu, 22 May 2003 07:05:49 +0000 (07:05 +0000)
committerPaul Mangan <paul@claws-mail.org>
Thu, 22 May 2003 07:05:49 +0000 (07:05 +0000)
ChangeLog
ChangeLog.claws
ChangeLog.jp
configure.ac
src/imap.c
src/summaryview.c

index 5aec85f..75e76ab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-05-22
+
+       * src/imap.c:
+         imap_modified_utf7_to_locale()
+         imap_locale_to_modified_utf7(): fixed compilation failure when not
+         using iconv().
+
 2003-05-21
 
        * src/procmime.c: procmime_scan_multipart_message(): fixed parsing
index de7f0f0..bf1d473 100644 (file)
@@ -1,3 +1,12 @@
+2003-05-22 [paul]      0.8.11claws173
+
+       * sync with 0.9.0cvs7
+               see ChangeLog 2003-05-22
+               
+       * src/summaryview.c
+               revert change in 0.8.11claws172: follow
+               Hiroyuki's decision and that's the end of it.
+
 2003-05-21 [paul]      0.8.11claws172
 
        * src/summaryview.c
index 34d9cb5..c5f7179 100644 (file)
@@ -1,3 +1,10 @@
+2003-05-22
+
+       * src/imap.c:
+         imap_modified_utf7_to_locale()
+         imap_locale_to_modified_utf7(): iconv() ¤ò»ÈÍѤ·¤Ê¤¤¾ì¹ç¥³¥ó¥Ñ¥¤¥ë
+         ¤Ë¼ºÇÔ¤¹¤ë¤Î¤ò½¤Àµ¡£
+
 2003-05-21
 
        * src/procmime.c: procmime_scan_multipart_message(): message/rfc822
index 28b5945..73637ca 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws172
+EXTRA_VERSION=claws173
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index 412abb1..fc3c465 100644 (file)
@@ -2914,7 +2914,7 @@ static gchar *imap_modified_utf7_to_locale(const gchar *mutf7_str)
        to = g_malloc(strlen(mutf7_str) + 1);
        to_p = to;
 
-       while (from_p = mutf7_str; *from_p != '\0'; from_p++) {
+       for (from_p = mutf7_str; *from_p != '\0'; from_p++) {
                if (*from_p == '&' && *(from_p + 1) == '-') {
                        *to_p++ = '&';
                        from_p++;
@@ -3003,7 +3003,7 @@ static gchar *imap_locale_to_modified_utf7(const gchar *from)
        to = g_malloc(strlen(from) * 2 + 1);
        to_p = to;
 
-       while (from_p = from; *from_p != '\0'; from_p++) {
+       for (from_p = from; *from_p != '\0'; from_p++) {
                if (*from_p == '&') {
                        *to_p++ = '&';
                        *to_p++ = '-';
index 0e1788d..10a53e5 100644 (file)
@@ -1139,7 +1139,8 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                                 item->sort_type == SORT_DESCENDING
                                 ? 0 : GTK_CLIST(ctree)->rows - 1);
                }
-               if (prefs_common.open_unread_on_enter) {
+               if (prefs_common.open_unread_on_enter ||
+                   prefs_common.always_show_msg) {
                        summary_unlock(summaryview);
                        summary_select_node(summaryview, node, TRUE, TRUE);
                        summary_lock(summaryview);