2010-03-22 [pawel] 3.7.5cvs36

[claws.git] / src / prefs_common.c

diff --git a/src/prefs_common.c b/src/prefs_common.c
index 503ec8089c8055a2cf0f40ee771543fc5128d655..69ce9752cca0023974101925ff928cc8ebf90f41 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -243,6 +243,10 @@ static PrefParam param[] = {
         P_BOOL, NULL, NULL, NULL},
         {"autosave_length", "50", &prefs_common.autosave_length, P_INT,
         NULL, NULL, NULL},
+        {"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},
@@ -814,12 +818,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},
@@ -1021,6 +1023,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},
@@ -1129,6 +1146,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}
 };
 
@@ -1338,8 +1358,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;
@@ -1374,8 +1394,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;
@@ -1404,7 +1424,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);
 
@@ -1426,7 +1446,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 {
@@ -1447,7 +1467,7 @@ 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);
@@ -1467,7 +1487,7 @@ 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);
@@ -1572,6 +1592,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;