Revert previous (mis-)commit.

[claws.git] / src / folder_item_prefs.h

diff --git a/src/folder_item_prefs.h b/src/folder_item_prefs.h
index 0610c5fe1d2d802ca5ddcf3f758948e5147acf10..73b3ecd8dd1e385fe1b8d7783d99f05c38a825d2 100644 (file)
--- a/src/folder_item_prefs.h
+++ b/src/folder_item_prefs.h
@@ -4,7 +4,7 @@
  *
  * 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
  *
  * 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

- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or

  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,


@@ -13,8 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 

  */
 
 #ifndef FOLDER_ITEM_PREFS_H
  */
 
 #ifndef FOLDER_ITEM_PREFS_H


@@ -30,22 +30,14 @@ typedef struct _FolderItemPrefs FolderItemPrefs;
 struct _FolderItemPrefs {
        gchar * directory;
 
 struct _FolderItemPrefs {
        gchar * directory;
 

-       gboolean sort_by_number;
-       gboolean sort_by_size;
-       gboolean sort_by_date;
-       gboolean sort_by_from;
-       gboolean sort_by_subject;
-       gboolean sort_by_score;
-
-       gboolean sort_descending;
-
-       gboolean enable_thread;
-
-        int enable_processing;
+        int enable_processing; /* at start-up */
+        int enable_processing_when_opening;

        GSList * processing;
 
        int newmailcheck;
        int offlinesync;
        GSList * processing;
 
        int newmailcheck;
        int offlinesync;

+       int offlinesync_days;
+       int remove_old_bodies;

 
        gboolean request_return_receipt;
        gboolean enable_default_to;
 
        gboolean request_return_receipt;
        gboolean enable_default_to;


@@ -66,16 +58,23 @@ struct _FolderItemPrefs {
 #endif
        gboolean save_copy_to_folder;
        guint color;
 #endif
        gboolean save_copy_to_folder;
        guint color;

+
+       gboolean compose_with_format;
+       gchar *compose_subject_format;
+       gchar *compose_body_format;
+       gboolean reply_with_format;
+       gchar *reply_quotemark;
+       gchar *reply_body_format;
+       gboolean forward_with_format;
+       gchar *forward_quotemark;
+       gchar *forward_body_format;

 };
 
 void folder_item_prefs_read_config(FolderItem * item);
 void folder_item_prefs_save_config(FolderItem * item);
 };
 
 void folder_item_prefs_read_config(FolderItem * item);
 void folder_item_prefs_save_config(FolderItem * item);

-void folder_item_prefs_set_config(FolderItem * item,
-                                 int sort_type, gint sort_mode);
+void folder_item_prefs_save_config_recursive(FolderItem * item);

 FolderItemPrefs *folder_item_prefs_new(void);
 void folder_item_prefs_free(FolderItemPrefs * prefs);
 FolderItemPrefs *folder_item_prefs_new(void);
 void folder_item_prefs_free(FolderItemPrefs * prefs);

-gint folder_item_prefs_get_sort_type(FolderItem * item);
-gint folder_item_prefs_get_sort_mode(FolderItem * item);

 void folder_item_prefs_copy_prefs(FolderItem * src, FolderItem * dest);
 
 #endif /* FOLDER_ITEM_PREFS_H */
 void folder_item_prefs_copy_prefs(FolderItem * src, FolderItem * dest);
 
 #endif /* FOLDER_ITEM_PREFS_H */