2006-12-01 [wwp] 2.6.0cvs77

[claws.git] / src / prefs_common.h

diff --git a/src/prefs_common.h b/src/prefs_common.h
index 5a1861bb2066a40d2e76ea85e48102534dcad134..ba818eb391bcb18ac9ead4c4e40b50f3e69ace6f 100644 (file)
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 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
@@ -126,6 +126,9 @@ struct _PrefsCommon
        gint autosave_length;
        gboolean compose_no_markup;
        ComposeDndInsertOrAttach compose_dnd_mode;
+       gboolean compose_with_format;
+       gchar *compose_subject_format;
+       gchar *compose_body_format;
 
        /* Quote */
        gboolean reply_with_quote;
@@ -303,6 +306,9 @@ struct _PrefsCommon
        gboolean gpg_warning;
 #endif /* USE_GPGME */
 
+       /* Addressbook */
+       gboolean addressbook_use_editaddress_dialog;
+
        /* Interface */
        gboolean sep_folder;
        gboolean sep_msg;
@@ -352,9 +358,16 @@ struct _PrefsCommon
        gint summary_quicksearch_type;
        gint summary_quicksearch_sticky;
        gint summary_quicksearch_recurse;
+       gint summary_quicksearch_dynamic;
        gulong color_new;
        
        GList *summary_quicksearch_history;
+       GList *summary_search_from_history;
+       GList *summary_search_to_history;
+       GList *summary_search_subject_history;
+       GList *summary_search_body_history;
+       GList *summary_search_adv_condition_history;
+       GList *message_search_history;
 
        gint filteringwin_width;
        gint filteringwin_height;
@@ -405,7 +418,11 @@ void prefs_common_read_config      (void);
 void prefs_common_write_config (void);
 void prefs_common_open         (void);
 PrefsCommon *prefs_common_get  (void);
-void pref_set_textview_from_pref(GtkTextView *textview, gchar *txt);
+void pref_get_unescaped_pref(gchar *out, const gchar *in);
+void pref_get_escaped_pref(gchar *out, const gchar *in);
+void pref_set_textview_from_pref(GtkTextView *textview, const gchar *txt);
+void pref_set_entry_from_pref(GtkEntry *entry, const gchar *txt);
 gchar *pref_get_pref_from_textview(GtkTextView *textview);
+gchar *pref_get_pref_from_entry(GtkEntry *entry);
 
 #endif /* __PREFS_COMMON_H__ */