commit 85d5d9dc5a564d5f65886db499b0f2ac3a2bb1e6 parent df5f0a9fb3af36a7a549d857686ee4586fc1dcf7 Author: Colin Leroy <colin@colino.net> Date: Sat, 8 Sep 2012 20:23:12 +0000 2012-09-08 [colin] 3.8.1cvs46 * AUTHORS * src/Makefile.am * src/action.c * src/addr_compl.c * src/addrbook.c * src/compose.c * src/compose.h * src/editaddress.c * src/filtering.c * src/folder.c * src/folder.h * src/folderview.h * src/headerview.h * src/imap_gtk.c * src/localfolder.c * src/main.c * src/mainwindow.c * src/mainwindow.h * src/matcher.c * src/matcher_parser_parse.y * src/messageview.c * src/messageview.h * src/mh.c * src/mh_gtk.c * src/mimeview.c * src/mimeview.h * src/noticeview.h * src/prefs_account.c * src/prefs_account.h * src/prefs_filtering.c * src/prefs_filtering_action.c * src/prefs_gtk.h * src/prefs_matcher.c * src/prefs_template.c * src/prefs_toolbar.c * src/privacy.c * src/procheader.h * src/procmime.c * src/procmime.h * src/procmsg.c * src/procmsg.h * src/proctypes.h * src/remotefolder.c * src/summaryview.c * src/summaryview.h * src/textview.c * src/textview.h * src/toolbar.c * src/uri_opener.c * src/viewtypes.h * src/common/defs.h * src/gtk/authors.h * src/gtk/description_window.c * src/plugins/trayicon/trayicon.c Break circular dependencies in Claws' headers, Patch by Sean Buckheister <s_buckhe@cs.uni-kl.de> Diffstat:
57 files changed, 258 insertions(+), 75 deletions(-)
diff --git a/AUTHORS b/AUTHORS @@ -289,3 +289,4 @@ contributors (in addition to the above; based on Changelog) Bodo Graumann Michael Shell Andreas Rönnquist + Sean Buckheister diff --git a/ChangeLog b/ChangeLog @@ -1,3 +1,62 @@ +2012-09-08 [colin] 3.8.1cvs46 + + * AUTHORS + * src/Makefile.am + * src/action.c + * src/addr_compl.c + * src/addrbook.c + * src/compose.c + * src/compose.h + * src/editaddress.c + * src/filtering.c + * src/folder.c + * src/folder.h + * src/folderview.h + * src/headerview.h + * src/imap_gtk.c + * src/localfolder.c + * src/main.c + * src/mainwindow.c + * src/mainwindow.h + * src/matcher.c + * src/matcher_parser_parse.y + * src/messageview.c + * src/messageview.h + * src/mh.c + * src/mh_gtk.c + * src/mimeview.c + * src/mimeview.h + * src/noticeview.h + * src/prefs_account.c + * src/prefs_account.h + * src/prefs_filtering.c + * src/prefs_filtering_action.c + * src/prefs_gtk.h + * src/prefs_matcher.c + * src/prefs_template.c + * src/prefs_toolbar.c + * src/privacy.c + * src/procheader.h + * src/procmime.c + * src/procmime.h + * src/procmsg.c + * src/procmsg.h + * src/proctypes.h + * src/remotefolder.c + * src/summaryview.c + * src/summaryview.h + * src/textview.c + * src/textview.h + * src/toolbar.c + * src/uri_opener.c + * src/viewtypes.h + * src/common/defs.h + * src/gtk/authors.h + * src/gtk/description_window.c + * src/plugins/trayicon/trayicon.c + Break circular dependencies in Claws' headers, + Patch by Sean Buckheister <s_buckhe@cs.uni-kl.de> + 2012-09-08 [colin] 3.8.1cvs45 * src/textview.c diff --git a/PATCHSETS b/PATCHSETS @@ -4420,3 +4420,4 @@ ( cvs diff -u -r 1.1.2.31 -r 1.1.2.32 src/plugins/pgpcore/select-keys.c; ) > 3.8.1cvs43.patchset ( cvs diff -u -r 1.75.2.72 -r 1.75.2.73 src/matcher.c; cvs diff -u -r 1.39.2.20 -r 1.39.2.21 src/matcher.h; cvs diff -u -r 1.43.2.94 -r 1.43.2.95 src/prefs_matcher.c; ) > 3.8.1cvs44.patchset ( cvs diff -u -r 1.96.2.245 -r 1.96.2.246 src/textview.c; ) > 3.8.1cvs45.patchset +( cvs diff -u -r 1.100.2.83 -r 1.100.2.84 AUTHORS; cvs diff -u -r 1.155.2.101 -r 1.155.2.102 src/Makefile.am; cvs diff -u -r 1.12.2.72 -r 1.12.2.73 src/action.c; cvs diff -u -r 1.27.2.63 -r 1.27.2.64 src/addr_compl.c; cvs diff -u -r 1.22.2.28 -r 1.22.2.29 src/addrbook.c; cvs diff -u -r 1.382.2.609 -r 1.382.2.610 src/compose.c; cvs diff -u -r 1.50.2.67 -r 1.50.2.68 src/compose.h; cvs diff -u -r 1.14.2.63 -r 1.14.2.64 src/editaddress.c; cvs diff -u -r 1.60.2.63 -r 1.60.2.64 src/filtering.c; cvs diff -u -r 1.213.2.209 -r 1.213.2.210 src/folder.c; cvs diff -u -r 1.87.2.66 -r 1.87.2.67 src/folder.h; cvs diff -u -r 1.20.2.29 -r 1.20.2.30 src/folderview.h; cvs diff -u -r 1.2.2.8 -r 1.2.2.9 src/headerview.h; cvs diff -u -r 1.1.2.71 -r 1.1.2.72 src/imap_gtk.c; cvs diff -u -r 1.3.4.9 -r 1.3.4.10 src/localfolder.c; cvs diff -u -r 1.115.2.253 -r 1.115.2.254 src/main.c; cvs diff -u -r 1.274.2.349 -r 1.274.2.350 src/mainwindow.c; cvs diff -u -r 1.39.2.64 -r 1.39.2.65 src/mainwindow.h; cvs diff -u -r 1.75.2.73 -r 1.75.2.74 src/matcher.c; cvs diff -u -r 1.25.2.35 -r 1.25.2.36 src/matcher_parser_parse.y; cvs diff -u -r 1.94.2.238 -r 1.94.2.239 src/messageview.c; cvs diff -u -r 1.19.2.32 -r 1.19.2.33 src/messageview.h; cvs diff -u -r 1.79.2.74 -r 1.79.2.75 src/mh.c; cvs diff -u -r 1.2.2.43 -r 1.2.2.44 src/mh_gtk.c; cvs diff -u -r 1.83.2.193 -r 1.83.2.194 src/mimeview.c; cvs diff -u -r 1.20.2.38 -r 1.20.2.39 src/mimeview.h; cvs diff -u -r 1.3.8.12 -r 1.3.8.13 src/noticeview.h; cvs diff -u -r 1.105.2.174 -r 1.105.2.175 src/prefs_account.c; cvs diff -u -r 1.49.2.49 -r 1.49.2.50 src/prefs_account.h; cvs diff -u -r 1.59.2.91 -r 1.59.2.92 src/prefs_filtering.c; cvs diff -u -r 1.1.4.77 -r 1.1.4.78 src/prefs_filtering_action.c; cvs diff -u -r 1.5.2.21 -r 1.5.2.22 src/prefs_gtk.h; cvs diff -u -r 1.43.2.95 -r 1.43.2.96 src/prefs_matcher.c; cvs diff -u -r 1.12.2.81 -r 1.12.2.82 src/prefs_template.c; cvs diff -u -r 1.30.2.72 -r 1.30.2.73 src/prefs_toolbar.c; cvs diff -u -r 1.10.2.27 -r 1.10.2.28 src/privacy.c; cvs diff -u -r 1.11.2.14 -r 1.11.2.15 src/procheader.h; cvs diff -u -r 1.49.2.148 -r 1.49.2.149 src/procmime.c; cvs diff -u -r 1.17.2.29 -r 1.17.2.30 src/procmime.h; cvs diff -u -r 1.150.2.125 -r 1.150.2.126 src/procmsg.c; cvs diff -u -r 1.60.2.63 -r 1.60.2.64 src/procmsg.h; diff -u /dev/null src/proctypes.h; cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/remotefolder.c; cvs diff -u -r 1.395.2.451 -r 1.395.2.452 src/summaryview.c; cvs diff -u -r 1.68.2.60 -r 1.68.2.61 src/summaryview.h; cvs diff -u -r 1.96.2.246 -r 1.96.2.247 src/textview.c; cvs diff -u -r 1.12.2.34 -r 1.12.2.35 src/textview.h; cvs diff -u -r 1.43.2.129 -r 1.43.2.130 src/toolbar.c; cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/uri_opener.c; diff -u /dev/null src/viewtypes.h; cvs diff -u -r 1.9.2.58 -r 1.9.2.59 src/common/defs.h; cvs diff -u -r 1.1.2.79 -r 1.1.2.80 src/gtk/authors.h; cvs diff -u -r 1.5.2.35 -r 1.5.2.36 src/gtk/description_window.c; cvs diff -u -r 1.14.2.82 -r 1.14.2.83 src/plugins/trayicon/trayicon.c; ) > 3.8.1cvs46.patchset diff --git a/configure.ac b/configure.ac @@ -12,7 +12,7 @@ MINOR_VERSION=8 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=45 +EXTRA_VERSION=46 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/Makefile.am b/src/Makefile.am @@ -317,6 +317,7 @@ claws_mailinclude_HEADERS = \ procheader.h \ procmime.h \ procmsg.h \ + proctypes.h \ quote_fmt.h \ quote_fmt_lex.h \ quote_fmt_parse.h \ @@ -335,6 +336,7 @@ claws_mailinclude_HEADERS = \ undo.h \ unmime.h \ uri_opener.h \ + viewtypes.h \ wizard.h \ $(abook_headers) diff --git a/src/action.c b/src/action.c @@ -52,6 +52,7 @@ #include "action.h" #include "compose.h" #include "procmsg.h" +#include "msgcache.h" #include "textview.h" #include "matcher_parser.h" /* CLAWS */ #include "filtering.h" diff --git a/src/addr_compl.c b/src/addr_compl.c @@ -43,6 +43,7 @@ #include "claws.h" #include "hooks.h" #include "gtkutils.h" +#include "stock_pixmap.h" #include <pthread.h> #ifndef USE_NEW_ADDRBOOK diff --git a/src/addrbook.c b/src/addrbook.c @@ -26,6 +26,7 @@ #include <math.h> #include <setjmp.h> +#include "utils.h" #include "xml.h" #include "mgutils.h" #include "addritem.h" diff --git a/src/common/defs.h b/src/common/defs.h @@ -168,6 +168,12 @@ #define PROGRESS_UPDATE_INTERVAL 200 /* msec */ #define SESSION_TIMEOUT_INTERVAL 60 /* sec */ #define MAX_HISTORY_SIZE 32 +#define HSPACING_NARROW 4 +#define VSPACING 10 +#define VSPACING_NARROW 4 +#define VSPACING_NARROW_2 2 +#define VBOX_BORDER 8 +#define DEFAULT_ENTRY_WIDTH 80 #define BOLD_FONT prefs_common.boldfont #define NORMAL_FONT prefs_common.normalfont diff --git a/src/compose.c b/src/compose.c @@ -94,6 +94,7 @@ #include "alertpanel.h" #include "manage_window.h" #include "folder.h" +#include "folder_item_prefs.h" #include "addr_compl.h" #include "quote_fmt.h" #include "undo.h" diff --git a/src/compose.h b/src/compose.h @@ -28,16 +28,12 @@ typedef struct _AttachInfo AttachInfo; #include "procmsg.h" #include "procmime.h" -#ifndef USE_NEW_ADDRBOOK -#include "addressbook.h" -#endif #include "prefs_account.h" #include "undo.h" #include "toolbar.h" -#include "messageview.h" #include "codeconv.h" #include "template.h" -#include "textview.h" +#include "viewtypes.h" #include "folder.h" #ifdef USE_ENCHANT diff --git a/src/editaddress.c b/src/editaddress.c @@ -30,6 +30,7 @@ #include <gtk/gtk.h> #include "alertpanel.h" +#include "stock_pixmap.h" #include "mgutils.h" #include "addressbook.h" #include "addressitem.h" diff --git a/src/filtering.c b/src/filtering.c @@ -37,6 +37,7 @@ #include "addritem.h" #ifndef USE_NEW_ADDRBOOK #include "addrbook.h" + #include "addressbook.h" #else #include "addressbook-dbus.h" #include "addressadd.h" @@ -44,6 +45,9 @@ #include "addr_compl.h" #include "tags.h" #include "log.h" +#include "account.h" +#include "addrindex.h" +#include "folder_item_prefs.h" GSList * pre_global_processing = NULL; GSList * post_global_processing = NULL; diff --git a/src/folder.c b/src/folder.c @@ -59,6 +59,8 @@ #include "timing.h" #include "compose.h" #include "main.h" +#include "msgcache.h" +#include "privacy.h" /* Dependecies to be removed ?! */ #include "prefs_common.h" diff --git a/src/folder.h b/src/folder.h @@ -129,13 +129,12 @@ typedef void (*FolderItemFunc) (FolderItem *item, gpointer data); -#include "folder_item_prefs.h" - -#include "procmsg.h" -#include "msgcache.h" +#include "proctypes.h" #include "xml.h" #include "prefs_account.h" +struct _MsgCache; + struct _Folder { FolderClass *klass; @@ -633,6 +632,8 @@ enum { ITEM_SCANNING }; +struct _FolderItemPrefs; + struct _FolderItem { SpecialFolderItemType stype; @@ -657,7 +658,7 @@ struct _FolderItem gint last_num; - MsgCache *cache; + struct _MsgCache *cache; gboolean cache_dirty; gboolean mark_dirty; gboolean tags_dirty; @@ -693,7 +694,7 @@ struct _FolderItem gpointer data; - FolderItemPrefs * prefs; + struct _FolderItemPrefs * prefs; /* for faster search of special parents */ SpecialFolderItemType parent_stype; diff --git a/src/folderview.h b/src/folderview.h @@ -20,7 +20,6 @@ #ifndef __FOLDERVIEW_H__ #define __FOLDERVIEW_H__ -typedef struct _FolderView FolderView; typedef struct _FolderViewPopup FolderViewPopup; typedef struct _FolderColumnState FolderColumnState; @@ -29,7 +28,7 @@ typedef struct _FolderColumnState FolderColumnState; #include "gtk/gtksctree.h" #include "mainwindow.h" -#include "summaryview.h" +#include "viewtypes.h" #include "folder.h" typedef enum diff --git a/src/gtk/authors.h b/src/gtk/authors.h @@ -91,6 +91,7 @@ static char *CONTRIBS_LIST[] = { "Pavlo Bohmat", "Eugene Brevdo", "André Filipe de Assunção e Brito", +"Sean Buckheister", "Henrik Carlqvist", "Luca Cavalli", "David Chalmers", diff --git a/src/gtk/description_window.c b/src/gtk/description_window.c @@ -27,6 +27,7 @@ #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> +#include "defs.h" #include "manage_window.h" #include "description_window.h" #include "gtkutils.h" diff --git a/src/headerview.h b/src/headerview.h @@ -23,9 +23,8 @@ #include <glib.h> #include <gtk/gtk.h> -typedef struct _HeaderView HeaderView; - #include "procmsg.h" +#include "viewtypes.h" struct _HeaderView { diff --git a/src/imap_gtk.c b/src/imap_gtk.c @@ -32,6 +32,7 @@ #include "utils.h" #include "folder.h" +#include "folder_item_prefs.h" #include "folderview.h" #include "menu.h" #include "account.h" diff --git a/src/localfolder.c b/src/localfolder.c @@ -22,6 +22,7 @@ #include "folder.h" #include "localfolder.h" #include "xml.h" +#include "utils.h" void folder_local_folder_init(Folder *folder, const gchar *name, const gchar *path) diff --git a/src/main.c b/src/main.c @@ -101,6 +101,7 @@ #endif #include "compose.h" #include "folder.h" +#include "folder_item_prefs.h" #include "setup.h" #include "utils.h" #include "gtkutils.h" diff --git a/src/mainwindow.c b/src/mainwindow.c @@ -27,10 +27,12 @@ #include "main.h" #include "mainwindow.h" #include "folderview.h" +#include "folder_item_prefs.h" #include "foldersel.h" #include "summaryview.h" #include "summary_search.h" #include "messageview.h" +#include "mimeview.h" #include "message_search.h" #include "headerview.h" #include "menu.h" diff --git a/src/mainwindow.h b/src/mainwindow.h @@ -24,11 +24,9 @@ typedef struct _MainWindow MainWindow; -#include "folderview.h" -#include "summaryview.h" -#include "headerview.h" -#include "messageview.h" +#include "viewtypes.h" #include "logwindow.h" +#include "procmsg.h" #include "toolbar.h" #define OFFLINE_SWITCH_HOOKLIST "offline_switch" diff --git a/src/matcher.c b/src/matcher.c @@ -47,6 +47,7 @@ #include "prefs_common.h" #include "log.h" #include "tags.h" +#include "folder_item_prefs.h" /*! *\brief Keyword lookup element diff --git a/src/matcher_parser_parse.y b/src/matcher_parser_parse.y @@ -29,6 +29,7 @@ #include "matcher_parser.h" #include "matcher_parser_lex.h" #include "colorlabel.h" +#include "folder_item_prefs.h" static gint error = 0; static gint bool_op = 0; diff --git a/src/messageview.c b/src/messageview.c @@ -60,6 +60,7 @@ #include "uri_opener.h" #include "inc.h" #include "log.h" +#include "privacy.h" #include "combobox.h" #include "printing.h" #include "quoted-printable.h" diff --git a/src/messageview.h b/src/messageview.h @@ -27,13 +27,8 @@ #include <glib.h> #include <gtk/gtk.h> -typedef struct _MessageView MessageView; - #include "mainwindow.h" -#include "headerview.h" -#include "textview.h" -#include "mimeview.h" -#include "noticeview.h" +#include "viewtypes.h" #include "procmsg.h" #include "procmime.h" #include "toolbar.h" diff --git a/src/mh.c b/src/mh.c @@ -34,6 +34,7 @@ #include <time.h> #include "folder.h" +#include "folder_item_prefs.h" #include "mh.h" #include "procmsg.h" #include "procheader.h" diff --git a/src/mh_gtk.c b/src/mh_gtk.c @@ -31,6 +31,7 @@ #include "utils.h" #include "folder.h" +#include "folder_item_prefs.h" #include "folderview.h" #include "menu.h" #include "account.h" diff --git a/src/mimeview.c b/src/mimeview.c @@ -56,6 +56,7 @@ #include "gtk/logwindow.h" #include "timing.h" #include "manage_window.h" +#include "privacy.h" #ifdef MAEMO #include <libosso.h> diff --git a/src/mimeview.h b/src/mimeview.h @@ -20,7 +20,6 @@ #ifndef MIMEVIEW_H #define MIMEVIEW_H -typedef struct _MimeView MimeView; typedef struct _MimeViewerFactory MimeViewerFactory; typedef struct _MimeViewer MimeViewer; diff --git a/src/noticeview.h b/src/noticeview.h @@ -20,8 +20,7 @@ #ifndef NOTICEVIEW_H__ #define NOTICEVIEW_H__ -typedef struct _NoticeView NoticeView; - +#include "viewtypes.h" #include "stock_pixmap.h" struct _NoticeView diff --git a/src/plugins/trayicon/trayicon.c b/src/plugins/trayicon/trayicon.c @@ -43,7 +43,9 @@ #include "alertpanel.h" #include "account.h" #include "gtk/manage_window.h" -#ifdef USE_NEW_ADDRBOOK +#ifndef USE_NEW_ADDRBOOK + #include "addressbook.h" +#else #include "addressbook-dbus.h" #endif diff --git a/src/prefs_account.c b/src/prefs_account.c @@ -46,6 +46,7 @@ #include "account.h" #include "mainwindow.h" #include "manage_window.h" +#include "folder.h" #include "foldersel.h" #include "inc.h" #include "menu.h" @@ -61,6 +62,7 @@ #include "setup.h" #include "quote_fmt.h" #include "hooks.h" +#include "privacy.h" #include "inputdialog.h" #include "ssl_certificate.h" diff --git a/src/prefs_account.h b/src/prefs_account.h @@ -46,9 +46,10 @@ typedef enum { #include <glib.h> #include "smtp.h" -#include "folder.h" #include "gtk/prefswindow.h" +struct _Folder; + /* Changes to this data structure might need to be reflected * in account_clone() */ struct _PrefsAccount @@ -201,7 +202,7 @@ struct _PrefsAccount /* Unique account ID */ gint account_id; - Folder *folder; + struct _Folder *folder; GHashTable *privacy_prefs; SMTPSession *session; }; diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c @@ -46,11 +46,13 @@ #include "gtkutils.h" #include "alertpanel.h" #include "folder.h" +#include "folder_item_prefs.h" #include "filtering.h" #include "addr_compl.h" #include "manual.h" #include "combobox.h" #include "menu.h" +#include "account.h" #include "matcher_parser.h" #include "matcher.h" diff --git a/src/prefs_filtering_action.c b/src/prefs_filtering_action.c @@ -55,6 +55,10 @@ #include "matcher_parser.h" #include "colorlabel.h" #include "combobox.h" +#include "account.h" +#ifndef USE_NEW_ADDRBOOK + #include "addressbook.h" +#endif enum { PFA_ACTION, diff --git a/src/prefs_gtk.h b/src/prefs_gtk.h @@ -28,15 +28,8 @@ typedef struct _PrefParam PrefParam; typedef struct _PrefsDialog PrefsDialog; #include "prefs.h" -#include "account.h" #include "gtk/prefswindow.h" -#define HSPACING_NARROW 4 -#define VSPACING 10 -#define VSPACING_NARROW 4 -#define VSPACING_NARROW_2 2 -#define VBOX_BORDER 8 -#define DEFAULT_ENTRY_WIDTH 80 #define PREFSBUFSIZE 32768 typedef enum diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c @@ -55,6 +55,9 @@ #include "matcher_parser.h" #include "colorlabel.h" #include "tags.h" +#ifndef USE_NEW_ADDRBOOK + #include "addressbook.h" +#endif #ifndef USE_NEW_ADDRBOOK static void prefs_matcher_addressbook_select(void); diff --git a/src/prefs_template.c b/src/prefs_template.c @@ -43,6 +43,7 @@ #include "manual.h" #include "gtkutils.h" #include "menu.h" +#include "account.h" enum { TEMPL_TEXT, diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c @@ -51,6 +51,7 @@ #include "prefswindow.h" #include "prefs_gtk.h" #include "plugin.h" +#include "messageview.h" enum { diff --git a/src/privacy.c b/src/privacy.c @@ -22,6 +22,7 @@ #include "privacy.h" #include "procmime.h" +#include "procmsg.h" static GSList *systems = NULL; static gchar *privacy_last_error = NULL; diff --git a/src/procheader.h b/src/procheader.h @@ -24,10 +24,7 @@ #include <stdio.h> #include <time.h> -#include "procmsg.h" - -typedef struct _HeaderEntry HeaderEntry; -typedef struct _Header Header; +#include "proctypes.h" struct _HeaderEntry { diff --git a/src/procmime.c b/src/procmime.c @@ -52,6 +52,7 @@ #include "prefs_gtk.h" #include "alertpanel.h" #include "timing.h" +#include "privacy.h" static GHashTable *procmime_get_mime_type_table (void); static MimeInfo *procmime_scan_file_short(const gchar *filename); diff --git a/src/procmime.h b/src/procmime.h @@ -24,13 +24,8 @@ #include "claws-features.h" #endif -typedef struct _MimeType MimeType; -typedef struct _MimeInfo MimeInfo; -typedef struct _MimeParser MimeParser; - -#include "procmsg.h" #include "utils.h" - +#include "proctypes.h" typedef enum { ENC_7BIT, @@ -71,8 +66,7 @@ typedef enum #include <glib.h> #include <stdio.h> -#include "procmsg.h" -#include "privacy.h" +struct _PrivacyData; struct _MimeType { @@ -150,7 +144,7 @@ struct _MimeInfo GHashTable *dispositionparameters; /* Privacy */ - PrivacyData *privacy; + struct _PrivacyData *privacy; gboolean broken; }; diff --git a/src/procmsg.c b/src/procmsg.c @@ -48,6 +48,7 @@ #include "tags.h" #include "timing.h" #include "inc.h" +#include "privacy.h" extern SessionStats session_stats; diff --git a/src/procmsg.h b/src/procmsg.h @@ -30,17 +30,7 @@ #include <sys/types.h> #include <string.h> #include "utils.h" - -typedef struct _MsgInfo MsgInfo; -typedef struct _MsgFlags MsgFlags; -typedef struct _MsgFileInfo MsgFileInfo; -typedef struct _MsgInfoUpdate MsgInfoUpdate; -typedef struct _MailFilteringData MailFilteringData; - -typedef struct _MsgInfoExtraData MsgInfoExtraData; - -typedef GSList MsgInfoList; -typedef GSList MsgNumberList; +#include "proctypes.h" #define MSG_NEW (1U << 0) #define MSG_UNREAD (1U << 1) @@ -95,8 +85,6 @@ typedef GSList MsgNumberList; #define MSG_RESERVED_CLAWS (1U << 30) /* for claws-mail */ #define MSG_RESERVED (1U << 31) -typedef guint32 MsgPermFlags; - #define MSG_MOVE (1U << 0) #define MSG_COPY (1U << 1) #define MSG_MOVE_DONE (1U << 15) @@ -110,8 +98,6 @@ typedef guint32 MsgPermFlags; #define MSG_HAS_ATTACHMENT (1U << 30) #define MSG_SCANNED (1U << 31) -typedef guint32 MsgTmpFlags; - #define MSG_CACHED_FLAG_MASK (MSG_MULTIPART | MSG_ENCRYPTED | MSG_SIGNED | MSG_HAS_ATTACHMENT | MSG_SCANNED) #define MSG_SET_FLAGS(msg, flags) { (msg) |= (flags); } @@ -177,7 +163,7 @@ typedef enum { MSGINFO_UPDATE_DELETED = 1 << 1 } MsgInfoUpdateFlags; -#include "procmime.h" +#include "prefs_account.h" #include "prefs_filtering.h" #include "folder.h" diff --git a/src/proctypes.h b/src/proctypes.h @@ -0,0 +1,68 @@ +/* + * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client + * Copyright (C) 2012 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 + * 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, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * 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, see <http://www.gnu.org/licenses/>. + * + */ + +#ifndef PROCTYPES_H +#define PROCTYPES_H + +struct _MsgInfo; +typedef struct _MsgInfo MsgInfo; + +struct _MsgFlags; +typedef struct _MsgFlags MsgFlags; + +typedef guint32 MsgPermFlags; +typedef guint32 MsgTmpFlags; + +struct _MsgFileInfo; +typedef struct _MsgFileInfo MsgFileInfo; + +struct _MsgInfoUpdate; +typedef struct _MsgInfoUpdate MsgInfoUpdate; + +struct _MailFilteringData; +typedef struct _MailFilteringData MailFilteringData; + +struct _MsgInfoExtraData; +typedef struct _MsgInfoExtraData MsgInfoExtraData; + +typedef GSList MsgInfoList; +typedef GSList MsgNumberList; + + + +struct _HeaderEntry; +typedef struct _HeaderEntry HeaderEntry; + +struct _Header; +typedef struct _Header Header; + + + +struct _MimeType; +typedef struct _MimeType MimeType; + +struct _MimeInfo; +typedef struct _MimeInfo MimeInfo; + +struct _MimeParser; +typedef struct _MimeParser MimeParser; + + + +#endif diff --git a/src/remotefolder.c b/src/remotefolder.c @@ -19,6 +19,7 @@ #include <glib.h> +#include "utils.h" #include "remotefolder.h" void folder_remote_folder_init(Folder *folder, const gchar *name, diff --git a/src/summaryview.c b/src/summaryview.c @@ -36,6 +36,7 @@ #include "folderview.h" #include "summaryview.h" #include "messageview.h" +#include "mimeview.h" #include "foldersel.h" #include "procmsg.h" #include "procheader.h" diff --git a/src/summaryview.h b/src/summaryview.h @@ -27,7 +27,7 @@ #include <gdk/gdk.h> #include <gtk/gtk.h> -typedef struct _SummaryView SummaryView; +#include "viewtypes.h" typedef struct _SummaryColumnState SummaryColumnState; #define MAIL_MANUAL_FILTERING_HOOKLIST "mail_manual_filtering_hooklist" @@ -66,9 +66,6 @@ typedef enum } TargetInfo; #include "mainwindow.h" -#include "folderview.h" -#include "headerview.h" -#include "messageview.h" #include "compose.h" #include "folder.h" #include "gtksctree.h" diff --git a/src/textview.c b/src/textview.c @@ -75,6 +75,7 @@ #include "timing.h" #include "tags.h" #include "manage_window.h" +#include "folder_item_prefs.h" static GdkColor quote_colors[3] = { {(gulong)0, (gushort)0, (gushort)0, (gushort)0}, diff --git a/src/textview.h b/src/textview.h @@ -27,7 +27,6 @@ #include <glib.h> #include <gtk/gtk.h> -typedef struct _TextView TextView; typedef struct _ClickableText ClickableText; struct _ClickableText { @@ -47,7 +46,7 @@ struct _ClickableText }; -#include "messageview.h" +#include "viewtypes.h" #include "procmime.h" struct _TextView diff --git a/src/toolbar.c b/src/toolbar.c @@ -58,7 +58,10 @@ #include "prefs_toolbar.h" #include "alertpanel.h" #include "imap.h" -#ifdef USE_NEW_ADDRBOOK +#include "account.h" +#ifndef USE_NEW_ADDRBOOK + #include "addressbook.h" +#else #include "addressbook-dbus.h" #endif diff --git a/src/uri_opener.c b/src/uri_opener.c @@ -35,6 +35,7 @@ #include "gtkutils.h" #include "alertpanel.h" #include "textview.h" +#include "mimeview.h" #include "prefs_common.h" #include "prefs_common.h" diff --git a/src/viewtypes.h b/src/viewtypes.h @@ -0,0 +1,44 @@ +/* + * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client + * Copyright (C) 2012 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 + * 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, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * 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, see <http://www.gnu.org/licenses/>. + * + */ + +#ifndef VIEWTYPES_H +#define VIEWTYPES_H + +struct _SummaryView; +typedef struct _SummaryView SummaryView; + +struct _FolderView; +typedef struct _FolderView FolderView; + +struct _HeaderView; +typedef struct _HeaderView HeaderView; + +struct _MessageView; +typedef struct _MessageView MessageView; + +struct _TextView; +typedef struct _TextView TextView; + +struct _MimeView; +typedef struct _MimeView MimeView; + +struct _NoticeView; +typedef struct _NoticeView NoticeView; + +#endif