[evolution] Bug 666081 - Duplicate typedefs

[Matthew Barnes <mbarnes src gnome org>]

commit a4f11df843ef2ab53e32c6fd84e3d980e0d092cf
Author: Matthew Barnes <mbarnes redhat com>
Date:   Wed Dec 14 13:44:08 2011 -0500

    Bug 666081 - Duplicate typedefs
    
    GCC handles it but not valid in C89 or C99.

 mail/e-mail-account-store.h |    7 ++++---
 mail/e-mail-session.h       |    3 ---
 mail/mail-folder-cache.h    |    7 ++++---
 3 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/mail/e-mail-account-store.h b/mail/e-mail-account-store.h
index e4355da..560dde6 100644
--- a/mail/e-mail-account-store.h
+++ b/mail/e-mail-account-store.h
@@ -44,7 +44,7 @@
 G_BEGIN_DECLS
 
 /* Avoid a circular dependency. */
-typedef struct _EMailSession EMailSession;
+struct _EMailSession;
 
 typedef enum {
 	E_MAIL_ACCOUNT_STORE_COLUMN_SERVICE,
@@ -95,10 +95,11 @@ struct _EMailAccountStoreClass {
 
 GType		e_mail_account_store_get_type	(void) G_GNUC_CONST;
 EMailAccountStore *
-		e_mail_account_store_new	(EMailSession *session);
+		e_mail_account_store_new	(struct _EMailSession *session);
 void		e_mail_account_store_clear	(EMailAccountStore *store);
 gboolean	e_mail_account_store_get_busy	(EMailAccountStore *store);
-EMailSession *	e_mail_account_store_get_session
+struct _EMailSession *
+		e_mail_account_store_get_session
 						(EMailAccountStore *store);
 CamelService *	e_mail_account_store_get_default_service
 						(EMailAccountStore *store);
diff --git a/mail/e-mail-session.h b/mail/e-mail-session.h
index e10e3c3..f810cf6 100644
--- a/mail/e-mail-session.h
+++ b/mail/e-mail-session.h
@@ -55,9 +55,6 @@
 
 G_BEGIN_DECLS
 
-/* Avoids a circular dependency. */
-typedef struct _EMailAccountStore EMailAccountStore;
-
 typedef struct _EMailSession EMailSession;
 typedef struct _EMailSessionClass EMailSessionClass;
 typedef struct _EMailSessionPrivate EMailSessionPrivate;
diff --git a/mail/mail-folder-cache.h b/mail/mail-folder-cache.h
index 78d5fd9..8e9fa34 100644
--- a/mail/mail-folder-cache.h
+++ b/mail/mail-folder-cache.h
@@ -50,7 +50,7 @@
 G_BEGIN_DECLS
 
 /* Avoid a circular dependency. */
-typedef struct _EMailSession EMailSession;
+struct _EMailSession;
 
 typedef struct _MailFolderCache MailFolderCache;
 typedef struct _MailFolderCacheClass MailFolderCacheClass;
@@ -110,8 +110,9 @@ struct _MailFolderCacheClass {
 
 GType		mail_folder_cache_get_type	(void) G_GNUC_CONST;
 MailFolderCache *
-		mail_folder_cache_new		(EMailSession *session);
-EMailSession *	mail_folder_cache_get_session	(MailFolderCache *cache);
+		mail_folder_cache_new		(struct _EMailSession *session);
+struct _EMailSession *
+		mail_folder_cache_get_session	(MailFolderCache *cache);
 void		mail_folder_cache_note_store	(MailFolderCache *cache,
 						 CamelStore *store,
 						 GCancellable *cancellable,