GNOME.org
 

Several patches--mainly for C++ users

Hello maintainers,

Attached are a few patches to fix up a few things. Most clean things
up so that C++ programs can include public tny-* headers. The first is
a cleanup for the build system so that gnome-autogen.sh does not have
to be run.


configure.patch:
Running autoreconf by itself does not work because some things are missing
in the build files. This changeset fixes them up. Also this changeset
also makes sure that configure does not look for more packages if
--disable-uigtk or --disable-demoui are passed.


add-g-begin-decls.patch:
Some public header files are missing G_{BEGIN,END}_DECLS macros which
are helpful for C++ as they are 'extern "C"' wrappers.


remove-extra-include.patch:
tny-camel-folder.h includes camel-folder.h when it does not need to.
Including it causes a problem when it is included in a C++ program.
camel-folder. This fixes the problem for C++ programs that include
tny-camel-folder.h. However, renaming variables in camel-folder.h may
be a good thing to implement, which should be done in the upstream
camel library.


rework-typedef-enums.patch:
The *mm helper helper scripts expect enums to be of the following form:

typedef enum {
    ...
} Foo;

This changeset makes the enums all follow this pattern so that the
enum.pl script
from glibmm can generate defs files properly.


Carl Simonson
simonsonc gmail com

diff --git a/Makefile.am b/Makefile.am
index b894c2c..7e2623e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,7 @@
 SUBDIRS = m4 
 
+ACLOCAL_AMFLAGS = -I m4
+
 SUBDIRS += libtinymail 
 SUBDIRS += libtinymailui 
 
diff --git a/configure.ac b/configure.ac
index 68beffa..faf607c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,6 +56,8 @@ AC_PROG_LIBTOOL
 AC_PATH_PROG(VALAC, valac, valac)
 AC_SUBST(VALAC)
 
+AM_PATH_PYTHON
+
 dnl ### default values (will get overwritten)
 build_acap=false
 build_gnome=true
@@ -418,7 +420,12 @@ AC_SUBST(LIBTINYMAIL_GNOMEVFS_CFLAGS)
 AC_SUBST(LIBTINYMAIL_GNOMEVFS_LIBS)
 
 dnl ### libtinymailui-gtk, a gtk+ implementation of libtinymail-ui ##
-PKG_CHECK_MODULES(LIBTINYMAILUI_GTK, glib-2.0 >= 2.8 gobject-2.0 $extragtkpkgs gtk+-2.0)
+if test x$build_uigtk = xtrue; then
+  PKG_CHECK_MODULES(LIBTINYMAILUI_GTK, glib-2.0 >= 2.8 gobject-2.0 $extragtkpkgs gtk+-2.0)
+else
+  LIBTINYMAILUI_GTK_CFLAGS=
+  LIBTINYMAILUI_GTK_LIBS=
+fi
 AC_SUBST(LIBTINYMAILUI_GTK_CFLAGS)
 AC_SUBST(LIBTINYMAILUI_GTK_LIBS)
 
@@ -532,7 +539,12 @@ if test x$build_unittests = xtrue; then
 fi
 
 dnl ### tinymail, the demo-ui ##
-PKG_CHECK_MODULES(TINYMAIL, glib-2.0 >= 2.8 gobject-2.0 gtk+-2.0 $extratnypkgs)
+if test x$build_demoui = xtrue; then
+  PKG_CHECK_MODULES(TINYMAIL, glib-2.0 >= 2.8 gobject-2.0 gtk+-2.0 $extratnypkgs)
+else
+  TINYMAIL_CFLAGS=
+  TINYMAIL_LIBS=
+fi
 AC_SUBST(TINYMAIL_CFLAGS)
 AC_SUBST(TINYMAIL_LIBS)
 
diff --git a/docs/devel/reference/Makefile.am b/docs/devel/reference/Makefile.am
index 38c65f1..3fa562d 100644
--- a/docs/devel/reference/Makefile.am
+++ b/docs/devel/reference/Makefile.am
@@ -117,5 +117,5 @@ include $(top_srcdir)/gtk-doc.make
 
 # Other files to distribute
 # e.g. EXTRA_DIST += version.xml.in
-EXTRA_DIST += 
+#EXTRA_DIST += 
 
diff --git a/libtinymail-camel/camel-lite/Makefile.am b/libtinymail-camel/camel-lite/Makefile.am
index cea992d..7aae16b 100644
--- a/libtinymail-camel/camel-lite/Makefile.am
+++ b/libtinymail-camel/camel-lite/Makefile.am
@@ -1,3 +1,5 @@
 SUBDIRS = bs summary libedataserver camel
 
+ACLOCAL_AMFLAGS = -I ../../m4
+
 EXTRA_DIST = iconv-detect.h

diff --git a/libtinymail-camel/tny-camel-shared.h b/libtinymail-camel/tny-camel-shared.h
index 8958cde..1c19301 100644
--- a/libtinymail-camel/tny-camel-shared.h
+++ b/libtinymail-camel/tny-camel-shared.h
@@ -22,6 +22,8 @@
 
 #include <tny-shared.h>
 
+G_BEGIN_DECLS
+
 extern gboolean _camel_type_init_done;
 
 typedef struct _TnySessionCamel TnySessionCamel;
@@ -29,4 +31,6 @@ typedef struct _TnySessionCamelClass TnySessionCamelClass;
 
 TnySessionCamel*  tny_session_camel_new  (TnyAccountStore *account_store);
 
+G_END_DECLS
+
 #endif
diff --git a/libtinymail/tny-error.h b/libtinymail/tny-error.h
index 55aa9ac..43e8789 100644
--- a/libtinymail/tny-error.h
+++ b/libtinymail/tny-error.h
@@ -24,6 +24,8 @@
 #include <glib-object.h>
 #include <tny-shared.h>
 
+G_BEGIN_DECLS
+
 #define TNY_ERROR_DOMAIN (tny_get_error_quark())
 
 /**
@@ -81,5 +83,6 @@ gint tny_error_get_code (GError *err);
 
 GQuark tny_get_error_quark (void);
 
+G_END_DECLS
 
 #endif
diff --git a/libtinymail/tny-status.h b/libtinymail/tny-status.h
index 596d914..60ebd7e 100644
--- a/libtinymail/tny-status.h
+++ b/libtinymail/tny-status.h
@@ -24,6 +24,8 @@
 #include <glib-object.h>
 #include <tny-shared.h>
 
+G_BEGIN_DECLS
+
 #ifndef TNY_SHARED_H
 typedef struct _TnyStatus TnyStatus;
 #endif
@@ -77,4 +79,6 @@ void tny_clear_status (TnyStatus **status);
 void tny_status_set_fraction (TnyStatus *status, gdouble fraction);
 gdouble tny_status_get_fraction (TnyStatus *status);
 
+G_END_DECLS
+
 #endif

diff --git a/libtinymail/tny-account-store.h b/libtinymail/tny-account-store.h
index 6f7cbcd..6afbd46 100644
--- a/libtinymail/tny-account-store.h
+++ b/libtinymail/tny-account-store.h
@@ -33,34 +33,30 @@ G_BEGIN_DECLS
 
 #define TNY_TYPE_ACCOUNT_STORE_SIGNAL (tny_account_store_signal_get_type())
 
-enum _TnyAccountStoreSignal
+typedef enum
 {
 	TNY_ACCOUNT_STORE_CONNECTING_STARTED,
 	TNY_ACCOUNT_STORE_LAST_SIGNAL
-};
+} TnyAccountStoreSignal;
 
 #define TNY_TYPE_ALERT_TYPE (tny_alert_type_get_type())
 
-enum _TnyAlertType
+typedef enum
 {
 	TNY_ALERT_TYPE_INFO,
 	TNY_ALERT_TYPE_WARNING,
 	TNY_ALERT_TYPE_ERROR
-};
-
-typedef enum _TnyAlertType TnyAlertType;
+} TnyAlertType;
 
 
 #define TNY_TYPE_GET_ACCOUNTS_REQUEST_TYPE (tny_get_accounts_request_type_get_type())
 
-enum _TnyGetAccountsRequestType
+typedef enum
 {
 	TNY_ACCOUNT_STORE_TRANSPORT_ACCOUNTS,
 	TNY_ACCOUNT_STORE_STORE_ACCOUNTS,
 	TNY_ACCOUNT_STORE_BOTH
-};
-
-typedef enum _TnyGetAccountsRequestType TnyGetAccountsRequestType;
+} TnyGetAccountsRequestType;
 
 
 extern guint tny_account_store_signals [TNY_ACCOUNT_STORE_LAST_SIGNAL];
diff --git a/libtinymail/tny-account.h b/libtinymail/tny-account.h
index 2f38236..f97c56d 100644
--- a/libtinymail/tny-account.h
+++ b/libtinymail/tny-account.h
@@ -41,7 +41,7 @@ typedef struct _TnyAccountIface TnyAccountIface;
 
 #define TNY_TYPE_CONNECTION_STATUS (tny_connection_status_get_type())
 
-enum _TnyConnectionStatus
+typedef enum
 {
 	TNY_CONNECTION_STATUS_DISCONNECTED,
 	TNY_CONNECTION_STATUS_DISCONNECTED_BROKEN,
@@ -49,31 +49,25 @@ enum _TnyConnectionStatus
 	TNY_CONNECTION_STATUS_CONNECTED,
 	TNY_CONNECTION_STATUS_RECONNECTING,
 	TNY_CONNECTION_STATUS_INIT
-};
-
-typedef enum _TnyConnectionStatus TnyConnectionStatus;
+} TnyConnectionStatus;
 
 #define TNY_TYPE_ACCOUNT_TYPE (tny_account_type_get_type())
 
-enum _TnyAccountType
+typedef enum
 {
 	TNY_ACCOUNT_TYPE_STORE,
 	TNY_ACCOUNT_TYPE_TRANSPORT,
 	TNY_ACCOUNT_TYPE_COMBINED
-};
-
-typedef enum _TnyAccountType TnyAccountType;
+} TnyAccountType;
 
 #define TNY_TYPE_ACCOUNT_SIGNAL (tny_account_signal_type_get_type())
 
-enum _TnyAccountSignal
+typedef enum
 {
 	TNY_ACCOUNT_CONNECTION_STATUS_CHANGED,
 	TNY_ACCOUNT_CHANGED,
 	TNY_ACCOUNT_LAST_SIGNAL
-};
-
-typedef enum _TnyAccountSignal TnyAccountSignal;
+} TnyAccountSignal;
 
 extern guint tny_account_signals [TNY_ACCOUNT_LAST_SIGNAL];
 
diff --git a/libtinymail/tny-error.h b/libtinymail/tny-error.h
index 43e8789..9f33d95 100644
--- a/libtinymail/tny-error.h
+++ b/libtinymail/tny-error.h
@@ -33,7 +33,7 @@ G_BEGIN_DECLS
  *
  * A GError error code.
  */
-enum _TnyError 
+typedef enum
 {
 	TNY_NO_ERROR,
 
@@ -72,12 +72,10 @@ enum _TnyError
 
 	TNY_MIME_ERROR_STATE,
 	TNY_MIME_ERROR_MALFORMED,
-};
+} TnyError;
 
 typedef GError TError;
 
-typedef enum _TnyError TnyError;
-
 const gchar* tny_error_get_message (GError *err);
 gint tny_error_get_code (GError *err);
 
diff --git a/libtinymail/tny-folder-change.h b/libtinymail/tny-folder-change.h
index 21e9b13..7e5523a 100644
--- a/libtinymail/tny-folder-change.h
+++ b/libtinymail/tny-folder-change.h
@@ -43,7 +43,7 @@ typedef struct _TnyFolderChangeClass TnyFolderChangeClass;
 
 #define TNY_TYPE_FOLDER_CHANGE_CHANGED (tny_folder_change_changed_get_type())
 
-enum _TnyFolderChangeChanged
+typedef enum
 {
 	TNY_FOLDER_CHANGE_CHANGED_ALL_COUNT = 1<<0,
 	TNY_FOLDER_CHANGE_CHANGED_UNREAD_COUNT = 1<<1,
@@ -51,9 +51,7 @@ enum _TnyFolderChangeChanged
 	TNY_FOLDER_CHANGE_CHANGED_EXPUNGED_HEADERS = 1<<3,
 	TNY_FOLDER_CHANGE_CHANGED_FOLDER_RENAME = 1<<4,
 	TNY_FOLDER_CHANGE_CHANGED_MSG_RECEIVED = 1<<5
-};
-
-typedef enum _TnyFolderChangeChanged TnyFolderChangeChanged;
+} TnyFolderChangeChanged;
 
 
 struct _TnyFolderChange
diff --git a/libtinymail/tny-folder-store-change.h b/libtinymail/tny-folder-store-change.h
index c49e97a..48241e9 100644
--- a/libtinymail/tny-folder-store-change.h
+++ b/libtinymail/tny-folder-store-change.h
@@ -42,13 +42,11 @@ typedef struct _TnyFolderStoreChangeClass TnyFolderStoreChangeClass;
 
 #define TNY_TYPE_FOLDER_STORE_CHANGE_CHANGED (tny_folder_store_change_changed_get_type())
 
-enum _TnyFolderStoreChangeChanged
+typedef enum
 {
 	TNY_FOLDER_STORE_CHANGE_CHANGED_CREATED_FOLDERS = 1<<0,
 	TNY_FOLDER_STORE_CHANGE_CHANGED_REMOVED_FOLDERS = 1<<1
-};
-
-typedef enum _TnyFolderStoreChangeChanged TnyFolderStoreChangeChanged;
+} TnyFolderStoreChangeChanged;
 
 
 struct _TnyFolderStoreChange
diff --git a/libtinymail/tny-folder-store-query.h b/libtinymail/tny-folder-store-query.h
index baf33ff..e366614 100644
--- a/libtinymail/tny-folder-store-query.h
+++ b/libtinymail/tny-folder-store-query.h
@@ -44,7 +44,7 @@ G_BEGIN_DECLS
 
 #define TNY_TYPE_FOLDER_STORE_QUERY_OPTION (tny_folder_store_query_option_get_type())
 
-enum _TnyFolderStoreQueryOption
+typedef enum
 {
 	TNY_FOLDER_STORE_QUERY_OPTION_SUBSCRIBED = 1<<1,
 	TNY_FOLDER_STORE_QUERY_OPTION_UNSUBSCRIBED = 1<<2,
@@ -52,7 +52,7 @@ enum _TnyFolderStoreQueryOption
 	TNY_FOLDER_STORE_QUERY_OPTION_MATCH_ON_ID = 1<<4,
 	TNY_FOLDER_STORE_QUERY_OPTION_PATTERN_IS_CASE_INSENSITIVE = 1<<5,
 	TNY_FOLDER_STORE_QUERY_OPTION_PATTERN_IS_REGEX = 1<<6
-};
+} TnyFolderStoreQueryOption;
 
 #ifndef TNY_SHARED_H
 typedef struct _TnyFolderStoreQuery TnyFolderStoreQuery;
@@ -61,8 +61,6 @@ typedef struct _TnyFolderStoreQueryItem TnyFolderStoreQueryItem;
 typedef struct _TnyFolderStoreQueryItemClass TnyFolderStoreQueryItemClass;
 #endif
 
-typedef enum _TnyFolderStoreQueryOption TnyFolderStoreQueryOption;
-
 struct _TnyFolderStoreQueryItem 
 {
 	GObject parent;
diff --git a/libtinymail/tny-folder.h b/libtinymail/tny-folder.h
index d25ff39..5b46ed3 100644
--- a/libtinymail/tny-folder.h
+++ b/libtinymail/tny-folder.h
@@ -44,14 +44,12 @@ typedef struct _TnyFolderIface TnyFolderIface;
 
 #define TNY_TYPE_FOLDER_SIGNAL (tny_folder_signal_get_type())
 
-enum _TnyFolderSignal
+typedef enum
 {
 	TNY_FOLDER_FOLDER_INSERTED,
 	TNY_FOLDER_FOLDERS_RELOADED,
 	TNY_FOLDER_LAST_SIGNAL
-};
-
-typedef enum _TnyFolderSignal TnyFolderSignal;
+} TnyFolderSignal;
 
 
 extern guint tny_folder_signals[TNY_FOLDER_LAST_SIGNAL];
@@ -60,17 +58,15 @@ extern guint tny_folder_signals[TNY_FOLDER_LAST_SIGNAL];
 
 #define TNY_TYPE_FOLDER_CAPS (tny_folder_caps_get_type())
 
-enum _TnyFolderCaps
+typedef enum
 {
 	TNY_FOLDER_CAPS_WRITABLE = 1<<0,
 	TNY_FOLDER_CAPS_PUSHEMAIL = 1<<1,
 	TNY_FOLDER_CAPS_NOSELECT = 1<<2,
 	TNY_FOLDER_CAPS_NOCHILDREN = 1<<3
-};
+} TnyFolderCaps;
 
-typedef enum _TnyFolderCaps TnyFolderCaps;
-
-enum _TnyFolderType
+typedef enum
 {
 	TNY_FOLDER_TYPE_UNKNOWN,
 	TNY_FOLDER_TYPE_NORMAL,
@@ -87,9 +83,7 @@ enum _TnyFolderType
 	TNY_FOLDER_TYPE_ARCHIVE,
 	TNY_FOLDER_TYPE_MERGE,
 	TNY_FOLDER_TYPE_NUM
-};
-
-typedef enum _TnyFolderType TnyFolderType;
+} TnyFolderType;
 
 struct _TnyFolderIface
 {
diff --git a/libtinymail/tny-header.h b/libtinymail/tny-header.h
index eda739b..ddd73a3 100644
--- a/libtinymail/tny-header.h
+++ b/libtinymail/tny-header.h
@@ -51,7 +51,7 @@ typedef struct _TnyHeaderIface TnyHeaderIface;
 #endif
 
 
-enum _TnyHeaderFlags 
+typedef enum
 {
 	TNY_HEADER_FLAG_ANSWERED = 1<<0,
 	TNY_HEADER_FLAG_DELETED = 1<<1,
@@ -66,12 +66,10 @@ enum _TnyHeaderFlags
 	TNY_HEADER_FLAG_NORMAL_PRIORITY = 0<<9|0<<10,
 	TNY_HEADER_FLAG_LOW_PRIORITY = 1<<9|0<<10,
 	TNY_HEADER_FLAG_SUSPENDED = 1<<11
-};
+} TnyHeaderFlags;
 
 #define TNY_HEADER_FLAG_PRIORITY_MASK (1<<9|1<<10)
 
-typedef enum _TnyHeaderFlags TnyHeaderFlags;
-
 
 struct _TnyHeaderIface
 {
diff --git a/libtinymail/tny-status.h b/libtinymail/tny-status.h
index 60ebd7e..8bbc75d 100644
--- a/libtinymail/tny-status.h
+++ b/libtinymail/tny-status.h
@@ -32,18 +32,16 @@ typedef struct _TnyStatus TnyStatus;
 
 #define TNY_TYPE_STATUS_DOMAIN (tny_status_domain_get_type())
 
-enum _TnyStatusDomain
+typedef enum
 {
 	TNY_FOLDER_STATUS = 1,
 	TNY_GET_MSG_QUEUE_STATUS = 2,
 	TNY_GET_SUPPORTED_SECURE_AUTH_STATUS = 3
-};
-
-typedef enum _TnyStatusDomain TnyStatusDomain;
+} TnyStatusDomain;
 
 #define TNY_TYPE_STATUS_CODE (tny_status_code_get_type())
 
-enum _TnyStatusCode 
+typedef enum
 {
 	TNY_FOLDER_STATUS_CODE_REFRESH = 1,
 	TNY_FOLDER_STATUS_CODE_GET_MSG = 2,
@@ -52,9 +50,7 @@ enum _TnyStatusCode
 	TNY_FOLDER_STATUS_CODE_COPY_FOLDER = 5,
 	TNY_GET_SUPPORTED_SECURE_AUTH_STATUS_GET_SECURE_AUTH = 6,
 	TNY_FOLDER_STATUS_CODE_SYNC = 7
-};
-
-typedef enum _TnyStatusCode TnyStatusCode;
+} TnyStatusCode;
 
 struct _TnyStatus 
 {
diff --git a/libtinymailui-gtk/tny-gtk-account-list-model.h b/libtinymailui-gtk/tny-gtk-account-list-model.h
index 35e940e..318b0f4 100644
--- a/libtinymailui-gtk/tny-gtk-account-list-model.h
+++ b/libtinymailui-gtk/tny-gtk-account-list-model.h
@@ -38,14 +38,12 @@ typedef struct _TnyGtkAccountListModelClass TnyGtkAccountListModelClass;
 
 #define TNY_TYPE_GTK_ACCOUNT_LIST_MODEL_COLUMN (tny_gtk_account_list_model_column_get_type())
 
-enum _TnyGtkAccountListModelColumn
+typedef enum
 {
 	TNY_GTK_ACCOUNT_LIST_MODEL_NAME_COLUMN,
 	TNY_GTK_ACCOUNT_LIST_MODEL_INSTANCE_COLUMN,
 	TNY_GTK_ACCOUNT_LIST_MODEL_N_COLUMNS
-};
-
-typedef enum _TnyGtkAccountListModelColumn TnyGtkAccountListModelColumn;
+} TnyGtkAccountListModelColumn;
 
 struct _TnyGtkAccountListModel
 {
diff --git a/libtinymailui-gtk/tny-gtk-attach-list-model.h b/libtinymailui-gtk/tny-gtk-attach-list-model.h
index 01116fe..d429a8f 100644
--- a/libtinymailui-gtk/tny-gtk-attach-list-model.h
+++ b/libtinymailui-gtk/tny-gtk-attach-list-model.h
@@ -40,15 +40,13 @@ typedef struct _TnyGtkAttachListModelClass TnyGtkAttachListModelClass;
 #define TNY_TYPE_GTK_ATTACH_LIST_MODEL_COLUMN (tny_gtk_attach_list_model_column_get_type())
 
 
-enum _TnyGtkAttachListModelColumn
+typedef enum
 {
 	TNY_GTK_ATTACH_LIST_MODEL_PIXBUF_COLUMN,
 	TNY_GTK_ATTACH_LIST_MODEL_FILENAME_COLUMN,
 	TNY_GTK_ATTACH_LIST_MODEL_INSTANCE_COLUMN,
 	TNY_GTK_ATTACH_LIST_MODEL_N_COLUMNS
-};
-
-typedef enum _TnyGtkAttachListModelColumn TnyGtkAttachListModelColumn;
+} TnyGtkAttachListModelColumn;
 
 struct _TnyGtkAttachListModel
 {
diff --git a/libtinymailui-gtk/tny-gtk-folder-list-store.h b/libtinymailui-gtk/tny-gtk-folder-list-store.h
index a8bac19..af6c63e 100644
--- a/libtinymailui-gtk/tny-gtk-folder-list-store.h
+++ b/libtinymailui-gtk/tny-gtk-folder-list-store.h
@@ -42,7 +42,7 @@ typedef struct _TnyGtkFolderListStoreClass TnyGtkFolderListStoreClass;
 
 #define TNY_TYPE_GTK_FOLDER_LIST_STORE_COLUMN (tny_gtk_folder_list_store_column_get_type())
 
-enum _TnyGtkFolderListStoreColumn
+typedef enum
 {
 	TNY_GTK_FOLDER_LIST_STORE_NAME_COLUMN,
 	TNY_GTK_FOLDER_LIST_STORE_UNREAD_COLUMN,
@@ -50,18 +50,14 @@ enum _TnyGtkFolderListStoreColumn
 	TNY_GTK_FOLDER_LIST_STORE_TYPE_COLUMN,
 	TNY_GTK_FOLDER_LIST_STORE_INSTANCE_COLUMN,
 	TNY_GTK_FOLDER_LIST_STORE_N_COLUMNS
-};
-
-typedef enum _TnyGtkFolderListStoreColumn TnyGtkFolderListStoreColumn;
+} TnyGtkFolderListStoreColumn;
 
-enum _TnyGtkFolderListStoreFlags
+typedef enum
 {
 	TNY_GTK_FOLDER_LIST_STORE_FLAG_SHOW_PATH = 1<<0,
 	TNY_GTK_FOLDER_LIST_STORE_FLAG_NO_REFRESH = 1<<2,
 	TNY_GTK_FOLDER_LIST_STORE_FLAG_DELAYED_REFRESH = 1<<3,
-};
-
-typedef enum _TnyGtkFolderListStoreFlags TnyGtkFolderListStoreFlags;
+} TnyGtkFolderListStoreFlags;
 
 struct _TnyGtkFolderListStore
 {
diff --git a/libtinymailui-gtk/tny-gtk-folder-store-tree-model.h b/libtinymailui-gtk/tny-gtk-folder-store-tree-model.h
index 91955f9..2474e53 100644
--- a/libtinymailui-gtk/tny-gtk-folder-store-tree-model.h
+++ b/libtinymailui-gtk/tny-gtk-folder-store-tree-model.h
@@ -42,7 +42,7 @@ typedef struct _TnyGtkFolderStoreTreeModelClass TnyGtkFolderStoreTreeModelClass;
 
 #define TNY_TYPE_GTK_FOLDER_STORE_TREE_MODEL_COLUMN (tny_gtk_folder_store_tree_model_column_get_type())
 
-enum _TnyGtkFolderStoreTreeModelColumn
+typedef enum
 {
 	TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN,
 	TNY_GTK_FOLDER_STORE_TREE_MODEL_UNREAD_COLUMN,
@@ -50,16 +50,12 @@ enum _TnyGtkFolderStoreTreeModelColumn
 	TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN,
 	TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN,
 	TNY_GTK_FOLDER_STORE_TREE_MODEL_N_COLUMNS
-};
-
-typedef enum _TnyGtkFolderStoreTreeModelColumn TnyGtkFolderStoreTreeModelColumn;
+} TnyGtkFolderStoreTreeModelColumn;
 
-enum _TnyGtkFolderStoreTreeModelFlags
+typedef enum
 {
 	TNY_GTK_FOLDER_STORE_TREE_MODEL_FLAG_SHOW_PATH = 1<<0,
-};
-
-typedef enum _TnyGtkFolderStoreTreeModelFlags TnyGtkFolderStoreTreeModelFlags;
+} TnyGtkFolderStoreTreeModelFlags;
 
 struct _TnyGtkFolderStoreTreeModel
 {
diff --git a/libtinymailui-gtk/tny-gtk-header-list-model.h b/libtinymailui-gtk/tny-gtk-header-list-model.h
index db7415b..61cc5e2 100644
--- a/libtinymailui-gtk/tny-gtk-header-list-model.h
+++ b/libtinymailui-gtk/tny-gtk-header-list-model.h
@@ -41,7 +41,7 @@ typedef struct _TnyGtkHeaderListModelClass TnyGtkHeaderListModelClass;
 
 #define TNY_TYPE_GTK_HEADER_LIST_MODEL_COLUMN (tny_gtk_header_list_model_column_get_type())
 
-enum _TnyGtkHeaderListModelColumn
+typedef enum
 {
 	TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN,
 	TNY_GTK_HEADER_LIST_MODEL_TO_COLUMN,
@@ -55,9 +55,7 @@ enum _TnyGtkHeaderListModelColumn
 	TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN,
 	TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN,
 	TNY_GTK_HEADER_LIST_MODEL_N_COLUMNS
-};
-
-typedef enum _TnyGtkHeaderListModelColumn TnyGtkHeaderListModelColumn;
+} TnyGtkHeaderListModelColumn;
 
 struct _TnyGtkHeaderListModel 
 {

diff --git a/libtinymail-camel/tny-camel-folder.h b/libtinymail-camel/tny-camel-folder.h
index 522e8e1..24cbe28 100644
--- a/libtinymail-camel/tny-camel-folder.h
+++ b/libtinymail-camel/tny-camel-folder.h
@@ -30,8 +30,6 @@
 #include <tny-msg-remove-strategy.h>
 #include <tny-msg-receive-strategy.h>
 
-#include <camel/camel-folder.h>
-
 G_BEGIN_DECLS
 
 #define TNY_TYPE_CAMEL_FOLDER             (tny_camel_folder_get_type ())
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]