sync with 0.8.11cvs43
authorPaul Mangan <paul@claws-mail.org>
Fri, 9 May 2003 08:21:45 +0000 (08:21 +0000)
committerPaul Mangan <paul@claws-mail.org>
Fri, 9 May 2003 08:21:45 +0000 (08:21 +0000)
ChangeLog
ChangeLog.claws
ChangeLog.jp
configure.ac
src/prefs_common.c
src/prefs_common.h
src/summaryview.c

index 6776eab..d57b583 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2003-05-09
+
+       * src/prefs_common.[ch]: changed the description of "Open message when
+         cursor keys are pressed on summary".
+       * src/summaryview.c: summary_show(): open message when always_show_msg
+         is TRUE.
+
+2003-05-09
+
+       * src/logwindow.[ch]: restrict the maximum lines of the log messages
+         to reduce the memory usage.
+
 2003-05-07
 
        * src/compose.c: compose_insert_sig(): fixed a crash when signature
index 4937ad0..13d90e9 100644 (file)
@@ -1,3 +1,8 @@
+2003-05-09 [paul]      0.8.11claws149
+
+       * sync with 0.8.11cvs43
+               see ChangeLog 2003-05-09
+
 2003-05-08 [christoph] 0.8.11claws148
 
        * src/imap.[ch]
index 6f5c34d..5ed9c56 100644 (file)
@@ -1,3 +1,15 @@
+2003-05-09
+
+       * src/prefs_common.[ch]: ¡Ö¥µ¥Þ¥ê¤Ç¥«¡¼¥½¥ë¥­¡¼¤ò²¡¤·¤¿¤È¤­
+         ¥á¥Ã¥»¡¼¥¸¤ò³«¤¯¡×¤ÎÀâÌÀ¤òÊѹ¹¡£
+       * src/summaryview.c: summary_show(): always_show_msg ¤¬ TRUE ¤Î¾ì¹ç
+         ¥á¥Ã¥»¡¼¥¸¤ò³«¤¯¤è¤¦¤Ë¤·¤¿¡£
+
+2003-05-09
+
+       * src/logwindow.[ch]: ¥á¥â¥ê¾ÃÈñÎ̤òºï¸º¤¹¤ë¤¿¤á¡¢¥í¥°¥á¥Ã¥»¡¼¥¸¤Î
+         ºÇÂç¹Ô¿ô¤òÀ©¸Â¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+
 2003-05-07
 
        * src/compose.c: compose_insert_sig(): ½ð̾ʸ»úÎó¤ËÉÔÀµ¤Ê¥·¡¼¥±¥ó¥¹
index c8d06c9..0888d1f 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws148
+EXTRA_VERSION=claws149
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index 3a0ca92..b31199e 100644 (file)
@@ -208,7 +208,7 @@ static struct Privacy {
 
 static struct Interface {
        /* GtkWidget *checkbtn_emacs; */
-       GtkWidget *checkbtn_show_msg_with_cursor;
+       GtkWidget *checkbtn_always_show_msg;
        GtkWidget *checkbtn_openunread;
        GtkWidget *checkbtn_mark_as_read_on_newwin;
        GtkWidget *checkbtn_openinbox;
@@ -745,9 +745,9 @@ static PrefParam param[] = {
 
        /* {"emulate_emacs", "FALSE", &prefs_common.emulate_emacs, P_BOOL,
         NULL, NULL, NULL}, */
-       {"show_message_with_cursor_key", "FALSE",
-        &prefs_common.show_msg_with_cursor_key,
-        P_BOOL, &interface.checkbtn_show_msg_with_cursor,
+       {"always_show_message_when_selected", "FALSE",
+        &prefs_common.always_show_msg,
+        P_BOOL, &interface.checkbtn_always_show_msg,
         prefs_set_data_from_toggle, prefs_set_toggle},
        {"open_unread_on_enter", "FALSE", &prefs_common.open_unread_on_enter,
         P_BOOL, &interface.checkbtn_openunread,
@@ -813,10 +813,10 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"important_score", "1", &prefs_common.important_score, P_INT,
         NULL, NULL, NULL},
-        {"clip_log", "FALSE", &prefs_common.cliplog, P_BOOL,
+        {"clip_log", "TRUE", &prefs_common.cliplog, P_BOOL,
         &other.checkbtn_cliplog,
         prefs_set_data_from_toggle, prefs_set_toggle},
-       {"log_length", "1000", &prefs_common.loglength, P_INT,
+       {"log_length", "500", &prefs_common.loglength, P_INT,
         &other.loglength_entry,
         prefs_set_data_from_entry, prefs_set_entry},
 
@@ -2656,7 +2656,7 @@ static void prefs_interface_create(void)
        GtkWidget *vbox2;
        GtkWidget *vbox3;
        /* GtkWidget *checkbtn_emacs; */
-       GtkWidget *checkbtn_show_msg_with_cursor;
+       GtkWidget *checkbtn_always_show_msg;
        GtkWidget *checkbtn_openunread;
        GtkWidget *checkbtn_mark_as_read_on_newwin;
        GtkWidget *checkbtn_openinbox;
@@ -2693,7 +2693,7 @@ static void prefs_interface_create(void)
                               GTK_JUSTIFY_LEFT);   */
 
        PACK_CHECK_BUTTON
-               (vbox2, checkbtn_show_msg_with_cursor,
+               (vbox2, checkbtn_always_show_msg,
                 _("Always open messages in summary when selected"));
 
        PACK_CHECK_BUTTON
@@ -2777,8 +2777,7 @@ static void prefs_interface_create(void)
        stock_pixmap_themes_list_free(avail_pixmap_themes);
 
        /* interface.checkbtn_emacs          = checkbtn_emacs; */
-       interface.checkbtn_show_msg_with_cursor
-                                             = checkbtn_show_msg_with_cursor;
+       interface.checkbtn_always_show_msg    = checkbtn_always_show_msg;
        interface.checkbtn_openunread         = checkbtn_openunread;
        interface.checkbtn_mark_as_read_on_newwin
                                              = checkbtn_mark_as_read_on_newwin;
index 0ab15a2..212a0b6 100644 (file)
@@ -242,7 +242,7 @@ struct _PrefsCommon
        gboolean sep_folder;
        gboolean sep_msg;
        gboolean emulate_emacs;
-       gboolean show_msg_with_cursor_key;
+       gboolean always_show_msg;
        gboolean open_unread_on_enter;
        gboolean mark_as_read_on_new_window;
        gboolean open_inbox_on_inc;
index d72dfaa..ab542d5 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);
@@ -4671,7 +4672,7 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
        }
 
        if (summaryview->display_msg ||
-           (prefs_common.show_msg_with_cursor_key &&
+           (prefs_common.always_show_msg &&
             messageview_is_visible(summaryview->messageview))) {
                summaryview->display_msg = FALSE;
                if (summaryview->displayed != row) {