aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNot Zed <NotZed@Ximian.com>2005-05-16 15:53:53 +0800
committerMichael Zucci <zucchi@src.gnome.org>2005-05-16 15:53:53 +0800
commit318fc604c17d6cf30a8db5708f8e692baa985fd3 (patch)
tree010e646efa5233b811fac733c9d26a6911e309a6
parent3e68ed9f53f719abf71274988486498ed6534d68 (diff)
downloadgsoc2013-evolution-318fc604c17d6cf30a8db5708f8e692baa985fd3.tar
gsoc2013-evolution-318fc604c17d6cf30a8db5708f8e692baa985fd3.tar.gz
gsoc2013-evolution-318fc604c17d6cf30a8db5708f8e692baa985fd3.tar.bz2
gsoc2013-evolution-318fc604c17d6cf30a8db5708f8e692baa985fd3.tar.lz
gsoc2013-evolution-318fc604c17d6cf30a8db5708f8e692baa985fd3.tar.xz
gsoc2013-evolution-318fc604c17d6cf30a8db5708f8e692baa985fd3.tar.zst
gsoc2013-evolution-318fc604c17d6cf30a8db5708f8e692baa985fd3.zip
forward-reference structures
2005-05-16 Not Zed <NotZed@Ximian.com> * mail-vfolder.h: * mail-autofilter.h: forward-reference structures * *.h: Make installed headers includable from mail/ * Makefile.am (mailinclude_HEADERS): install various mail headers as first cut at public plugin api. svn path=/trunk/; revision=29371
-rw-r--r--mail/ChangeLog8
-rw-r--r--mail/Makefile.am71
-rw-r--r--mail/em-folder-browser.h3
-rw-r--r--mail/em-folder-tree.h2
-rw-r--r--mail/em-folder-view.c2
-rw-r--r--mail/em-folder-view.h2
-rw-r--r--mail/em-format-hook.h2
-rw-r--r--mail/em-format-html-display.h2
-rw-r--r--mail/em-format-html-print.h2
-rw-r--r--mail/em-format-html.h2
-rw-r--r--mail/em-format-quote.h2
-rw-r--r--mail/em-html-stream.h2
-rw-r--r--mail/em-icon-stream.h2
-rw-r--r--mail/em-utils.h2
-rw-r--r--mail/mail-autofilter.c3
-rw-r--r--mail/mail-autofilter.h22
-rw-r--r--mail/mail-tools.c1
-rw-r--r--mail/mail-vfolder.c1
-rw-r--r--mail/mail-vfolder.h28
-rw-r--r--mail/message-list.h3
20 files changed, 93 insertions, 69 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 257eff73f0..df7309454f 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,13 @@
2005-05-16 Not Zed <NotZed@Ximian.com>
+ * mail-vfolder.h:
+ * mail-autofilter.h: forward-reference structures
+
+ * *.h: Make installed headers includable from mail/
+
+ * Makefile.am (mailinclude_HEADERS): install various mail headers
+ as first cut at public plugin api.
+
* move e-error into e-util/
2005-05-16 Srinivasa Ragavan <sragavan@novell.com>
diff --git a/mail/Makefile.am b/mail/Makefile.am
index b32973ad58..16659aad82 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -1,5 +1,7 @@
SUBDIRS = default importers
+mailincludedir = $(privincludedir)/mail
+
INCLUDES = \
-I$(top_srcdir)/widgets \
-I$(top_srcdir)/widgets/e-text \
@@ -49,12 +51,48 @@ $(SPELL_IDL_GENERATED_C): $(SPELL_IDL_GENERATED_H)
Spell-impl.o: Spell.h
+# plugin mail api
+mailinclude_HEADERS = \
+ em-composer-utils.h \
+ em-config.h \
+ em-event.h \
+ em-folder-browser.h \
+ em-folder-tree-model.h \
+ em-folder-tree.h \
+ em-folder-utils.h \
+ em-folder-view.h \
+ em-format-hook.h \
+ em-format-html-display.h \
+ em-format-html-print.h \
+ em-format-html.h \
+ em-format-quote.h \
+ em-format.h \
+ em-html-stream.h \
+ em-icon-stream.h \
+ em-inline-filter.h \
+ em-menu.h \
+ em-message-browser.h \
+ em-popup.h \
+ em-stripsig-filter.h \
+ em-sync-stream.h \
+ em-utils.h \
+ em-vfs-stream.h \
+ mail-autofilter.h \
+ mail-component.h \
+ mail-config.h \
+ mail-mt.h \
+ mail-ops.h \
+ mail-session.h \
+ mail-tools.h \
+ message-list.h \
+ mail-vfolder.h
# libevolution-mail
libevolution_mail_la_SOURCES = \
$(SPELL_IDL_GENERATED) \
$(MARSHAL_GENERATED) \
+ $(mailinclude_HEADERS) \
e-searching-tokenizer.c \
e-searching-tokenizer.h \
em-account-editor.c \
@@ -64,11 +102,8 @@ libevolution_mail_la_SOURCES = \
em-composer-prefs.c \
em-composer-prefs.h \
em-composer-utils.c \
- em-composer-utils.h \
em-config.c \
- em-config.h \
em-event.c \
- em-event.h \
em-filter-context.c \
em-filter-context.h \
em-filter-editor.c \
@@ -80,7 +115,6 @@ libevolution_mail_la_SOURCES = \
em-filter-source-element.c \
em-filter-source-element.h \
em-folder-browser.c \
- em-folder-browser.h \
em-folder-properties.c \
em-folder-properties.h \
em-folder-selection-button.c \
@@ -90,31 +124,18 @@ libevolution_mail_la_SOURCES = \
em-folder-selector.c \
em-folder-selector.h \
em-folder-tree-model.c \
- em-folder-tree-model.h \
em-folder-tree.c \
- em-folder-tree.h \
em-folder-utils.c \
- em-folder-utils.h \
em-folder-view.c \
- em-folder-view.h \
em-format-hook.c \
- em-format-hook.h \
em-format-html-display.c \
- em-format-html-display.h \
em-format-html-print.c \
- em-format-html-print.h \
em-format-html.c \
- em-format-html.h \
em-format-quote.c \
- em-format-quote.h \
em-format.c \
- em-format.h \
em-html-stream.c \
- em-html-stream.h \
em-icon-stream.c \
- em-icon-stream.h \
em-inline-filter.c \
- em-inline-filter.h \
em-junk-filter.c \
em-junk-filter.h \
em-junk-plugin.c \
@@ -122,23 +143,17 @@ libevolution_mail_la_SOURCES = \
em-mailer-prefs.c \
em-mailer-prefs.h \
em-menu.c \
- em-menu.h \
em-message-browser.c \
- em-message-browser.h \
em-migrate.c \
em-migrate.h \
em-popup.c \
- em-popup.h \
em-search-context.c \
em-search-context.h \
em-stripsig-filter.c \
- em-stripsig-filter.h \
em-subscribe-editor.c \
em-subscribe-editor.h \
em-sync-stream.c \
- em-sync-stream.h \
em-utils.c \
- em-utils.h \
em-vfolder-context.c \
em-vfolder-context.h \
em-vfolder-editor.c \
@@ -146,39 +161,29 @@ libevolution_mail_la_SOURCES = \
em-vfolder-rule.c \
em-vfolder-rule.h \
em-vfs-stream.c \
- em-vfs-stream.h \
mail-autofilter.c \
- mail-autofilter.h \
mail-component-factory.c \
mail-component.c \
- mail-component.h \
mail-config-factory.c \
mail-config-factory.h \
mail-config.c \
- mail-config.h \
mail-crypto.c \
mail-crypto.h \
mail-folder-cache.c \
mail-folder-cache.h \
mail-mt.c \
- mail-mt.h \
mail-offline-handler.c \
mail-offline-handler.h \
mail-ops.c \
- mail-ops.h \
mail-send-recv.c \
mail-send-recv.h \
mail-session.c \
- mail-session.h \
mail-signature-editor.c \
mail-signature-editor.h \
mail-tools.c \
- mail-tools.h \
mail-types.h \
mail-vfolder.c \
- mail-vfolder.h \
message-list.c \
- message-list.h \
message-tag-editor.c \
message-tag-editor.h \
message-tag-followup.c \
diff --git a/mail/em-folder-browser.h b/mail/em-folder-browser.h
index 248deaf9b4..b414a19489 100644
--- a/mail/em-folder-browser.h
+++ b/mail/em-folder-browser.h
@@ -20,11 +20,10 @@
*
*/
-
#ifndef _EM_FOLDER_BROWSER_H
#define _EM_FOLDER_BROWSER_H
-#include "em-folder-view.h"
+#include "mail/em-folder-view.h"
#ifdef __cplusplus
extern "C" {
diff --git a/mail/em-folder-tree.h b/mail/em-folder-tree.h
index 35381dbfa3..dd3cc94b10 100644
--- a/mail/em-folder-tree.h
+++ b/mail/em-folder-tree.h
@@ -27,7 +27,7 @@
#include <gtk/gtkvbox.h>
#include <camel/camel-store.h>
-#include "em-folder-tree-model.h"
+#include "mail/em-folder-tree-model.h"
#ifdef __cplusplus
extern "C" {
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index 4ee979fb0e..ed4afe7672 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -71,6 +71,8 @@
#include <e-util/e-print.h>
#include <e-util/e-profile-event.h>
+#include "filter/filter-rule.h"
+
#include "em-format-html-display.h"
#include "em-format-html-print.h"
#include "em-folder-selection.h"
diff --git a/mail/em-folder-view.h b/mail/em-folder-view.h
index 7eb5ae7b31..bb0471f444 100644
--- a/mail/em-folder-view.h
+++ b/mail/em-folder-view.h
@@ -25,7 +25,7 @@
#define _EM_FOLDER_VIEW_H
#include <gtk/gtkvbox.h>
-#include "em-popup.h"
+#include "mail/em-popup.h"
#ifdef __cplusplus
extern "C" {
diff --git a/mail/em-format-hook.h b/mail/em-format-hook.h
index c2f2348a28..504aff3804 100644
--- a/mail/em-format-hook.h
+++ b/mail/em-format-hook.h
@@ -27,7 +27,7 @@
#include "libedataserver/e-msgport.h"
#include "e-util/e-plugin.h"
-#include "em-format.h"
+#include "mail/em-format.h"
#ifdef __cplusplus
extern "C" {
diff --git a/mail/em-format-html-display.h b/mail/em-format-html-display.h
index 31a928ad5b..6457f8d637 100644
--- a/mail/em-format-html-display.h
+++ b/mail/em-format-html-display.h
@@ -6,7 +6,7 @@
#ifndef _EM_FORMAT_HTML_DISPLAY_H
#define _EM_FORMAT_HTML_DISPLAY_H
-#include "em-format-html.h"
+#include "mail/em-format-html.h"
typedef struct _EMFormatHTMLDisplay EMFormatHTMLDisplay;
typedef struct _EMFormatHTMLDisplayClass EMFormatHTMLDisplayClass;
diff --git a/mail/em-format-html-print.h b/mail/em-format-html-print.h
index 0153d405e6..788a420dbe 100644
--- a/mail/em-format-html-print.h
+++ b/mail/em-format-html-print.h
@@ -6,7 +6,7 @@
#ifndef _EM_FORMAT_HTML_PRINT_H
#define _EM_FORMAT_HTML_PRINT_H
-#include "em-format-html.h"
+#include "mail/em-format-html.h"
struct _GnomePrintConfig;
diff --git a/mail/em-format-html.h b/mail/em-format-html.h
index ae6747dfdc..a524912cfb 100644
--- a/mail/em-format-html.h
+++ b/mail/em-format-html.h
@@ -27,7 +27,7 @@
#ifndef _EM_FORMAT_HTML_H
#define _EM_FORMAT_HTML_H
-#include "em-format.h"
+#include "mail/em-format.h"
typedef struct _EMFormatHTML EMFormatHTML;
typedef struct _EMFormatHTMLClass EMFormatHTMLClass;
diff --git a/mail/em-format-quote.h b/mail/em-format-quote.h
index 4c25179389..bb10cd32cc 100644
--- a/mail/em-format-quote.h
+++ b/mail/em-format-quote.h
@@ -24,7 +24,7 @@
#ifndef _EM_FORMAT_QUOTE_H
#define _EM_FORMAT_QUOTE_H
-#include "em-format.h"
+#include "mail/em-format.h"
typedef struct _EMFormatQuote EMFormatQuote;
typedef struct _EMFormatQuoteClass EMFormatQuoteClass;
diff --git a/mail/em-html-stream.h b/mail/em-html-stream.h
index e30c64918b..9b39f4ab8b 100644
--- a/mail/em-html-stream.h
+++ b/mail/em-html-stream.h
@@ -36,7 +36,7 @@ extern "C" {
struct _GtkHTML;
struct _GtkHTMLStream;
-#include "em-sync-stream.h"
+#include "mail/em-sync-stream.h"
typedef struct _EMHTMLStream {
EMSyncStream sync;
diff --git a/mail/em-icon-stream.h b/mail/em-icon-stream.h
index 3b13c7c49f..124259b3df 100644
--- a/mail/em-icon-stream.h
+++ b/mail/em-icon-stream.h
@@ -36,7 +36,7 @@ extern "C" {
struct _GtkHTML;
struct _GtkIconStream;
-#include "em-sync-stream.h"
+#include "mail/em-sync-stream.h"
typedef struct _EMIconStream {
EMSyncStream sync;
diff --git a/mail/em-utils.h b/mail/em-utils.h
index f04b97c98c..4aa0d67389 100644
--- a/mail/em-utils.h
+++ b/mail/em-utils.h
@@ -30,6 +30,8 @@ extern "C" {
#pragma }
#endif /* __cplusplus */
+#include <sys/types.h>
+
struct _GtkWidget;
struct _GtkWindow;
struct _CamelFolder;
diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c
index ec24257183..ffba4ba084 100644
--- a/mail/mail-autofilter.c
+++ b/mail/mail-autofilter.c
@@ -52,6 +52,9 @@
#include "em-filter-editor.h"
#include "filter/filter-option.h"
+#include <camel/camel-internet-address.h>
+#include <camel/camel-mime-message.h>
+
#define d(x)
static void
diff --git a/mail/mail-autofilter.h b/mail/mail-autofilter.h
index 7bd7882dcc..376d258493 100644
--- a/mail/mail-autofilter.h
+++ b/mail/mail-autofilter.h
@@ -25,10 +25,12 @@
#ifndef _MAIL_AUTOFILTER_H
#define _MAIL_AUTOFILTER_H
-#include <filter/filter-rule.h>
-#include "em-filter-context.h"
-#include "em-vfolder-context.h"
-#include <camel/camel-mime-message.h>
+struct _FilterRule;
+struct _EMVFolderContext;
+struct _EMFilterContext;
+struct _CamelMimeMessage;
+struct _CamelInternetAddress;
+struct _CamelStore;
enum {
AUTO_SUBJECT = 1,
@@ -37,15 +39,15 @@ enum {
AUTO_MLIST = 8,
};
-FilterRule *em_vfolder_rule_from_message(EMVFolderContext *context, CamelMimeMessage *msg, int flags, const char *source);
-FilterRule *filter_rule_from_message(EMFilterContext *context, CamelMimeMessage *msg, int flags);
-FilterRule *em_vfolder_rule_from_address(EMVFolderContext *context, CamelInternetAddress *addr, int flags, const char *source);
+struct _FilterRule *em_vfolder_rule_from_message(struct _EMVFolderContext *context, struct _CamelMimeMessage *msg, int flags, const char *source);
+struct _FilterRule *filter_rule_from_message(struct _EMFilterContext *context, struct _CamelMimeMessage *msg, int flags);
+struct _FilterRule *em_vfolder_rule_from_address(struct _EMVFolderContext *context, struct _CamelInternetAddress *addr, int flags, const char *source);
/* easiest place to put this */
-void filter_gui_add_from_message(CamelMimeMessage *msg, const char *source, int flags);
+void filter_gui_add_from_message(struct _CamelMimeMessage *msg, const char *source, int flags);
/* Also easiest place for these, we should really share a global rule context for this stuff ... */
-void mail_filter_rename_uri(CamelStore *store, const char *olduri, const char *newuri);
-void mail_filter_delete_uri(CamelStore *store, const char *uri);
+void mail_filter_rename_uri(struct _CamelStore *store, const char *olduri, const char *newuri);
+void mail_filter_delete_uri(struct _CamelStore *store, const char *uri);
#endif
diff --git a/mail/mail-tools.c b/mail/mail-tools.c
index 858c7f018f..1b0aad9841 100644
--- a/mail/mail-tools.c
+++ b/mail/mail-tools.c
@@ -41,6 +41,7 @@
#include <camel/camel-vee-folder.h>
#include <camel/camel-file-utils.h>
#include <camel/camel-movemail.h>
+#include <camel/camel-mime-message.h>
#include "em-vfolder-rule.h"
#include "em-vfolder-context.h"
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index b50626a59e..4b6b39aaea 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -47,6 +47,7 @@
#include "em-vfolder-context.h"
#include "em-vfolder-editor.h"
+#include "em-vfolder-rule.h"
#define d(x) /*(printf("%s(%d):%s: ", __FILE__, __LINE__, __PRETTY_FUNCTION__), (x))*/
diff --git a/mail/mail-vfolder.h b/mail/mail-vfolder.h
index ca4fc4ad3d..9c54e6f5ad 100644
--- a/mail/mail-vfolder.h
+++ b/mail/mail-vfolder.h
@@ -2,32 +2,32 @@
#ifndef _MAIL_VFOLDER_H
#define _MAIL_VFOLDER_H
-#include "Evolution.h"
-
-#include "camel/camel-folder.h"
-#include "camel/camel-mime-message.h"
-#include "em-vfolder-rule.h"
-#include "filter/filter-part.h"
+struct _CamelStore;
+struct _FilterPart;
+struct _FilterRule;
+struct _CamelMimeMessage;
+struct _EMVFolderRule;
+struct _CamelInternetAddress;
void vfolder_load_storage(void);
void vfolder_revert(void);
void vfolder_edit (void);
void vfolder_edit_rule(const char *name);
-FilterPart *vfolder_create_part (const char *name);
-FilterRule *vfolder_clone_rule (FilterRule *in);
-void vfolder_gui_add_rule (EMVFolderRule *rule);
-void vfolder_gui_add_from_message (CamelMimeMessage *msg, int flags, const char *source);
-void vfolder_gui_add_from_address (CamelInternetAddress *addr, int flags, const char *source);
+struct _FilterPart *vfolder_create_part (const char *name);
+struct _FilterRule *vfolder_clone_rule (struct _FilterRule *in);
+void vfolder_gui_add_rule (struct _EMVFolderRule *rule);
+void vfolder_gui_add_from_message (struct _CamelMimeMessage *msg, int flags, const char *source);
+void vfolder_gui_add_from_address (struct _CamelInternetAddress *addr, int flags, const char *source);
/* add a uri that is now (un)available to vfolders in a transient manner */
-void mail_vfolder_add_uri(CamelStore *store, const char *uri, int remove);
+void mail_vfolder_add_uri(struct _CamelStore *store, const char *uri, int remove);
/* note that a folder has changed name (uri) */
-void mail_vfolder_rename_uri(CamelStore *store, const char *from, const char *to);
+void mail_vfolder_rename_uri(struct _CamelStore *store, const char *from, const char *to);
/* remove a uri that should be removed from vfolders permanently */
-void mail_vfolder_delete_uri(CamelStore *store, const char *uri);
+void mail_vfolder_delete_uri(struct _CamelStore *store, const char *uri);
/* close up, clean up */
void mail_vfolder_shutdown (void);
diff --git a/mail/message-list.h b/mail/message-list.h
index b1e8b026f4..bbb4db3f69 100644
--- a/mail/message-list.h
+++ b/mail/message-list.h
@@ -29,7 +29,6 @@
#include <gal/e-table/e-table-simple.h>
#include <gal/e-table/e-tree-scrolled.h>
-#include "mail-types.h"
#ifdef __cplusplus
extern "C" {
@@ -79,6 +78,8 @@ enum {
/* dont change */
#define ML_HIDE_SAME (2147483646)
+typedef struct _MessageList MessageList;
+
struct _MessageList {
ETreeScrolled parent;