diff options
Diffstat (limited to 'mail/em-popup.h')
| -rw-r--r-- | mail/em-popup.h | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/mail/em-popup.h b/mail/em-popup.h index dea4aee5d2..f7182e9358 100644 --- a/mail/em-popup.h +++ b/mail/em-popup.h @@ -25,13 +25,11 @@ #define __EM_POPUP_H__ #include <glib-object.h> +#include <camel/camel-folder.h> #include "e-util/e-popup.h" -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS typedef struct _EMPopup EMPopup; typedef struct _EMPopupClass EMPopupClass; @@ -186,7 +184,7 @@ struct _EMPopupTargetURI { **/ struct _EMPopupTargetSelect { EPopupTarget target; - struct _CamelFolder *folder; + CamelFolder *folder; gchar *uri; GPtrArray *uids; }; @@ -205,7 +203,7 @@ struct _EMPopupTargetSelect { struct _EMPopupTargetPart { EPopupTarget target; gchar *mime_type; - struct _CamelMimePart *part; + CamelMimePart *part; }; /** @@ -239,8 +237,8 @@ GType em_popup_get_type(void); EMPopup *em_popup_new(const gchar *menuid); EMPopupTargetURI *em_popup_target_new_uri(EMPopup *emp, const gchar *uri); -EMPopupTargetSelect *em_popup_target_new_select(EMPopup *emp, struct _CamelFolder *folder, const gchar *folder_uri, GPtrArray *uids); -EMPopupTargetPart *em_popup_target_new_part(EMPopup *emp, struct _CamelMimePart *part, const gchar *mime_type); +EMPopupTargetSelect *em_popup_target_new_select(EMPopup *emp, CamelFolder *folder, const gchar *folder_uri, GPtrArray *uids); +EMPopupTargetPart *em_popup_target_new_part(EMPopup *emp, CamelMimePart *part, const gchar *mime_type); EMPopupTargetFolder *em_popup_target_new_folder(EMPopup *emp, const gchar *uri, guint32 info_flags, guint32 popup_flags); /* ********************************************************************** */ @@ -258,8 +256,6 @@ struct _EMPopupHookClass { GType em_popup_hook_get_type(void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __EM_POPUP_H__ */ |