diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2009-08-30 13:37:36 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2009-08-30 13:40:49 +0800 |
commit | cfb9c32b6657165e4d5e11aa7b47804f679a61f8 (patch) | |
tree | 1f9c8954df7a357b5dc20a13ac82bf31c1112083 /mail/em-html-stream.h | |
parent | fefeb30f58447f2fa7bcbee16dbe68a9333ce89d (diff) | |
parent | 0f7f4cfe38b3c4cd83efbe9922ae15c5aee00317 (diff) | |
download | gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.gz gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.bz2 gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.lz gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.xz gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.zst gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.zip |
Merge commit 'origin/kill-bonobo'
Diffstat (limited to 'mail/em-html-stream.h')
-rw-r--r-- | mail/em-html-stream.h | 42 |
1 files changed, 27 insertions, 15 deletions
diff --git a/mail/em-html-stream.h b/mail/em-html-stream.h index abd12e154f..7bf79470dd 100644 --- a/mail/em-html-stream.h +++ b/mail/em-html-stream.h @@ -24,34 +24,46 @@ #ifndef EM_HTML_STREAM_H #define EM_HTML_STREAM_H -G_BEGIN_DECLS +#include <gtkhtml/gtkhtml.h> +#include <gtkhtml/gtkhtml-stream.h> +#include <mail/em-sync-stream.h> + +#define EM_HTML_STREAM_TYPE \ + (em_html_stream_get_type ()) +#define EM_HTML_STREAM(obj) \ + (CAMEL_CHECK_CAST \ + ((obj), EM_HTML_STREAM_TYPE, EMHTMLStream)) +#define EM_HTML_STREAM_CLASS(cls) \ + (CAMEL_CHECK_CLASS_CAST \ + ((cls), EM_HTML_STREAM_TYPE, EMHTMLStreamClass)) +#define EM_IS_HTML_STREAM(obj) \ + (CAMEL_CHECK_TYPE \ + ((obj), EM_HTML_STREAM_TYPE)) -#define EM_HTML_STREAM_TYPE (em_html_stream_get_type ()) -#define EM_HTML_STREAM(obj) (CAMEL_CHECK_CAST((obj), EM_HTML_STREAM_TYPE, EMHTMLStream)) -#define EM_HTML_STREAM_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), EM_HTML_STREAM_TYPE, EMHTMLStreamClass)) -#define EM_IS_HTML_STREAM(o) (CAMEL_CHECK_TYPE((o), EM_HTML_STREAM_TYPE)) +G_BEGIN_DECLS -#include "mail/em-sync-stream.h" +typedef struct _EMHTMLStream EMHTMLStream; +typedef struct _EMHTMLStreamClass EMHTMLStreamClass; -typedef struct _EMHTMLStream { +struct _EMHTMLStream { EMSyncStream sync; guint destroy_id; GtkHTML *html; GtkHTMLStream *html_stream; GtkHTMLBeginFlags flags; -} EMHTMLStream; +}; -typedef struct { +struct _EMHTMLStreamClass { EMSyncStreamClass parent_class; -} EMHTMLStreamClass; - -CamelType em_html_stream_get_type (void); +}; -/* the html_stream is closed when we are finalised (with an error), or closed (ok) */ -CamelStream *em_html_stream_new(GtkHTML *html, GtkHTMLStream *html_stream); -void em_html_stream_set_flags (EMHTMLStream *emhs, GtkHTMLBeginFlags flags); +CamelType em_html_stream_get_type (void); +CamelStream * em_html_stream_new (GtkHTML *html, + GtkHTMLStream *html_stream); +void em_html_stream_set_flags (EMHTMLStream *emhs, + GtkHTMLBeginFlags flags); G_END_DECLS |