2010-05-04 [iwkse] 3.7.6cvs1

[claws.git] / src / prefs_common.c

diff --git a/src/prefs_common.c b/src/prefs_common.c
index 99d2de044213ee6a75725b5ed2da33c7b7b39180..245f850156e51f0e8888f6d7abcb1863e983fc1a 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2009 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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
@@ -233,6 +233,8 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"linewrap_pastes", "TRUE", &prefs_common.linewrap_pastes, P_BOOL,
         NULL, NULL, NULL},
+       {"primary_paste_unselects", "FALSE", &prefs_common.primary_paste_unselects, P_BOOL,
+        NULL, NULL, NULL},
        {"linewrap_auto", "TRUE", &prefs_common.autowrap, P_BOOL,
         NULL, NULL, NULL},
        {"auto_indent", "TRUE", &prefs_common.auto_indent, P_BOOL,
@@ -241,7 +243,11 @@ static PrefParam param[] = {
         P_BOOL, NULL, NULL, NULL},
         {"autosave_length", "50", &prefs_common.autosave_length, P_INT,
         NULL, NULL, NULL},
-#if USE_ENCHANT
+        {"warn_large_insert", "TRUE", &prefs_common.warn_large_insert,
+        P_BOOL, NULL, NULL, NULL},
+        {"warn_large_insert_size", "500", &prefs_common.warn_large_insert_size,
+        P_INT, NULL, NULL, NULL},
+
        {"enable_aspell", "TRUE", &prefs_common.enable_aspell, P_BOOL,
         NULL, NULL, NULL},
        {"dictionary",  "", &prefs_common.dictionary, P_STRING,
@@ -258,7 +264,7 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"use_both_dicts", "FALSE", &prefs_common.use_both_dicts, P_BOOL,
         NULL, NULL, NULL},
-#endif
+
        {"reply_with_quote", "TRUE", &prefs_common.reply_with_quote, P_BOOL,
         NULL, NULL, NULL},
        {"compose_dnd_insert_or_attach", "0", &prefs_common.compose_dnd_mode, P_ENUM,
@@ -724,6 +730,9 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"scroll_half_page", "FALSE", &prefs_common.scroll_halfpage, P_BOOL,
         NULL, NULL, NULL},
+       {"hide_quoted", "TRUE",
+        &prefs_common.hide_quoted, P_BOOL,
+        NULL, NULL, NULL},
        {"respect_flowed_format", "FALSE", &prefs_common.respect_flowed_format, P_BOOL,
         NULL, NULL, NULL},
 
@@ -812,12 +821,10 @@ static PrefParam param[] = {
 #ifndef G_OS_WIN32
        {"uri_open_command", DEFAULT_BROWSER_CMD,
         &SPECIFIC_PREFS.uri_cmd, P_STRING, NULL, NULL, NULL},
-       {"print_command", "lpr %s",
-        &SPECIFIC_PREFS.print_cmd, P_STRING, NULL, NULL, NULL},
 #endif
        {"ext_editor_command", DEFAULT_EDITOR_CMD,
         &SPECIFIC_PREFS.ext_editor_cmd, P_STRING, NULL, NULL, NULL},
-       {"cmds_use_system_default", "FALSE",
+       {"cmds_use_system_default", "TRUE",
         &prefs_common.cmds_use_system_default, P_BOOL, NULL, NULL, NULL},
        {"add_address_by_click", "FALSE", &prefs_common.add_address_by_click,
         P_BOOL, NULL, NULL, NULL},
@@ -1019,6 +1026,21 @@ static PrefParam param[] = {
        {"addressbook_folderselwin_height", "-1", &prefs_common.addressbook_folderselwin_height, P_INT,
         NULL, NULL, NULL},
 
+       {"aboutwin_width", "450", &prefs_common.aboutwin_width, P_INT,
+        NULL, NULL, NULL},
+       {"aboutwin_height", "500", &prefs_common.aboutwin_height, P_INT,
+        NULL, NULL, NULL},
+
+       {"addrgather_width", "450", &prefs_common.addrgather_width, P_INT,
+        NULL, NULL, NULL},
+       {"addrgather_height", "-1", &prefs_common.addrgather_height, P_INT,
+        NULL, NULL, NULL},
+
+       {"news_subscribe_width", "450", &prefs_common.news_subscribe_width, P_INT,
+        NULL, NULL, NULL},
+       {"news_subscribe_height", "400", &prefs_common.news_subscribe_height, P_INT,
+        NULL, NULL, NULL},
+
        /* Hidden */
        {"warn_dnd", "1", &prefs_common.warn_dnd, P_INT,
         NULL, NULL, NULL},
@@ -1094,6 +1116,14 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"print_paper_orientation", "0", &prefs_common.print_paper_orientation, P_INT,
         NULL, NULL, NULL},
+       {"print_margin_top", "-1", &prefs_common.print_margin_top, P_INT,
+        NULL, NULL, NULL},
+       {"print_margin_bottom", "-1", &prefs_common.print_margin_bottom, P_INT,
+        NULL, NULL, NULL},
+       {"print_margin_left", "-1", &prefs_common.print_margin_left, P_INT,
+        NULL, NULL, NULL},
+       {"print_margin_right", "-1", &prefs_common.print_margin_right, P_INT,
+        NULL, NULL, NULL},
        {"print_use_color", "0", &prefs_common.print_use_color, P_INT,
         NULL, NULL, NULL},
        {"print_use_collate", "0", &prefs_common.print_use_collate, P_INT,
@@ -1119,6 +1149,9 @@ static PrefParam param[] = {
        {"inherit_folder_properties", "FALSE", &prefs_common.inherit_folder_props, P_BOOL,
         NULL, NULL, NULL},
 
+       {"flush_metadata", "TRUE", &prefs_common.flush_metadata, P_BOOL,
+        NULL, NULL, NULL},
+
        {NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
 };
 
@@ -1210,6 +1243,8 @@ void prefs_common_read_config(void)
                prefs_common_read_history(SUMMARY_SEARCH_ADV_CONDITION_HISTORY);
        prefs_common.message_search_history =
                prefs_common_read_history(MESSAGE_SEARCH_HISTORY);
+       prefs_common.compose_save_to_history =
+               prefs_common_read_history(COMPOSE_SAVE_TO_HISTORY);
 
        prefs_common.addressbook_custom_attributes = addressbook_update_custom_attr_from_prefs();
 
@@ -1306,6 +1341,8 @@ void prefs_common_write_config(void)
                prefs_common.summary_search_adv_condition_history);
        prefs_common_save_history(MESSAGE_SEARCH_HISTORY, 
                prefs_common.message_search_history);
+       prefs_common_save_history(COMPOSE_SAVE_TO_HISTORY, 
+               prefs_common.compose_save_to_history);
 
        prefs_common_save_history_to_dir(ADDRBOOK_DIR,
                ADDRESSBOOK_CUSTOM_ATTRIBUTES, 
@@ -1324,8 +1361,8 @@ void pref_get_unescaped_pref(gchar *out, const gchar *in)
 
        *out = '\0';
 
-       g_return_if_fail( in != NULL );
-       g_return_if_fail( out != NULL );
+       cm_return_if_fail( in != NULL );
+       cm_return_if_fail( out != NULL );
 
        i = in;
        o = out;
@@ -1360,8 +1397,8 @@ void pref_get_escaped_pref(gchar *out, const gchar *in)
 
        *out = '\0';
 
-       g_return_if_fail( in != NULL );
-       g_return_if_fail( out != NULL );
+       cm_return_if_fail( in != NULL );
+       cm_return_if_fail( out != NULL );
 
        i = in;
        o = out;
@@ -1390,7 +1427,7 @@ void pref_set_textview_from_pref(GtkTextView *textview, const gchar *txt)
        GtkTextBuffer *buffer;
        gchar *out = NULL;
 
-       g_return_if_fail( textview != NULL );
+       cm_return_if_fail( textview != NULL );
 
        buffer = gtk_text_view_get_buffer(textview);
 
@@ -1412,7 +1449,7 @@ void pref_set_entry_from_pref(GtkEntry *entry, const gchar *txt)
 {
        gchar *out = NULL;
 
-       g_return_if_fail( entry != NULL );
+       cm_return_if_fail( entry != NULL );
        if (!txt) {
                gtk_entry_set_text(entry, "");
        } else {
@@ -1433,15 +1470,15 @@ gchar *pref_get_pref_from_textview(GtkTextView *textview)
        GtkTextIter start, end;
        gchar *out, *tmp;
        
-       g_return_val_if_fail( textview != NULL, "" );
+       cm_return_val_if_fail( textview != NULL, "" );
 
        buffer = gtk_text_view_get_buffer(textview);
        gtk_text_buffer_get_start_iter(buffer, &start);
        gtk_text_buffer_get_iter_at_offset(buffer, &end, -1);
        tmp = gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
        out = malloc(2*strlen(tmp)+1);
-       
-       pref_get_escaped_pref(out, tmp);
+       if (out)
+               pref_get_escaped_pref(out, tmp);
        g_free(tmp);
 
        return out?out:"";
@@ -1453,12 +1490,13 @@ gchar *pref_get_pref_from_entry(GtkEntry *entry)
 {
        gchar *out, *tmp;
 
-       g_return_val_if_fail( entry != NULL, "" );
+       cm_return_val_if_fail( entry != NULL, "" );
 
        tmp = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
        out = malloc(2*strlen(tmp)+1);
-
-       pref_get_escaped_pref(out, tmp);
+       
+       if (out)
+               pref_get_escaped_pref(out, tmp);
        g_free(tmp);
 
        return out?out:"";
@@ -1557,6 +1595,11 @@ gboolean prefs_common_get_use_shred(void)
        return prefs_common.use_shred;
 }
 
+gboolean prefs_common_get_flush_metadata (void)
+{
+       return prefs_common.flush_metadata;
+}
+
 PrefsCommon *prefs_common_get_prefs(void)
 {
        return &prefs_common;