aboutsummaryrefslogtreecommitdiffstats
path: root/mail/em-filter-rule.h
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-10-07 11:38:52 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-10-13 01:58:59 +0800
commita06e4484b8df804124b5bcf88d94dec5acfba270 (patch)
tree4fa42793d7dc461f2b3767296d76592182c48222 /mail/em-filter-rule.h
parent5e0758bb6934a7859b1d8a247c8fb21c156772cf (diff)
downloadgsoc2013-evolution-a06e4484b8df804124b5bcf88d94dec5acfba270.tar
gsoc2013-evolution-a06e4484b8df804124b5bcf88d94dec5acfba270.tar.gz
gsoc2013-evolution-a06e4484b8df804124b5bcf88d94dec5acfba270.tar.bz2
gsoc2013-evolution-a06e4484b8df804124b5bcf88d94dec5acfba270.tar.lz
gsoc2013-evolution-a06e4484b8df804124b5bcf88d94dec5acfba270.tar.xz
gsoc2013-evolution-a06e4484b8df804124b5bcf88d94dec5acfba270.tar.zst
gsoc2013-evolution-a06e4484b8df804124b5bcf88d94dec5acfba270.zip
Give MailSession a permanent home.
Global variables in shared libraries are a bad idea. EMailBackend now owns the MailSession instance, which is actually now EMailSession. Move the blocking utility functions in mail-tools.c to e-mail-session.c and add asynchronous variants. Same approach as Camel. Replace EMailReader.get_shell_backend() with EMailReader.get_backend(), which returns an EMailBackend. Easier access to the EMailSession.
Diffstat (limited to 'mail/em-filter-rule.h')
-rw-r--r--mail/em-filter-rule.h20
1 files changed, 11 insertions, 9 deletions
diff --git a/mail/em-filter-rule.h b/mail/em-filter-rule.h
index 6e75dc785d..3b5fbd7008 100644
--- a/mail/em-filter-rule.h
+++ b/mail/em-filter-rule.h
@@ -22,16 +22,18 @@
*
*/
-#ifndef _EM_FILTER_RULE_H
-#define _EM_FILTER_RULE_H
+#ifndef EM_FILTER_RULE_H
+#define EM_FILTER_RULE_H
#include "filter/e-filter-rule.h"
-#define EM_FILTER_RULE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), em_filter_rule_get_type(), EMFilterRule))
-#define EM_FILTER_RULE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), em_filter_rule_get_type(), EMFilterRuleClass))
-#define EM_IS_FILTER_RULE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), em_filter_rule_get_type()))
-#define EM_IS_FILTER_RULE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), em_filter_rule_get_type()))
-#define EM_FILTER_RULE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), em_filter_rule_get_type(), EMFilterRuleClass))
+#define EM_TYPE_FILTER_RULE \
+ (em_filter_rule_get_type ())
+#define EM_FILTER_RULE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EM_TYPE_FILTER_RULE, EMFilterRule))
+#define EM_FILTER_RULE_CLASS(cls) (G_TYPE_CHECK_CLASS_CAST ((cls), EM_TYPE_FILTER_RULE, EMFilterRuleClass))
+#define EM_IS_FILTER_RULE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EM_TYPE_FILTER_RULE))
+#define EM_IS_FILTER_RULE_CLASS(cls) (G_TYPE_CHECK_CLASS_TYPE ((cls), EM_TYPE_FILTER_RULE))
+#define EM_FILTER_RULE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EM_TYPE_FILTER_RULE, EMFilterRuleClass))
typedef struct _EMFilterRule EMFilterRule;
typedef struct _EMFilterRuleClass EMFilterRuleClass;
@@ -47,7 +49,7 @@ struct _EMFilterRuleClass {
};
GType em_filter_rule_get_type (void);
-EMFilterRule *em_filter_rule_new (void);
+EFilterRule * em_filter_rule_new (void);
/* methods */
void em_filter_rule_add_action (EMFilterRule *fr, EFilterPart *fp);
@@ -56,4 +58,4 @@ void em_filter_rule_replace_action (EMFilterRule *fr, EFilterPart *fp
void em_filter_rule_build_action (EMFilterRule *fr, GString *out);
-#endif /* _EM_FILTER_RULE_H */
+#endif /* EM_FILTER_RULE_H */