diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2013-06-04 21:33:42 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2013-06-05 01:15:53 +0800 |
| commit | 37f600d4bbd849e7f4bd617ad7378880cf47a0a6 (patch) | |
| tree | 27e469a8d47df179b680f75a16cf2ccbab9fbbb1 /em-format/e-mail-formatter.h | |
| parent | f069f135de42f7bd3d8bd80d1c0ef55bc732c182 (diff) | |
| download | gsoc2013-evolution-37f600d4bbd849e7f4bd617ad7378880cf47a0a6.tar gsoc2013-evolution-37f600d4bbd849e7f4bd617ad7378880cf47a0a6.tar.gz gsoc2013-evolution-37f600d4bbd849e7f4bd617ad7378880cf47a0a6.tar.bz2 gsoc2013-evolution-37f600d4bbd849e7f4bd617ad7378880cf47a0a6.tar.lz gsoc2013-evolution-37f600d4bbd849e7f4bd617ad7378880cf47a0a6.tar.xz gsoc2013-evolution-37f600d4bbd849e7f4bd617ad7378880cf47a0a6.tar.zst gsoc2013-evolution-37f600d4bbd849e7f4bd617ad7378880cf47a0a6.zip | |
Define GEnumClass types for mail formatter/parser enums.
(cherry picked from commit 552952d2cce32d2748339f380fbf34fea40c029b)
Conflicts:
em-format/Makefile.am
em-format/e-mail-formatter.c
em-format/e-mail-formatter.h
em-format/e-mail-part.h
Diffstat (limited to 'em-format/e-mail-formatter.h')
| -rw-r--r-- | em-format/e-mail-formatter.h | 37 |
1 files changed, 3 insertions, 34 deletions
diff --git a/em-format/e-mail-formatter.h b/em-format/e-mail-formatter.h index 2d58b9ed14..2a73112bfc 100644 --- a/em-format/e-mail-formatter.h +++ b/em-format/e-mail-formatter.h @@ -23,6 +23,7 @@ #include <libemail-engine/e-mail-enums.h> #include <em-format/e-mail-extension-registry.h> +#include <em-format/e-mail-formatter-enums.h> #include <em-format/e-mail-part-list.h> /* Standard GObject macros */ @@ -46,38 +47,6 @@ G_BEGIN_DECLS; -typedef enum { - E_MAIL_FORMATTER_MODE_INVALID = -1, - E_MAIL_FORMATTER_MODE_NORMAL = 0, - E_MAIL_FORMATTER_MODE_SOURCE, - E_MAIL_FORMATTER_MODE_RAW, - E_MAIL_FORMATTER_MODE_CID, - E_MAIL_FORMATTER_MODE_PRINTING, - E_MAIL_FORMATTER_MODE_ALL_HEADERS -} EMailFormatterMode; - -typedef enum { - E_MAIL_FORMATTER_HEADER_FLAG_COLLAPSABLE = 1 << 0, - E_MAIL_FORMATTER_HEADER_FLAG_COLLAPSED = 1 << 1, - E_MAIL_FORMATTER_HEADER_FLAG_HTML = 1 << 2, - E_MAIL_FORMATTER_HEADER_FLAG_NOCOLUMNS = 1 << 3, - E_MAIL_FORMATTER_HEADER_FLAG_BOLD = 1 << 4, - E_MAIL_FORMATTER_HEADER_FLAG_NODEC = 1 << 5, - E_MAIL_FORMATTER_HEADER_FLAG_HIDDEN = 1 << 6, - E_MAIL_FORMATTER_HEADER_FLAG_NOLINKS = 1 << 7, - E_MAIL_FORMATTER_HEADER_FLAG_NOELIPSIZE = 1 << 8 -} EMailFormatterHeaderFlags; - -typedef enum { - E_MAIL_FORMATTER_COLOR_BODY, /* header area background */ - E_MAIL_FORMATTER_COLOR_CITATION, /* citation font color */ - E_MAIL_FORMATTER_COLOR_CONTENT, /* message area background */ - E_MAIL_FORMATTER_COLOR_FRAME, /* frame around message area */ - E_MAIL_FORMATTER_COLOR_HEADER, /* header font color */ - E_MAIL_FORMATTER_COLOR_TEXT, /* message font color */ - E_MAIL_FORMATTER_NUM_COLOR_TYPES -} EMailFormatterColorType; - typedef struct _EMailFormatter EMailFormatter; typedef struct _EMailFormatterClass EMailFormatterClass; typedef struct _EMailFormatterPrivate EMailFormatterPrivate; @@ -177,9 +146,9 @@ CamelMimeFilterToHTMLFlags const GdkColor * e_mail_formatter_get_color (EMailFormatter *formatter, - EMailFormatterColorType type); + EMailFormatterColor type); void e_mail_formatter_set_color (EMailFormatter *efh, - EMailFormatterColorType type, + EMailFormatterColor type, const GdkColor *color); void e_mail_formatter_set_style (EMailFormatter *formatter, GtkStyle *style, |