sync with 0.8.11cvs43

[claws.git] / src / prefs_common.c

diff --git a/src/prefs_common.c b/src/prefs_common.c
index 3a0ca92e8583ec1c094f7af096e06638783b4abe..b31199ed2b2c6b6f46d3c95fa1ee4f936ec4cfd5 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -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;