From 67159043da2de9df576f6a4eaa245e0c3926f004 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 18 Jun 2009 12:56:51 -0400 Subject: Use G_BEGIN_DECLS / G_END_DECLS macros. --- mail/em-composer-utils.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'mail/em-composer-utils.h') diff --git a/mail/em-composer-utils.h b/mail/em-composer-utils.h index ab4a86368e..3ba3c5e23f 100644 --- a/mail/em-composer-utils.h +++ b/mail/em-composer-utils.h @@ -26,10 +26,7 @@ #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS struct _CamelFolder; struct _CamelMimeMessage; @@ -85,8 +82,6 @@ void em_utils_get_reply_all (struct _CamelMimeMessage *message, struct _CamelInt struct _EMsgComposer * em_utils_reply_to_message (struct _CamelFolder *, const gchar *uid, struct _CamelMimeMessage *message, gint mode, struct _EMFormat *source); struct _EDestination ** em_utils_camel_address_to_destination (struct _CamelInternetAddress *iaddr); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __EM_COMPOSER_UTILS_H__ */ -- cgit v1.2.3 From 547e123d2777bd3beba36e74e018efb590ed44d4 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 18 Jun 2009 15:26:21 -0400 Subject: Stop abusing forward declarations. --- mail/em-composer-utils.h | 60 ++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 33 deletions(-) (limited to 'mail/em-composer-utils.h') diff --git a/mail/em-composer-utils.h b/mail/em-composer-utils.h index 3ba3c5e23f..4c916529ec 100644 --- a/mail/em-composer-utils.h +++ b/mail/em-composer-utils.h @@ -25,50 +25,44 @@ #define __EM_COMPOSER_UTILS_H__ #include +#include -G_BEGIN_DECLS +#include +#include -struct _CamelFolder; -struct _CamelMimeMessage; -struct _CamelException; -struct _CamelInternetAddress; -struct _CamelNNTPAddress; -struct _EMsgComposer; -struct _EMFormat; -struct _EAccount; -struct _EDestination; +G_BEGIN_DECLS -void em_composer_utils_setup_callbacks (struct _EMsgComposer *composer, struct _CamelFolder *folder, const gchar *uid, - guint32 flags, guint32 set, struct _CamelFolder *drafts, const gchar *drafts_uid); +void em_composer_utils_setup_callbacks (EMsgComposer *composer, CamelFolder *folder, const gchar *uid, + guint32 flags, guint32 set, CamelFolder *drafts, const gchar *drafts_uid); #define em_composer_utils_setup_default_callbacks(composer) em_composer_utils_setup_callbacks (composer, NULL, NULL, 0, 0, NULL, NULL) -void em_utils_composer_send_cb(struct _EMsgComposer *composer, gpointer user_data); -void em_utils_composer_save_draft_cb(struct _EMsgComposer *composer, gpointer user_data); +void em_utils_composer_send_cb(EMsgComposer *composer, gpointer user_data); +void em_utils_composer_save_draft_cb(EMsgComposer *composer, gpointer user_data); void em_utils_compose_new_message (const gchar *fromuri); -struct _EMsgComposer * em_utils_compose_lite_new_message (const gchar *fromuri); +EMsgComposer * em_utils_compose_lite_new_message (const gchar *fromuri); /* FIXME: mailto? url? should make up its mind what its called. imho use 'uri' */ -struct _EMsgComposer * em_utils_compose_new_message_with_mailto (const gchar *url, const gchar *fromuri); +EMsgComposer * em_utils_compose_new_message_with_mailto (const gchar *url, const gchar *fromuri); -void em_utils_edit_message (struct _CamelMimeMessage *message, struct _CamelFolder *folder); -void em_utils_edit_messages (struct _CamelFolder *folder, GPtrArray *uids, gboolean replace); +void em_utils_edit_message (CamelMimeMessage *message, CamelFolder *folder); +void em_utils_edit_messages (CamelFolder *folder, GPtrArray *uids, gboolean replace); -void em_utils_forward_attached (struct _CamelFolder *folder, GPtrArray *uids, const gchar *fromuri); -void em_utils_forward_inline (struct _CamelFolder *folder, GPtrArray *uids, const gchar *fromuri); -void em_utils_forward_quoted (struct _CamelFolder *folder, GPtrArray *uids, const gchar *fromuri); +void em_utils_forward_attached (CamelFolder *folder, GPtrArray *uids, const gchar *fromuri); +void em_utils_forward_inline (CamelFolder *folder, GPtrArray *uids, const gchar *fromuri); +void em_utils_forward_quoted (CamelFolder *folder, GPtrArray *uids, const gchar *fromuri); -void em_utils_forward_message (struct _CamelMimeMessage *msg, const gchar *fromuri); -void em_utils_forward_messages (struct _CamelFolder *folder, GPtrArray *uids, const gchar *fromuri); +void em_utils_forward_message (CamelMimeMessage *msg, const gchar *fromuri); +void em_utils_forward_messages (CamelFolder *folder, GPtrArray *uids, const gchar *fromuri); -void em_utils_redirect_message (struct _CamelMimeMessage *message); -void em_utils_redirect_message_by_uid (struct _CamelFolder *folder, const gchar *uid); +void em_utils_redirect_message (CamelMimeMessage *message); +void em_utils_redirect_message_by_uid (CamelFolder *folder, const gchar *uid); -void em_utils_forward_message_raw (struct _CamelFolder *folder, struct _CamelMimeMessage *message, const gchar *address, struct _CamelException *ex); +void em_utils_forward_message_raw (CamelFolder *folder, CamelMimeMessage *message, const gchar *address, CamelException *ex); -void em_utils_handle_receipt (struct _CamelFolder *folder, const gchar *uid, struct _CamelMimeMessage *msg); -void em_utils_send_receipt (struct _CamelFolder *folder, struct _CamelMimeMessage *message); +void em_utils_handle_receipt (CamelFolder *folder, const gchar *uid, CamelMimeMessage *msg); +void em_utils_send_receipt (CamelFolder *folder, CamelMimeMessage *message); enum { REPLY_MODE_SENDER, @@ -76,11 +70,11 @@ enum { REPLY_MODE_LIST }; -gchar *em_utils_construct_composer_text (struct _CamelMimeMessage *message, struct _EMFormat *source); -void em_utils_get_reply_sender (struct _CamelMimeMessage *message, struct _CamelInternetAddress *to, struct _CamelNNTPAddress *postto); -void em_utils_get_reply_all (struct _CamelMimeMessage *message, struct _CamelInternetAddress *to, struct _CamelInternetAddress *cc, struct _CamelNNTPAddress *postto); -struct _EMsgComposer * em_utils_reply_to_message (struct _CamelFolder *, const gchar *uid, struct _CamelMimeMessage *message, gint mode, struct _EMFormat *source); -struct _EDestination ** em_utils_camel_address_to_destination (struct _CamelInternetAddress *iaddr); +gchar *em_utils_construct_composer_text (CamelMimeMessage *message, EMFormat *source); +void em_utils_get_reply_sender (CamelMimeMessage *message, CamelInternetAddress *to, CamelNNTPAddress *postto); +void em_utils_get_reply_all (CamelMimeMessage *message, CamelInternetAddress *to, CamelInternetAddress *cc, CamelNNTPAddress *postto); +EMsgComposer * em_utils_reply_to_message (CamelFolder *, const gchar *uid, CamelMimeMessage *message, gint mode, EMFormat *source); +EDestination ** em_utils_camel_address_to_destination (CamelInternetAddress *iaddr); G_END_DECLS -- cgit v1.2.3 From 87773593220e581de841e837c29acb99a818c890 Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Thu, 25 Jun 2009 10:37:10 +0530 Subject: Add more apis for Anjal to draft composer. --- mail/em-composer-utils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mail/em-composer-utils.h') diff --git a/mail/em-composer-utils.h b/mail/em-composer-utils.h index 4c916529ec..66168e3a43 100644 --- a/mail/em-composer-utils.h +++ b/mail/em-composer-utils.h @@ -46,7 +46,7 @@ EMsgComposer * em_utils_compose_lite_new_message (const gchar *fromuri); /* FIXME: mailto? url? should make up its mind what its called. imho use 'uri' */ EMsgComposer * em_utils_compose_new_message_with_mailto (const gchar *url, const gchar *fromuri); -void em_utils_edit_message (CamelMimeMessage *message, CamelFolder *folder); +GtkWidget * em_utils_edit_message (CamelMimeMessage *message, CamelFolder *folder); void em_utils_edit_messages (CamelFolder *folder, GPtrArray *uids, gboolean replace); void em_utils_forward_attached (CamelFolder *folder, GPtrArray *uids, const gchar *fromuri); -- cgit v1.2.3