sync with 0.8.10cvs17
authorPaul Mangan <paul@claws-mail.org>
Fri, 21 Feb 2003 07:55:23 +0000 (07:55 +0000)
committerPaul Mangan <paul@claws-mail.org>
Fri, 21 Feb 2003 07:55:23 +0000 (07:55 +0000)
ChangeLog
ChangeLog.claws
ChangeLog.jp
configure.ac
src/codeconv.c
src/summaryview.c

index 8fb508b..e4be97c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2003-02-21
+
+       * src/codeconv.c: conv_iconv_strdup(): try to skip invalid characters
+         and continue conversion.
+
+2003-02-21
+
+       * src/summaryview.c: summary_selected(): always update widget
+         sensitivity.
+
+2003-02-20
+
+       * src/utils.c: tzoffset_sec(): fixed a bug that displayed wrong
+         date in timezones more than GMT+12 or less than GMT-12.
+
 2003-02-18
 
        * src/prefs_common.[ch]
index a0d9cc4..bf35b2e 100644 (file)
@@ -1,3 +1,8 @@
+2003-02-21 [paul]      0.8.10claws36
+
+       * sync with 0.8.10cvs17
+               see ChangeLog 2003-02-21
+
 2003-02-20 [christoph] 0.8.10claws35
 
        * src/imap.c
index 9be1224..43d6f8a 100644 (file)
@@ -1,3 +1,18 @@
+2003-02-21
+
+       * src/codeconv.c: conv_iconv_strdup(): Ìµ¸ú¤Êʸ»ú¤ò¥¹¥­¥Ã¥×¤·¤Æ
+         ÊÑ´¹¤ò³¤±¤ë¤è¤¦¤Ë¤·¤¿¡£
+
+2003-02-21
+
+       * src/summaryview.c: summary_selected(): ¥¦¥£¥¸¥§¥Ã¥È¤Î¥»¥ó¥·¥Æ¥£
+         ¥Ó¥Æ¥£¤ò¾ï¤Ë¹¹¿·¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+
+2003-02-20
+
+       * src/utils.c: tzoffset_sec(): GMT+12 ¤è¤êÂ礭¤¤¤Þ¤¿¤Ï GMT-12 ¤è¤ê
+         ¾®¤µ¤¤¥¿¥¤¥à¥¾¡¼¥ó¤Ç¸í¤Ã¤¿ÆüÉÕ¤òɽ¼¨¤·¤Æ¤¤¤¿¥Ð¥°¤ò½¤Àµ¡£
+
 2003-02-18
 
        * src/prefs_common.[ch]
index ef3ae41..829262d 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws35
+EXTRA_VERSION=claws36
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index fa1bb18..f4c6625 100644 (file)
@@ -820,12 +820,12 @@ gchar *conv_iconv_strdup(const gchar *inbuf,
        while ((n_conv = iconv(cd, (ICONV_CONST gchar **)&inbuf_p, &in_left,
                               &outbuf_p, &out_left)) < 0) {
                if (EILSEQ == errno) {
-                       g_free(outbuf);
-                       outbuf = NULL;
-                       break;
+                       inbuf_p++;
+                       in_left--;
+                       *outbuf_p++ = SUBST_CHAR;
+                       out_left--;
                } else if (EINVAL == errno) {
-                       g_free(outbuf);
-                       outbuf = NULL;
+                       *outbuf_p = '\0';
                        break;
                } else if (E2BIG == errno) {
                        out_size *= 2;
@@ -842,10 +842,8 @@ gchar *conv_iconv_strdup(const gchar *inbuf,
                }
        }
 
-       if (outbuf) {
-               iconv(cd, NULL, NULL, &outbuf_p, &out_left);
-               outbuf = g_realloc(outbuf, strlen(outbuf) + 1);
-       }
+       iconv(cd, NULL, NULL, &outbuf_p, &out_left);
+       outbuf = g_realloc(outbuf, strlen(outbuf) + 1);
 
        iconv_close(cd);
 
index 0c00507..95e7d6b 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -4835,12 +4835,15 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
        if (summaryview->display_msg ||
            (prefs_common.show_msg_with_cursor_key &&
             messageview_is_visible(summaryview->messageview))) {
-               summary_display_msg(summaryview, row);
                summaryview->display_msg = FALSE;
-       } else {
-               summary_set_menu_sensitive(summaryview);
-               toolbar_main_set_sensitive(summaryview->mainwin);
+               if (summaryview->displayed != row) {
+                       summary_display_msg(summaryview, row);
+                       return;
+               }
        }
+
+       summary_set_menu_sensitive(summaryview);
+       toolbar_main_set_sensitive(summaryview->mainwin);
 }
 
 static void summary_col_resized(GtkCList *clist, gint column, gint width,