[Commits] Makefile.am 1.155.2.101 1.155.2.102 action.c 1.12.2.72 1.12.2.73 addr_compl.c 1.27.2.63 1.27.2.64 addrbook.c 1.22.2.28 1.22.2.29 compose.c 1.382.2.609 1.382.2.610 compose.h 1.50.2.67 1.50.2.68 editaddress.c 1.14.2.63 1.14.2.64 filtering.c 1.60.2.63 1.60.2.64 folder.c 1.213.2.209 1.213.2.210 folder.h 1.87.2.66 1.87.2.67 folderview.h 1.20.2.29 1.20.2.30 headerview.h 1.2.2.8 1.2.2.9 imap_gtk.c 1.1.2.71 1.1.2.72 localfolder.c 1.3.4.9 1.3.4.10 main.c 1.115.2.253 1.115.2.254 mainwindow.c 1.274.2.349 1.274.2.350 mainwindow.h 1.39.2.64 1.39.2.65 matcher.c 1.75.2.73 1.75.2.74 matcher_parser_parse.y 1.25.2.35 1.25.2.36 messageview.c 1.94.2.238 1.94.2.239 messageview.h 1.19.2.32 1.19.2.33 mh.c 1.79.2.74 1.79.2.75 mh_gtk.c 1.2.2.43 1.2.2.44 mimeview.c 1.83.2.193 1.83.2.194 mimeview.h 1.20.2.38 1.20.2.39 noticeview.h 1.3.8.12 1.3.8.13 prefs_account.c 1.105.2.174 1.105.2.175 prefs_account.h 1.49.2.49 1.49.2.50 prefs_filtering.c 1.59.2.91 1.59.2.92 prefs_filtering_action.c 1.1.4.77 1.1.4.78 prefs_gtk.h 1.5.2.21 1.5.2.22 prefs_matcher.c 1.43.2.95 1.43.2.96 prefs_template.c 1.12.2.81 1.12.2.82 prefs_toolbar.c 1.30.2.72 1.30.2.73 privacy.c 1.10.2.27 1.10.2.28 procheader.h 1.11.2.14 1.11.2.15 procmime.c 1.49.2.148 1.49.2.149 procmime.h 1.17.2.29 1.17.2.30 procmsg.c 1.150.2.125 1.150.2.126 procmsg.h 1.60.2.63 1.60.2.64 proctypes.h NONE 1.1.2.1 remotefolder.c 1.1.4.10 1.1.4.11 summaryview.c 1.395.2.451 1.395.2.452 summaryview.h 1.68.2.60 1.68.2.61 textview.c 1.96.2.246 1.96.2.247 textview.h 1.12.2.34 1.12.2.35 toolbar.c 1.43.2.129 1.43.2.130 uri_opener.c 1.1.2.17 1.1.2.18 viewtypes.h NONE 1.1.2.1
colin at claws-mail.org
colin at claws-mail.org
Sat Sep 8 22:23:14 CEST 2012
Update of /home/claws-mail/claws/src
In directory srv:/tmp/cvs-serv29474/src
Modified Files:
Tag: gtk2
Makefile.am action.c addr_compl.c addrbook.c compose.c
compose.h editaddress.c filtering.c folder.c folder.h
folderview.h headerview.h imap_gtk.c localfolder.c main.c
mainwindow.c mainwindow.h matcher.c matcher_parser_parse.y
messageview.c messageview.h mh.c mh_gtk.c mimeview.c
mimeview.h noticeview.h prefs_account.c prefs_account.h
prefs_filtering.c prefs_filtering_action.c prefs_gtk.h
prefs_matcher.c prefs_template.c prefs_toolbar.c privacy.c
procheader.h procmime.c procmime.h procmsg.c procmsg.h
remotefolder.c summaryview.c summaryview.h textview.c
textview.h toolbar.c uri_opener.c
Added Files:
Tag: gtk2
proctypes.h viewtypes.h
Log Message:
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 at cs.uni-kl.de>
Index: summaryview.h
===================================================================
RCS file: /home/claws-mail/claws/src/summaryview.h,v
retrieving revision 1.68.2.60
retrieving revision 1.68.2.61
diff -u -d -r1.68.2.60 -r1.68.2.61
--- summaryview.h 27 May 2012 17:31:00 -0000 1.68.2.60
+++ summaryview.h 8 Sep 2012 20:23:11 -0000 1.68.2.61
@@ -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 @@
} TargetInfo;
#include "mainwindow.h"
-#include "folderview.h"
-#include "headerview.h"
-#include "messageview.h"
#include "compose.h"
#include "folder.h"
#include "gtksctree.h"
Index: privacy.c
===================================================================
RCS file: /home/claws-mail/claws/src/privacy.c,v
retrieving revision 1.10.2.27
retrieving revision 1.10.2.28
diff -u -d -r1.10.2.27 -r1.10.2.28
--- privacy.c 27 May 2012 17:30:55 -0000 1.10.2.27
+++ privacy.c 8 Sep 2012 20:23:11 -0000 1.10.2.28
@@ -22,6 +22,7 @@
#include "privacy.h"
#include "procmime.h"
+#include "procmsg.h"
static GSList *systems = NULL;
static gchar *privacy_last_error = NULL;
Index: toolbar.c
===================================================================
RCS file: /home/claws-mail/claws/src/toolbar.c,v
retrieving revision 1.43.2.129
retrieving revision 1.43.2.130
diff -u -d -r1.43.2.129 -r1.43.2.130
--- toolbar.c 7 Jul 2012 07:09:30 -0000 1.43.2.129
+++ toolbar.c 8 Sep 2012 20:23:11 -0000 1.43.2.130
@@ -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
Index: Makefile.am
===================================================================
RCS file: /home/claws-mail/claws/src/Makefile.am,v
retrieving revision 1.155.2.101
retrieving revision 1.155.2.102
diff -u -d -r1.155.2.101 -r1.155.2.102
--- Makefile.am 3 Apr 2012 08:41:31 -0000 1.155.2.101
+++ Makefile.am 8 Sep 2012 20:23:09 -0000 1.155.2.102
@@ -317,6 +317,7 @@
procheader.h \
procmime.h \
procmsg.h \
+ proctypes.h \
quote_fmt.h \
quote_fmt_lex.h \
quote_fmt_parse.h \
@@ -335,6 +336,7 @@
undo.h \
unmime.h \
uri_opener.h \
+ viewtypes.h \
wizard.h \
$(abook_headers)
Index: prefs_gtk.h
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_gtk.h,v
retrieving revision 1.5.2.21
retrieving revision 1.5.2.22
diff -u -d -r1.5.2.21 -r1.5.2.22
--- prefs_gtk.h 27 May 2012 17:30:53 -0000 1.5.2.21
+++ prefs_gtk.h 8 Sep 2012 20:23:11 -0000 1.5.2.22
@@ -28,15 +28,8 @@
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
Index: summaryview.c
===================================================================
RCS file: /home/claws-mail/claws/src/summaryview.c,v
retrieving revision 1.395.2.451
retrieving revision 1.395.2.452
diff -u -d -r1.395.2.451 -r1.395.2.452
--- summaryview.c 29 Aug 2012 09:33:01 -0000 1.395.2.451
+++ summaryview.c 8 Sep 2012 20:23:11 -0000 1.395.2.452
@@ -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"
--- NEW FILE: proctypes.h ---
/*
* 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
Index: addr_compl.c
===================================================================
RCS file: /home/claws-mail/claws/src/addr_compl.c,v
retrieving revision 1.27.2.63
retrieving revision 1.27.2.64
diff -u -d -r1.27.2.63 -r1.27.2.64
--- addr_compl.c 7 Jul 2012 07:09:26 -0000 1.27.2.63
+++ addr_compl.c 8 Sep 2012 20:23:09 -0000 1.27.2.64
@@ -43,6 +43,7 @@
#include "claws.h"
#include "hooks.h"
#include "gtkutils.h"
+#include "stock_pixmap.h"
#include <pthread.h>
#ifndef USE_NEW_ADDRBOOK
Index: messageview.h
===================================================================
RCS file: /home/claws-mail/claws/src/messageview.h,v
retrieving revision 1.19.2.32
retrieving revision 1.19.2.33
diff -u -d -r1.19.2.32 -r1.19.2.33
--- messageview.h 7 Jul 2012 07:30:56 -0000 1.19.2.32
+++ messageview.h 8 Sep 2012 20:23:10 -0000 1.19.2.33
@@ -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"
Index: addrbook.c
===================================================================
RCS file: /home/claws-mail/claws/src/addrbook.c,v
retrieving revision 1.22.2.28
retrieving revision 1.22.2.29
diff -u -d -r1.22.2.28 -r1.22.2.29
--- addrbook.c 27 May 2012 17:30:48 -0000 1.22.2.28
+++ addrbook.c 8 Sep 2012 20:23:09 -0000 1.22.2.29
@@ -26,6 +26,7 @@
#include <math.h>
#include <setjmp.h>
+#include "utils.h"
#include "xml.h"
#include "mgutils.h"
#include "addritem.h"
Index: prefs_filtering.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_filtering.c,v
retrieving revision 1.59.2.91
retrieving revision 1.59.2.92
diff -u -d -r1.59.2.91 -r1.59.2.92
--- prefs_filtering.c 9 Aug 2012 13:03:38 -0000 1.59.2.91
+++ prefs_filtering.c 8 Sep 2012 20:23:10 -0000 1.59.2.92
@@ -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"
Index: messageview.c
===================================================================
RCS file: /home/claws-mail/claws/src/messageview.c,v
retrieving revision 1.94.2.238
retrieving revision 1.94.2.239
diff -u -d -r1.94.2.238 -r1.94.2.239
--- messageview.c 29 Aug 2012 09:33:01 -0000 1.94.2.238
+++ messageview.c 8 Sep 2012 20:23:10 -0000 1.94.2.239
@@ -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"
Index: localfolder.c
===================================================================
RCS file: /home/claws-mail/claws/src/localfolder.c,v
retrieving revision 1.3.4.9
retrieving revision 1.3.4.10
diff -u -d -r1.3.4.9 -r1.3.4.10
--- localfolder.c 27 May 2012 17:30:51 -0000 1.3.4.9
+++ localfolder.c 8 Sep 2012 20:23:10 -0000 1.3.4.10
@@ -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)
Index: editaddress.c
===================================================================
RCS file: /home/claws-mail/claws/src/editaddress.c,v
retrieving revision 1.14.2.63
retrieving revision 1.14.2.64
diff -u -d -r1.14.2.63 -r1.14.2.64
--- editaddress.c 7 Jul 2012 07:09:27 -0000 1.14.2.63
+++ editaddress.c 8 Sep 2012 20:23:10 -0000 1.14.2.64
@@ -30,6 +30,7 @@
#include <gtk/gtk.h>
#include "alertpanel.h"
+#include "stock_pixmap.h"
#include "mgutils.h"
#include "addressbook.h"
#include "addressitem.h"
Index: prefs_account.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_account.c,v
retrieving revision 1.105.2.174
retrieving revision 1.105.2.175
diff -u -d -r1.105.2.174 -r1.105.2.175
--- prefs_account.c 7 Jul 2012 07:09:28 -0000 1.105.2.174
+++ prefs_account.c 8 Sep 2012 20:23:10 -0000 1.105.2.175
@@ -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"
Index: imap_gtk.c
===================================================================
RCS file: /home/claws-mail/claws/src/imap_gtk.c,v
retrieving revision 1.1.2.71
retrieving revision 1.1.2.72
diff -u -d -r1.1.2.71 -r1.1.2.72
--- imap_gtk.c 7 Jul 2012 07:09:27 -0000 1.1.2.71
+++ imap_gtk.c 8 Sep 2012 20:23:10 -0000 1.1.2.72
@@ -32,6 +32,7 @@
#include "utils.h"
#include "folder.h"
+#include "folder_item_prefs.h"
#include "folderview.h"
#include "menu.h"
#include "account.h"
Index: procmsg.h
===================================================================
RCS file: /home/claws-mail/claws/src/procmsg.h,v
retrieving revision 1.60.2.63
retrieving revision 1.60.2.64
diff -u -d -r1.60.2.63 -r1.60.2.64
--- procmsg.h 7 Jul 2012 07:30:56 -0000 1.60.2.63
+++ procmsg.h 8 Sep 2012 20:23:11 -0000 1.60.2.64
@@ -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 @@
#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 @@
#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 @@
MSGINFO_UPDATE_DELETED = 1 << 1
} MsgInfoUpdateFlags;
-#include "procmime.h"
+#include "prefs_account.h"
#include "prefs_filtering.h"
#include "folder.h"
Index: uri_opener.c
===================================================================
RCS file: /home/claws-mail/claws/src/Attic/uri_opener.c,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -u -d -r1.1.2.17 -r1.1.2.18
--- uri_opener.c 7 Jul 2012 07:09:30 -0000 1.1.2.17
+++ uri_opener.c 8 Sep 2012 20:23:11 -0000 1.1.2.18
@@ -35,6 +35,7 @@
#include "gtkutils.h"
#include "alertpanel.h"
#include "textview.h"
+#include "mimeview.h"
#include "prefs_common.h"
#include "prefs_common.h"
Index: matcher.c
===================================================================
RCS file: /home/claws-mail/claws/src/matcher.c,v
retrieving revision 1.75.2.73
retrieving revision 1.75.2.74
diff -u -d -r1.75.2.73 -r1.75.2.74
--- matcher.c 5 Sep 2012 15:38:36 -0000 1.75.2.73
+++ matcher.c 8 Sep 2012 20:23:10 -0000 1.75.2.74
@@ -47,6 +47,7 @@
#include "prefs_common.h"
#include "log.h"
#include "tags.h"
+#include "folder_item_prefs.h"
/*!
*\brief Keyword lookup element
Index: compose.h
===================================================================
RCS file: /home/claws-mail/claws/src/compose.h,v
retrieving revision 1.50.2.67
retrieving revision 1.50.2.68
diff -u -d -r1.50.2.67 -r1.50.2.68
--- compose.h 27 May 2012 17:30:49 -0000 1.50.2.67
+++ compose.h 8 Sep 2012 20:23:09 -0000 1.50.2.68
@@ -28,16 +28,12 @@
#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
Index: compose.c
===================================================================
RCS file: /home/claws-mail/claws/src/compose.c,v
retrieving revision 1.382.2.609
retrieving revision 1.382.2.610
diff -u -d -r1.382.2.609 -r1.382.2.610
--- compose.c 12 Aug 2012 17:20:34 -0000 1.382.2.609
+++ compose.c 8 Sep 2012 20:23:09 -0000 1.382.2.610
@@ -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"
Index: folder.h
===================================================================
RCS file: /home/claws-mail/claws/src/folder.h,v
retrieving revision 1.87.2.66
retrieving revision 1.87.2.67
diff -u -d -r1.87.2.66 -r1.87.2.67
--- folder.h 27 May 2012 17:30:50 -0000 1.87.2.66
+++ folder.h 8 Sep 2012 20:23:10 -0000 1.87.2.67
@@ -129,13 +129,12 @@
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 @@
ITEM_SCANNING
};
+struct _FolderItemPrefs;
+
struct _FolderItem
{
SpecialFolderItemType stype;
@@ -657,7 +658,7 @@
gint last_num;
- MsgCache *cache;
+ struct _MsgCache *cache;
gboolean cache_dirty;
gboolean mark_dirty;
gboolean tags_dirty;
@@ -693,7 +694,7 @@
gpointer data;
- FolderItemPrefs * prefs;
+ struct _FolderItemPrefs * prefs;
/* for faster search of special parents */
SpecialFolderItemType parent_stype;
Index: procmsg.c
===================================================================
RCS file: /home/claws-mail/claws/src/procmsg.c,v
retrieving revision 1.150.2.125
retrieving revision 1.150.2.126
diff -u -d -r1.150.2.125 -r1.150.2.126
--- procmsg.c 27 Aug 2012 13:38:59 -0000 1.150.2.125
+++ procmsg.c 8 Sep 2012 20:23:11 -0000 1.150.2.126
@@ -48,6 +48,7 @@
#include "tags.h"
#include "timing.h"
#include "inc.h"
+#include "privacy.h"
extern SessionStats session_stats;
--- NEW FILE: viewtypes.h ---
/*
* 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
Index: prefs_toolbar.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_toolbar.c,v
retrieving revision 1.30.2.72
retrieving revision 1.30.2.73
diff -u -d -r1.30.2.72 -r1.30.2.73
--- prefs_toolbar.c 7 Jul 2012 07:09:30 -0000 1.30.2.72
+++ prefs_toolbar.c 8 Sep 2012 20:23:11 -0000 1.30.2.73
@@ -51,6 +51,7 @@
#include "prefswindow.h"
#include "prefs_gtk.h"
#include "plugin.h"
+#include "messageview.h"
enum
{
Index: remotefolder.c
===================================================================
RCS file: /home/claws-mail/claws/src/remotefolder.c,v
retrieving revision 1.1.4.10
retrieving revision 1.1.4.11
diff -u -d -r1.1.4.10 -r1.1.4.11
--- remotefolder.c 27 May 2012 17:30:56 -0000 1.1.4.10
+++ remotefolder.c 8 Sep 2012 20:23:11 -0000 1.1.4.11
@@ -19,6 +19,7 @@
#include <glib.h>
+#include "utils.h"
#include "remotefolder.h"
void folder_remote_folder_init(Folder *folder, const gchar *name,
Index: prefs_filtering_action.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_filtering_action.c,v
retrieving revision 1.1.4.77
retrieving revision 1.1.4.78
diff -u -d -r1.1.4.77 -r1.1.4.78
--- prefs_filtering_action.c 7 Jul 2012 07:09:29 -0000 1.1.4.77
+++ prefs_filtering_action.c 8 Sep 2012 20:23:11 -0000 1.1.4.78
@@ -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,
Index: mimeview.c
===================================================================
RCS file: /home/claws-mail/claws/src/mimeview.c,v
retrieving revision 1.83.2.193
retrieving revision 1.83.2.194
diff -u -d -r1.83.2.193 -r1.83.2.194
--- mimeview.c 29 Aug 2012 09:33:01 -0000 1.83.2.193
+++ mimeview.c 8 Sep 2012 20:23:10 -0000 1.83.2.194
@@ -56,6 +56,7 @@
#include "gtk/logwindow.h"
#include "timing.h"
#include "manage_window.h"
+#include "privacy.h"
#ifdef MAEMO
#include <libosso.h>
Index: textview.h
===================================================================
RCS file: /home/claws-mail/claws/src/textview.h,v
retrieving revision 1.12.2.34
retrieving revision 1.12.2.35
diff -u -d -r1.12.2.34 -r1.12.2.35
--- textview.h 7 Jul 2012 07:30:56 -0000 1.12.2.34
+++ textview.h 8 Sep 2012 20:23:11 -0000 1.12.2.35
@@ -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 @@
};
-#include "messageview.h"
+#include "viewtypes.h"
#include "procmime.h"
struct _TextView
Index: textview.c
===================================================================
RCS file: /home/claws-mail/claws/src/textview.c,v
retrieving revision 1.96.2.246
retrieving revision 1.96.2.247
diff -u -d -r1.96.2.246 -r1.96.2.247
--- textview.c 8 Sep 2012 20:12:53 -0000 1.96.2.246
+++ textview.c 8 Sep 2012 20:23:11 -0000 1.96.2.247
@@ -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},
Index: mh.c
===================================================================
RCS file: /home/claws-mail/claws/src/mh.c,v
retrieving revision 1.79.2.74
retrieving revision 1.79.2.75
diff -u -d -r1.79.2.74 -r1.79.2.75
--- mh.c 7 Jul 2012 07:09:28 -0000 1.79.2.74
+++ mh.c 8 Sep 2012 20:23:10 -0000 1.79.2.75
@@ -34,6 +34,7 @@
#include <time.h>
#include "folder.h"
+#include "folder_item_prefs.h"
#include "mh.h"
#include "procmsg.h"
#include "procheader.h"
Index: prefs_matcher.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_matcher.c,v
retrieving revision 1.43.2.95
retrieving revision 1.43.2.96
diff -u -d -r1.43.2.95 -r1.43.2.96
--- prefs_matcher.c 5 Sep 2012 15:38:36 -0000 1.43.2.95
+++ prefs_matcher.c 8 Sep 2012 20:23:11 -0000 1.43.2.96
@@ -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);
Index: mh_gtk.c
===================================================================
RCS file: /home/claws-mail/claws/src/mh_gtk.c,v
retrieving revision 1.2.2.43
retrieving revision 1.2.2.44
diff -u -d -r1.2.2.43 -r1.2.2.44
--- mh_gtk.c 7 Jul 2012 07:09:28 -0000 1.2.2.43
+++ mh_gtk.c 8 Sep 2012 20:23:10 -0000 1.2.2.44
@@ -31,6 +31,7 @@
#include "utils.h"
#include "folder.h"
+#include "folder_item_prefs.h"
#include "folderview.h"
#include "menu.h"
#include "account.h"
Index: mimeview.h
===================================================================
RCS file: /home/claws-mail/claws/src/mimeview.h,v
retrieving revision 1.20.2.38
retrieving revision 1.20.2.39
diff -u -d -r1.20.2.38 -r1.20.2.39
--- mimeview.h 29 Aug 2012 09:33:01 -0000 1.20.2.38
+++ mimeview.h 8 Sep 2012 20:23:10 -0000 1.20.2.39
@@ -20,7 +20,6 @@
#ifndef MIMEVIEW_H
#define MIMEVIEW_H
-typedef struct _MimeView MimeView;
typedef struct _MimeViewerFactory MimeViewerFactory;
typedef struct _MimeViewer MimeViewer;
Index: main.c
===================================================================
RCS file: /home/claws-mail/claws/src/main.c,v
retrieving revision 1.115.2.253
retrieving revision 1.115.2.254
diff -u -d -r1.115.2.253 -r1.115.2.254
--- main.c 27 Aug 2012 19:01:51 -0000 1.115.2.253
+++ main.c 8 Sep 2012 20:23:10 -0000 1.115.2.254
@@ -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"
Index: folder.c
===================================================================
RCS file: /home/claws-mail/claws/src/folder.c,v
retrieving revision 1.213.2.209
retrieving revision 1.213.2.210
diff -u -d -r1.213.2.209 -r1.213.2.210
--- folder.c 7 Jul 2012 07:09:27 -0000 1.213.2.209
+++ folder.c 8 Sep 2012 20:23:10 -0000 1.213.2.210
@@ -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"
Index: procmime.c
===================================================================
RCS file: /home/claws-mail/claws/src/procmime.c,v
retrieving revision 1.49.2.148
retrieving revision 1.49.2.149
diff -u -d -r1.49.2.148 -r1.49.2.149
--- procmime.c 15 Jul 2012 07:19:17 -0000 1.49.2.148
+++ procmime.c 8 Sep 2012 20:23:11 -0000 1.49.2.149
@@ -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);
Index: mainwindow.h
===================================================================
RCS file: /home/claws-mail/claws/src/mainwindow.h,v
retrieving revision 1.39.2.64
retrieving revision 1.39.2.65
diff -u -d -r1.39.2.64 -r1.39.2.65
--- mainwindow.h 27 May 2012 17:30:51 -0000 1.39.2.64
+++ mainwindow.h 8 Sep 2012 20:23:10 -0000 1.39.2.65
@@ -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"
Index: headerview.h
===================================================================
RCS file: /home/claws-mail/claws/src/headerview.h,v
retrieving revision 1.2.2.8
retrieving revision 1.2.2.9
diff -u -d -r1.2.2.8 -r1.2.2.9
--- headerview.h 27 May 2012 17:30:50 -0000 1.2.2.8
+++ headerview.h 8 Sep 2012 20:23:10 -0000 1.2.2.9
@@ -23,9 +23,8 @@
#include <glib.h>
#include <gtk/gtk.h>
-typedef struct _HeaderView HeaderView;
-
#include "procmsg.h"
+#include "viewtypes.h"
struct _HeaderView
{
Index: matcher_parser_parse.y
===================================================================
RCS file: /home/claws-mail/claws/src/matcher_parser_parse.y,v
retrieving revision 1.25.2.35
retrieving revision 1.25.2.36
diff -u -d -r1.25.2.35 -r1.25.2.36
--- matcher_parser_parse.y 29 Mar 2010 18:22:37 -0000 1.25.2.35
+++ matcher_parser_parse.y 8 Sep 2012 20:23:10 -0000 1.25.2.36
@@ -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;
Index: prefs_template.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_template.c,v
retrieving revision 1.12.2.81
retrieving revision 1.12.2.82
diff -u -d -r1.12.2.81 -r1.12.2.82
--- prefs_template.c 27 May 2012 17:30:54 -0000 1.12.2.81
+++ prefs_template.c 8 Sep 2012 20:23:11 -0000 1.12.2.82
@@ -43,6 +43,7 @@
#include "manual.h"
#include "gtkutils.h"
#include "menu.h"
+#include "account.h"
enum {
TEMPL_TEXT,
Index: folderview.h
===================================================================
RCS file: /home/claws-mail/claws/src/folderview.h,v
retrieving revision 1.20.2.29
retrieving revision 1.20.2.30
diff -u -d -r1.20.2.29 -r1.20.2.30
--- folderview.h 27 May 2012 17:30:50 -0000 1.20.2.29
+++ folderview.h 8 Sep 2012 20:23:10 -0000 1.20.2.30
@@ -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 @@
#include "gtk/gtksctree.h"
#include "mainwindow.h"
-#include "summaryview.h"
+#include "viewtypes.h"
#include "folder.h"
typedef enum
Index: mainwindow.c
===================================================================
RCS file: /home/claws-mail/claws/src/mainwindow.c,v
retrieving revision 1.274.2.349
retrieving revision 1.274.2.350
diff -u -d -r1.274.2.349 -r1.274.2.350
--- mainwindow.c 29 Aug 2012 09:33:01 -0000 1.274.2.349
+++ mainwindow.c 8 Sep 2012 20:23:10 -0000 1.274.2.350
@@ -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"
Index: procmime.h
===================================================================
RCS file: /home/claws-mail/claws/src/procmime.h,v
retrieving revision 1.17.2.29
retrieving revision 1.17.2.30
diff -u -d -r1.17.2.29 -r1.17.2.30
--- procmime.h 7 Jul 2012 07:30:56 -0000 1.17.2.29
+++ procmime.h 8 Sep 2012 20:23:11 -0000 1.17.2.30
@@ -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 @@
#include <glib.h>
#include <stdio.h>
-#include "procmsg.h"
-#include "privacy.h"
+struct _PrivacyData;
struct _MimeType
{
@@ -150,7 +144,7 @@
GHashTable *dispositionparameters;
/* Privacy */
- PrivacyData *privacy;
+ struct _PrivacyData *privacy;
gboolean broken;
};
Index: action.c
===================================================================
RCS file: /home/claws-mail/claws/src/action.c,v
retrieving revision 1.12.2.72
retrieving revision 1.12.2.73
diff -u -d -r1.12.2.72 -r1.12.2.73
--- action.c 7 Jul 2012 07:09:26 -0000 1.12.2.72
+++ action.c 8 Sep 2012 20:23:09 -0000 1.12.2.73
@@ -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"
Index: noticeview.h
===================================================================
RCS file: /home/claws-mail/claws/src/noticeview.h,v
retrieving revision 1.3.8.12
retrieving revision 1.3.8.13
diff -u -d -r1.3.8.12 -r1.3.8.13
--- noticeview.h 27 May 2012 17:30:52 -0000 1.3.8.12
+++ noticeview.h 8 Sep 2012 20:23:10 -0000 1.3.8.13
@@ -20,8 +20,7 @@
#ifndef NOTICEVIEW_H__
#define NOTICEVIEW_H__
-typedef struct _NoticeView NoticeView;
-
+#include "viewtypes.h"
#include "stock_pixmap.h"
struct _NoticeView
Index: filtering.c
===================================================================
RCS file: /home/claws-mail/claws/src/filtering.c,v
retrieving revision 1.60.2.63
retrieving revision 1.60.2.64
diff -u -d -r1.60.2.63 -r1.60.2.64
--- filtering.c 27 May 2012 17:30:50 -0000 1.60.2.63
+++ filtering.c 8 Sep 2012 20:23:10 -0000 1.60.2.64
@@ -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;
Index: prefs_account.h
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_account.h,v
retrieving revision 1.49.2.49
retrieving revision 1.49.2.50
diff -u -d -r1.49.2.49 -r1.49.2.50
--- prefs_account.h 7 Jul 2012 07:30:56 -0000 1.49.2.49
+++ prefs_account.h 8 Sep 2012 20:23:10 -0000 1.49.2.50
@@ -46,9 +46,10 @@
#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 @@
/* Unique account ID */
gint account_id;
- Folder *folder;
+ struct _Folder *folder;
GHashTable *privacy_prefs;
SMTPSession *session;
};
Index: procheader.h
===================================================================
RCS file: /home/claws-mail/claws/src/procheader.h,v
retrieving revision 1.11.2.14
retrieving revision 1.11.2.15
diff -u -d -r1.11.2.14 -r1.11.2.15
--- procheader.h 27 May 2012 17:30:55 -0000 1.11.2.14
+++ procheader.h 8 Sep 2012 20:23:11 -0000 1.11.2.15
@@ -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
{
More information about the Commits
mailing list