[evolution-activesync] Remove compatibility for ancient versions of Evolution (probably <3.6)
- From: David Woodhouse <dwmw2 src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-activesync] Remove compatibility for ancient versions of Evolution (probably <3.6)
- Date: Wed, 8 May 2013 13:41:02 +0000 (UTC)
commit 7664f05dcf0612aaf3eb95377dd152dd4c232883
Author: David Woodhouse <David Woodhouse intel com>
Date: Wed May 8 14:39:34 2013 +0100
Remove compatibility for ancient versions of Evolution (probably <3.6)
camel/Makefile.am | 7 +-
camel/camel-eas-compat.c | 92 -------------
camel/camel-eas-compat.h | 85 ------------
camel/camel-eas-folder.c | 93 +++-----------
camel/camel-eas-store.c | 149 ++++-----------------
camel/camel-eas-summary.c | 306 -------------------------------------------
camel/camel-eas-summary.h | 5 -
camel/camel-eas-transport.c | 37 ++----
camel/camel-eas-utils.c | 56 --------
configure.ac | 14 +--
10 files changed, 60 insertions(+), 784 deletions(-)
---
diff --git a/camel/Makefile.am b/camel/Makefile.am
index 65fb360..f66887a 100644
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -26,8 +26,7 @@ libcameleas_la_SOURCES = \
camel-eas-summary.c \
camel-eas-provider.c \
camel-eas-utils.c \
- camel-eas-transport.c \
- camel-eas-compat.c
+ camel-eas-transport.c
noinst_HEADERS = \
camel-eas-folder.h \
@@ -36,8 +35,8 @@ noinst_HEADERS = \
camel-eas-store.h \
camel-eas-summary.h \
camel-eas-utils.h \
- camel-eas-transport.h \
- camel-eas-compat.h
+ camel-eas-transport.h
+
libcameleas_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED)
diff --git a/camel/camel-eas-folder.c b/camel/camel-eas-folder.c
index 45fb53f..5dd5213 100644
--- a/camel/camel-eas-folder.c
+++ b/camel/camel-eas-folder.c
@@ -41,7 +41,6 @@
#include <dbus/dbus-glib.h>
#include <libeasmail.h>
-#include "camel-eas-compat.h"
#include "camel-eas-folder.h"
#include "camel-eas-private.h"
#include "camel-eas-store.h"
@@ -78,19 +77,6 @@ eas_get_filename (CamelFolder *folder, const gchar *uid, GError **error)
return camel_data_cache_get_filename (eas_folder->cache, "cache", uid);
}
-#if ! EDS_CHECK_VERSION(2,33,0)
-static gboolean camel_data_wrapper_construct_from_stream_sync(CamelDataWrapper *data_wrapper,
- CamelStream *stream,
- GCancellable *cancellable,
- GError **error)
-{
- /* In 2.32 this returns an int, which is zero for success */
- return !camel_data_wrapper_construct_from_stream(data_wrapper, stream, error);
-}
-
-#endif
-
-
static CamelMimeMessage *
camel_eas_folder_get_message_from_cache (CamelEasFolder *eas_folder, const gchar *uid, GCancellable
*cancellable, GError **error)
{
@@ -141,8 +127,7 @@ camel_eas_folder_get_message (CamelFolder *folder, const gchar *uid,
gboolean res;
gchar *mime_fname_new = NULL;
- EVO3(progress_data = cancellable);
- EVO2(progress_data = camel_operation_registered());
+ progress_data = cancellable;
eas_store = (CamelEasStore *) camel_folder_get_parent_store (folder);
eas_folder = (CamelEasFolder *) folder;
@@ -259,10 +244,9 @@ exit:
/* Get the message from cache if available otherwise get it from server */
static CamelMimeMessage *
-eas_folder_get_message_sync (CamelFolder *folder, const gchar *uid, EVO3(GCancellable *cancellable,) GError
**error )
+eas_folder_get_message_sync (CamelFolder *folder, const gchar *uid, GCancellable *cancellable, GError
**error )
{
CamelMimeMessage *message;
- EVO2(GCancellable *cancellable = NULL);
message = camel_eas_folder_get_message_from_cache ((CamelEasFolder *)folder, uid, cancellable, NULL);
if (!message)
@@ -379,9 +363,6 @@ eas_delete_messages (CamelFolder *folder, GSList *deleted_uids, gboolean expunge
for (l = deleted_uids; l != NULL; l = g_slist_next (l)) {
gchar *uid = l->data;
camel_folder_summary_lock (folder->summary, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK);
-#if ! EDS_CHECK_VERSION(3,3,0)
- camel_eas_summary_delete_id (folder->summary, uid);
-#endif
camel_folder_change_info_remove_uid (changes, uid);
camel_data_cache_remove (CAMEL_EAS_FOLDER (folder)->cache, "cache", uid, NULL);
camel_folder_summary_unlock (folder->summary, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK);
@@ -397,7 +378,7 @@ eas_delete_messages (CamelFolder *folder, GSList *deleted_uids, gboolean expunge
}
static gboolean
-eas_synchronize_sync (CamelFolder *folder, gboolean expunge, EVO3(GCancellable *cancellable,) GError **error)
+eas_synchronize_sync (CamelFolder *folder, gboolean expunge, GCancellable *cancellable, GError **error)
{
CamelEasStore *eas_store;
EasEmailHandler *handler;
@@ -408,7 +389,6 @@ eas_synchronize_sync (CamelFolder *folder, gboolean expunge, EVO3(GCancellable *
gboolean success = TRUE;
CamelEasFolderPrivate *priv = CAMEL_EAS_FOLDER(folder)->priv;
int i;
- EVO2(GCancellable *cancellable = NULL);
eas_store = (CamelEasStore *) camel_folder_get_parent_store (folder);
handler = camel_eas_store_get_handler (eas_store);
@@ -513,10 +493,7 @@ camel_eas_folder_new (CamelStore *store, const gchar *folder_name, const gchar *
folder = g_object_new (
CAMEL_TYPE_EAS_FOLDER,
-#if EDS_CHECK_VERSION(3,1,0)
- "display_" /* Evo 3.1 calls it "display_name" */
-#endif
- "name", short_name, "full-name", folder_name,
+ "display_name", short_name, "full-name", folder_name,
"parent_store", store, NULL);
eas_folder = CAMEL_EAS_FOLDER(folder);
@@ -546,17 +523,11 @@ camel_eas_folder_new (CamelStore *store, const gchar *folder_name, const gchar *
}
if (!g_ascii_strcasecmp (folder_name, "Inbox")) {
-#if EDS_CHECK_VERSION(3,3,90)
CamelStoreSettings *settings = CAMEL_STORE_SETTINGS (camel_service_ref_settings
(CAMEL_SERVICE (store)));
if (camel_store_settings_get_filter_inbox (settings))
folder->folder_flags |= CAMEL_FOLDER_FILTER_RECENT;
g_object_unref(settings);
-#else
- if (camel_url_get_param (camel_service_get_camel_url (CAMEL_SERVICE(store)),
- "filter"))
- folder->folder_flags |= CAMEL_FOLDER_FILTER_RECENT;
-#endif
}
eas_folder->search = camel_folder_search_new ();
@@ -601,7 +572,7 @@ static void eas_sync_progress (void *data, int pc)
}
static gboolean
-eas_refresh_info_sync (CamelFolder *folder, EVO3(GCancellable *cancellable,) GError **error)
+eas_refresh_info_sync (CamelFolder *folder, GCancellable *cancellable, GError **error)
{
CamelEasFolder *eas_folder;
CamelEasFolderPrivate *priv;
@@ -614,7 +585,6 @@ eas_refresh_info_sync (CamelFolder *folder, EVO3(GCancellable *cancellable,) GEr
gboolean resynced = FALSE;
struct sync_progress_data progress_data;
GError *local_error = NULL;
- EVO2(GCancellable *cancellable = NULL);
eas_store = (CamelEasStore *) camel_folder_get_parent_store (folder);
@@ -638,8 +608,7 @@ eas_refresh_info_sync (CamelFolder *folder, EVO3(GCancellable *cancellable,) GEr
sync_state = ((CamelEasSummary *) folder->summary)->sync_state;
- EVO2(progress_data.operation = camel_operation_registered());
- EVO3(progress_data.operation = cancellable);
+ progress_data.operation = cancellable;
progress_data.estimate = 0;
progress_data.fetched = 0;
@@ -750,9 +719,9 @@ eas_refresh_info_sync (CamelFolder *folder, EVO3(GCancellable *cancellable,) GEr
static gboolean
eas_append_message_sync (CamelFolder *folder, CamelMimeMessage *message,
- EVO2(const) CamelMessageInfo *info,
+ CamelMessageInfo *info,
gchar **appended_uid,
- EVO3(GCancellable *cancellable,) GError **error)
+ GCancellable *cancellable, GError **error)
{
g_set_error (error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
_("Writing message to mail store not possible in ActiveSync"));
@@ -764,10 +733,9 @@ static gboolean
eas_transfer_messages_to_sync (CamelFolder *source,
GPtrArray *uids,
CamelFolder *destination,
- EVO2(GPtrArray **transferred_uids,)
gboolean delete_originals,
- EVO3(GPtrArray **transferred_uids,)
- EVO3(GCancellable *cancellable,)
+ GPtrArray **transferred_uids,
+ GCancellable *cancellable,
GError **error)
{
g_set_error (error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
@@ -776,21 +744,16 @@ eas_transfer_messages_to_sync (CamelFolder *source,
}
static gboolean
-eas_expunge_sync (CamelFolder *folder, EVO3(GCancellable *cancellable,) GError **error)
+eas_expunge_sync (CamelFolder *folder, GCancellable *cancellable, GError **error)
{
CamelEasStore *eas_store;
CamelEasMessageInfo *eas_info;
CamelMessageInfo *info;
CamelStore *parent_store;
GSList *deleted_items = NULL;
- EVO2(GCancellable *cancellable = NULL;)
gboolean expunge = FALSE;
gint i;
-#if EDS_CHECK_VERSION(3,3,0)
GPtrArray *known_uids;
-#else
- gint count;
-#endif
parent_store = camel_folder_get_parent_store (folder);
eas_store = CAMEL_EAS_STORE (parent_store);
@@ -802,7 +765,6 @@ eas_expunge_sync (CamelFolder *folder, EVO3(GCancellable *cancellable,) GError *
if (folder->folder_flags & CAMEL_FOLDER_IS_TRASH)
expunge = TRUE;
-#if EDS_CHECK_VERSION(3,3,0)
/* Collect UIDs of deleted messages. */
camel_folder_summary_prepare_fetch_all (folder->summary, NULL);
known_uids = camel_folder_summary_get_array (folder->summary);
@@ -823,19 +785,6 @@ eas_expunge_sync (CamelFolder *folder, EVO3(GCancellable *cancellable,) GError *
}
camel_folder_summary_free_array (known_uids);
-#else
- /* Collect UIDs of deleted messages. */
- count = camel_folder_summary_count (folder->summary);
- for (i = 0; i < count; i++) {
- info = camel_folder_summary_index (folder->summary, i);
- eas_info = (CamelEasMessageInfo *) info;
- if (eas_info && (eas_info->info.flags & CAMEL_MESSAGE_DELETED)) {
- const gchar *uid = camel_message_info_uid (info);
- deleted_items = g_slist_prepend (deleted_items, (gpointer) camel_pstring_strdup
(uid));
- }
- camel_message_info_free (info);
- }
-#endif
if (deleted_items)
return eas_delete_messages (folder, deleted_items, expunge, cancellable, error);
else
@@ -894,19 +843,12 @@ eas_folder_constructed (GObject *object)
gchar *description;
const gchar *user, *host;
-#if EDS_CHECK_VERSION(3,3,90)
CamelService *service = CAMEL_SERVICE (parent_store);
CamelSettings *settings = camel_service_ref_settings (service);
CamelNetworkSettings *network_settings = CAMEL_NETWORK_SETTINGS (settings);
host = camel_network_settings_get_host (network_settings);
user = camel_network_settings_get_user (network_settings);
-#else
- CamelURL *url = camel_service_get_camel_url (CAMEL_SERVICE (parent_store));
-
- user = url->user;
- host = url->host;
-#endif
description = g_strdup_printf ("%s %s:%s", user, host, full_name);
camel_folder_set_description (folder, description);
g_free (description);
@@ -927,18 +869,17 @@ camel_eas_folder_class_init (CamelEasFolderClass *class)
object_class->constructed = eas_folder_constructed;
folder_class = CAMEL_FOLDER_CLASS (class);
- folder_class->EVO3_sync(get_message) = eas_folder_get_message_sync;
+ folder_class->get_message_sync = eas_folder_get_message_sync;
folder_class->search_by_expression = eas_folder_search_by_expression;
folder_class->count_by_expression = eas_folder_count_by_expression;
folder_class->cmp_uids = eas_cmp_uids;
folder_class->search_by_uids = eas_folder_search_by_uids;
folder_class->search_free = eas_folder_search_free;
- folder_class->EVO3_sync(append_message) = eas_append_message_sync;
- folder_class->EVO3_sync(refresh_info) = eas_refresh_info_sync;
- EVO3(folder_class->synchronize_sync = eas_synchronize_sync);
- EVO2(folder_class->sync = eas_synchronize_sync);
- folder_class->EVO3_sync(expunge) = eas_expunge_sync;
- folder_class->EVO3_sync(transfer_messages_to) = eas_transfer_messages_to_sync;
+ folder_class->append_message_sync = eas_append_message_sync;
+ folder_class->refresh_info_sync = eas_refresh_info_sync;
+ folder_class->synchronize_sync = eas_synchronize_sync;
+ folder_class->expunge_sync = eas_expunge_sync;
+ folder_class->transfer_messages_to_sync = eas_transfer_messages_to_sync;
folder_class->get_filename = eas_get_filename;
}
diff --git a/camel/camel-eas-store.c b/camel/camel-eas-store.c
index ffc5b20..a6cb7f9 100644
--- a/camel/camel-eas-store.c
+++ b/camel/camel-eas-store.c
@@ -41,7 +41,6 @@
#include <eas-folder.h>
#include <libeasmail.h>
-#include "camel-eas-compat.h"
#include "camel-eas-folder.h"
#include "camel-eas-store.h"
#include "camel-eas-summary.h"
@@ -52,9 +51,7 @@
#include <ws2tcpip.h>
#endif
-#if EDS_CHECK_VERSION(3,3,90)
#include "camel-eas-settings.h"
-#endif
#define d(x) x
#define CURSOR_ITEM_LIMIT 100
@@ -72,36 +69,13 @@ struct _CamelEasStorePrivate {
EasEmailHandler *handler;
};
-#if ! EDS_CHECK_VERSION(2,33,0)
-static inline void camel_offline_store_set_online_sync(CamelOfflineStore *store,
- gboolean online,
- GCancellable *cancellable,
- GError *error)
-{
- camel_offline_store_set_network_state(store,
- online ? CAMEL_OFFLINE_STORE_NETWORK_AVAIL :
- CAMEL_OFFLINE_STORE_NETWORK_UNAVAIL,
- NULL);
-}
-
-static inline gboolean camel_offline_store_get_online(CamelOfflineStore *store)
-{
- return (camel_offline_store_get_network_state(store, NULL) ==
- CAMEL_OFFLINE_STORE_NETWORK_AVAIL);
-}
-#endif
-
extern CamelServiceAuthType camel_eas_password_authtype; /*for the query_auth_types function*/
static gboolean
eas_store_construct (CamelService *service, CamelSession *session,
CamelProvider *provider,
-#if !EDS_CHECK_VERSION(3,3,90)
- CamelURL *url,
-#endif
GError **error);
-#if EDS_CHECK_VERSION(3,1,0)
static void camel_eas_store_initable_init (GInitableIface *interface);
static GInitableIface *parent_initable_interface;
@@ -117,9 +91,6 @@ eas_store_initable_init (GInitable *initable,
{
CamelService *service = CAMEL_SERVICE (initable);
CamelSession *session = camel_service_get_session (service);
-#if !EDS_CHECK_VERSION(3,3,90)
- CamelURL *url = camel_service_get_camel_url (service);
-#endif
gboolean ret;
/* Chain up to parent interface's init() method. */
@@ -127,9 +98,6 @@ eas_store_initable_init (GInitable *initable,
return FALSE;
ret = eas_store_construct (service, session, NULL,
-#if !EDS_CHECK_VERSION(3,3,90)
- url,
-#endif
error);
/* Add transport here ? */
@@ -145,30 +113,14 @@ camel_eas_store_initable_init (GInitableIface *interface)
interface->init = eas_store_initable_init;
}
-#else
-G_DEFINE_TYPE (CamelEasStore, camel_eas_store, CAMEL_TYPE_OFFLINE_STORE)
-#endif
-
static gboolean
eas_store_construct (CamelService *service, CamelSession *session,
CamelProvider *provider,
-#if !EDS_CHECK_VERSION(3,3,90)
- CamelURL *url,
-#endif
GError **error)
{
CamelEasStore *eas_store;
gchar *summary_file, *session_storage_path;
-#if ! EDS_CHECK_VERSION(3,1,0)
- CamelServiceClass *service_class;
-
- /* Chain up to parent's construct() method. */
- service_class = CAMEL_SERVICE_CLASS (camel_eas_store_parent_class);
- if (!service_class->construct (service, session, provider, url, error))
- return FALSE;
-#endif
-
eas_store = (CamelEasStore *) service;
/* Disable virtual trash and junk folders. Exchange has real
@@ -176,7 +128,7 @@ eas_store_construct (CamelService *service, CamelSession *session,
((CamelStore *)eas_store)->flags &= ~(CAMEL_STORE_VTRASH|CAMEL_STORE_VJUNK);
/*storage path*/
- session_storage_path = camel_session_get_storage_path (session, service, error);
+ session_storage_path = g_strdup (camel_service_get_user_data_dir (service));
if (!session_storage_path) {
g_set_error (
error, CAMEL_STORE_ERROR,
@@ -196,9 +148,8 @@ eas_store_construct (CamelService *service, CamelSession *session,
}
static gboolean
-eas_connect_sync (CamelService *service, EVO3(GCancellable *cancellable,) GError **error)
+eas_connect_sync (CamelService *service, GCancellable *cancellable, GError **error)
{
- EVO2(GCancellable *cancellable = NULL;)
CamelEasSettings *settings;
CamelEasStore *eas_store;
CamelEasStorePrivate *priv;
@@ -213,14 +164,11 @@ eas_connect_sync (CamelService *service, EVO3(GCancellable *cancellable,) GError
if (priv->handler)
return TRUE;
-#if !EDS_CHECK_VERSION (3,3,90)
- account_uid = camel_url_get_param (camel_service_get_camel_url(service), "account_uid");
-#else
settings = CAMEL_EAS_SETTINGS (camel_service_ref_settings (service));
account_uid = camel_eas_settings_get_account_uid (settings);
g_object_unref(settings);
-#endif
+
if (!account_uid) {
g_set_error (
error, CAMEL_STORE_ERROR,
@@ -231,7 +179,7 @@ eas_connect_sync (CamelService *service, EVO3(GCancellable *cancellable,) GError
priv->handler = eas_mail_handler_new (account_uid, error);
if (!priv->handler) {
- EVO3_sync(camel_service_disconnect) (service, TRUE, cancellable, NULL);
+ camel_service_disconnect_sync (service, TRUE, cancellable, NULL);
return FALSE;
}
@@ -242,13 +190,13 @@ eas_connect_sync (CamelService *service, EVO3(GCancellable *cancellable,) GError
}
static gboolean
-eas_disconnect_sync (CamelService *service, gboolean clean, EVO3(GCancellable *cancellable,) GError **error)
+eas_disconnect_sync (CamelService *service, gboolean clean, GCancellable *cancellable, GError **error)
{
CamelEasStore *eas_store = (CamelEasStore *) service;
CamelServiceClass *service_class;
service_class = CAMEL_SERVICE_CLASS (camel_eas_store_parent_class);
- if (!service_class->EVO3_sync(disconnect) (service, clean, EVO3(cancellable,) error))
+ if (!service_class->disconnect_sync (service, clean, cancellable, error))
return FALSE;
/* TODO cancel all operations in the connection */
@@ -259,7 +207,7 @@ eas_disconnect_sync (CamelService *service, gboolean clean, EVO3(GCancellable *c
}
static GList*
-eas_store_query_auth_types_sync (CamelService *service, EVO3(GCancellable *cancellable,) GError **error)
+eas_store_query_auth_types_sync (CamelService *service, GCancellable *cancellable, GError **error)
{
GList *auth_types = NULL;
@@ -268,12 +216,11 @@ eas_store_query_auth_types_sync (CamelService *service, EVO3(GCancellable *cance
return auth_types;
}
-static CamelFolderInfo* eas_create_folder_sync (CamelStore *store, const gchar *parent_name,const gchar
*folder_name,EVO3(GCancellable *cancellable,)GError **error);
+static CamelFolderInfo* eas_create_folder_sync (CamelStore *store, const gchar *parent_name,const gchar
*folder_name,GCancellable *cancellable,GError **error);
static CamelFolder *
-eas_get_folder_sync (CamelStore *store, const gchar *folder_name, guint32 flags, EVO3(GCancellable
*cancellable,) GError **error)
+eas_get_folder_sync (CamelStore *store, const gchar *folder_name, guint32 flags, GCancellable *cancellable,
GError **error)
{
- EVO2(GCancellable *cancellable = NULL;)
CamelEasStore *eas_store;
CamelFolder *folder = NULL;
gchar *fid, *folder_dir;
@@ -301,7 +248,7 @@ eas_get_folder_sync (CamelStore *store, const gchar *folder_name, guint32 flags,
top = folder_name;
}
- fi = eas_create_folder_sync (store, parent, top, EVO3(cancellable,) error);
+ fi = eas_create_folder_sync (store, parent, top, cancellable, error);
g_free (copy);
if (!fi)
@@ -373,23 +320,9 @@ folder_info_from_store_summary (CamelEasStore *store, const gchar *top, guint32
return root_fi;
}
-#if !EDS_CHECK_VERSION(3,1,0)
-/* in Evo 3.1 and onwards, the storage path is based on UID anyway, so
- we don't need this */
-static gchar *
-eas_service_get_path (CamelService *service)
-{
- return g_build_filename (service->provider->protocol,
- camel_url_get_param (camel_service_get_camel_url(service),
- "account_uid"),
- NULL);
-}
-#endif
-
static CamelFolderInfo *
-eas_get_folder_info_sync (CamelStore *store, const gchar *top, guint32 flags, EVO3(GCancellable
*cancellable,) GError **error)
+eas_get_folder_info_sync (CamelStore *store, const gchar *top, guint32 flags, GCancellable *cancellable,
GError **error)
{
- EVO2(GCancellable *cancellable = NULL;)
CamelEasStore *eas_store;
CamelEasStorePrivate *priv;
CamelFolderInfo *fi = NULL;
@@ -400,7 +333,7 @@ eas_get_folder_info_sync (CamelStore *store, const gchar *top, guint32 flags, EV
g_mutex_lock (&priv->get_finfo_lock);
if (!(camel_offline_store_get_online (CAMEL_OFFLINE_STORE (store))
- && EVO3_sync(camel_service_connect) ((CamelService *)store, cancellable, error))) {
+ && camel_service_connect_sync ((CamelService *)store, cancellable, error))) {
g_mutex_unlock (&priv->get_finfo_lock);
goto offline;
}
@@ -429,7 +362,7 @@ static CamelFolderInfo*
eas_create_folder_sync (CamelStore *store,
const gchar *parent_name,
const gchar *folder_name,
- EVO3(GCancellable *cancellable,)
+ GCancellable *cancellable,
GError **error)
{
g_set_error (error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
@@ -440,7 +373,7 @@ eas_create_folder_sync (CamelStore *store,
static gboolean
eas_delete_folder_sync (CamelStore *store,
const gchar *folder_name,
- EVO3(GCancellable *cancellable,)
+ GCancellable *cancellable,
GError **error)
{
g_set_error (error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
@@ -453,7 +386,7 @@ static gboolean
eas_rename_folder_sync (CamelStore *store,
const gchar *old_name,
const gchar *new_name,
- EVO3(GCancellable *cancellable,)
+ GCancellable *cancellable,
GError **error)
{
g_set_error (error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
@@ -464,16 +397,6 @@ eas_rename_folder_sync (CamelStore *store,
gchar *
eas_get_name (CamelService *service, gboolean brief)
{
-#if !EDS_CHECK_VERSION (3,3,90)
- CamelURL *url = camel_service_get_camel_url (service);
-
- if (brief)
- return g_strdup_printf(_("ActiveSync server %s"),
- url->host);
- else
- return g_strdup_printf(_("ActiveSync service for %s on %s"),
- url->user, url->host);
-#else
CamelStoreSettings *settings = CAMEL_STORE_SETTINGS (camel_service_ref_settings (service));
const char *account_uid = camel_eas_settings_get_account_uid ((CamelEasSettings *) settings);
/* Account UID is nothing but the email or user host */
@@ -492,7 +415,6 @@ eas_get_name (CamelService *service, gboolean brief)
g_strfreev (strings);
return ret;
-#endif
}
EasEmailHandler *
@@ -501,34 +423,24 @@ camel_eas_store_get_handler (CamelEasStore *eas_store)
return g_object_ref (eas_store->priv->handler);
}
-#if EDS_CHECK_VERSION (2,33,0)
static CamelFolder *
-eas_get_trash_folder_sync (CamelStore *store, EVO3(GCancellable *cancellable,) GError **error)
+eas_get_trash_folder_sync (CamelStore *store, GCancellable *cancellable, GError **error)
{
return NULL;
}
-#endif
static gboolean
eas_can_refresh_folder (CamelStore *store, CamelFolderInfo *info, GError **error)
{
-#if EDS_CHECK_VERSION (3,3,90)
CamelStoreSettings *settings = CAMEL_STORE_SETTINGS (camel_service_ref_settings
(CAMEL_SERVICE(store)));
gboolean ret;
-#endif
+
/* Skip unselectable folders from automatic refresh */
if (info && (info->flags & CAMEL_FOLDER_NOSELECT) != 0) return FALSE;
-#if !EDS_CHECK_VERSION (3,3,90)
- /* Delegate decision to parent class */
- return CAMEL_STORE_CLASS(camel_eas_store_parent_class)->can_refresh_folder (store, info, error) ||
- (camel_url_get_param (camel_service_get_camel_url(CAMEL_SERVICE(store)),
- "check_all") != NULL);
-#else
ret = CAMEL_STORE_CLASS(camel_eas_store_parent_class)->can_refresh_folder (store, info, error) ||
camel_eas_settings_get_check_all ((CamelEasSettings *)settings);
g_object_unref(settings);
return ret;
-#endif
}
gboolean
@@ -543,7 +455,7 @@ camel_eas_store_connected (CamelEasStore *eas_store, GCancellable *cancellable,
return FALSE;
}
- if (!EVO3_sync(camel_service_connect) ((CamelService *) eas_store, cancellable, error))
+ if (!camel_service_connect_sync ((CamelService *) eas_store, cancellable, error))
return FALSE;
return TRUE;
@@ -598,27 +510,22 @@ camel_eas_store_class_init (CamelEasStoreClass *class)
object_class->finalize = eas_store_finalize;
service_class = CAMEL_SERVICE_CLASS (class);
-#if !EDS_CHECK_VERSION(3,1,0)
- service_class->construct = eas_store_construct;
- service_class->get_path = eas_service_get_path;
-#endif
-#if EDS_CHECK_VERSION(3,3,90)
service_class->settings_type = CAMEL_TYPE_EAS_SETTINGS;
-#endif
- service_class->EVO3_sync(query_auth_types) = eas_store_query_auth_types_sync;
+
+ service_class->query_auth_types_sync = eas_store_query_auth_types_sync;
service_class->get_name = eas_get_name;
- service_class->EVO3_sync(connect) = eas_connect_sync;
- service_class->EVO3_sync(disconnect) = eas_disconnect_sync;
+ service_class->connect_sync = eas_connect_sync;
+ service_class->disconnect_sync = eas_disconnect_sync;
store_class = CAMEL_STORE_CLASS (class);
- store_class->EVO3_sync(get_folder) = eas_get_folder_sync;
- store_class->EVO3_sync(create_folder) = eas_create_folder_sync;
- store_class->EVO3_sync(delete_folder) = eas_delete_folder_sync;
- store_class->EVO3_sync(rename_folder) = eas_rename_folder_sync;
- store_class->EVO3_sync(get_folder_info) = eas_get_folder_info_sync;
+ store_class->get_folder_sync = eas_get_folder_sync;
+ store_class->create_folder_sync = eas_create_folder_sync;
+ store_class->delete_folder_sync = eas_delete_folder_sync;
+ store_class->rename_folder_sync = eas_rename_folder_sync;
+ store_class->get_folder_info_sync = eas_get_folder_info_sync;
store_class->free_folder_info = camel_store_free_folder_info_full;
- EVO3(store_class->get_trash_folder_sync = eas_get_trash_folder_sync;)
+ store_class->get_trash_folder_sync = eas_get_trash_folder_sync;
store_class->can_refresh_folder = eas_can_refresh_folder;
}
diff --git a/camel/camel-eas-summary.c b/camel/camel-eas-summary.c
index b44da5e..4382104 100644
--- a/camel/camel-eas-summary.c
+++ b/camel/camel-eas-summary.c
@@ -35,7 +35,6 @@
#include "camel-eas-folder.h"
#include "camel-eas-summary.h"
-#include "camel-eas-compat.h"
#define CAMEL_EAS_SUMMARY_VERSION (1)
@@ -45,24 +44,9 @@
#define d(x)
/*Prototypes*/
-#if !EDS_CHECK_VERSION(3,3,90)
-static gint eas_summary_header_load (CamelFolderSummary *, FILE *);
-static gint eas_summary_header_save (CamelFolderSummary *, FILE *);
-
-static CamelMessageInfo *eas_message_info_migrate (CamelFolderSummary *s, FILE *in);
-
-static CamelMessageContentInfo * eas_content_info_migrate (CamelFolderSummary *s, FILE *in);
-#endif
-#if EDS_CHECK_VERSION(3,3,0)
#define SUM_DB_RETTYPE gboolean
#define SUM_DB_RET_OK TRUE
#define SUM_DB_RET_ERR FALSE
-#else
-#define SUM_DB_RETTYPE gint
-#define SUM_DB_RET_OK 0
-#define SUM_DB_RET_ERR -1
-static gboolean eas_info_set_flags(CamelMessageInfo *info, guint32 flags, guint32 set);
-#endif
static SUM_DB_RETTYPE summary_header_from_db (CamelFolderSummary *s, CamelFIRecord *mir);
static CamelFIRecord * summary_header_to_db (CamelFolderSummary *s, GError **error);
static CamelMIRecord * message_info_to_db (CamelFolderSummary *s, CamelMessageInfo *info);
@@ -125,16 +109,6 @@ camel_eas_summary_class_init (CamelEasSummaryClass *class)
folder_summary_class->content_info_size = sizeof (CamelEasMessageContentInfo);
folder_summary_class->message_info_clone = eas_message_info_clone;
folder_summary_class->message_info_free = eas_message_info_free;
-#if !EDS_CHECK_VERSION(3,3,90)
- folder_summary_class->summary_header_load = eas_summary_header_load;
- folder_summary_class->summary_header_save = eas_summary_header_save;
- folder_summary_class->message_info_migrate = eas_message_info_migrate;
- folder_summary_class->content_info_migrate = eas_content_info_migrate;
-#endif
-#if ! EDS_CHECK_VERSION(3,3,0)
- /* In EDS 3.3+ the parent class does everything we need */
- folder_summary_class->info_set_flags = eas_info_set_flags;
-#endif
folder_summary_class->summary_header_to_db = summary_header_to_db;
folder_summary_class->summary_header_from_db = summary_header_from_db;
folder_summary_class->message_info_to_db = message_info_to_db;
@@ -146,12 +120,6 @@ camel_eas_summary_class_init (CamelEasSummaryClass *class)
static void
camel_eas_summary_init (CamelEasSummary *eas_summary)
{
-#if ! EDS_CHECK_VERSION(3,3,0)
- CamelFolderSummary *summary = CAMEL_FOLDER_SUMMARY (eas_summary);
-
- /* Meta-summary - Overriding UID len */
- summary->meta_summary->uid_len = 2048;
-#endif
}
/**
@@ -168,17 +136,9 @@ camel_eas_summary_new (struct _CamelFolder *folder, const gchar *filename)
{
CamelFolderSummary *summary;
-#if EDS_CHECK_VERSION(3,3,0)
summary = g_object_new (CAMEL_TYPE_EAS_SUMMARY,
"folder", folder, NULL);
-#else
- summary = g_object_new (CAMEL_TYPE_EAS_SUMMARY, NULL);
- summary->folder = folder;
-#endif
camel_folder_summary_set_build_content (summary, TRUE);
-#if !EDS_CHECK_VERSION(3,3,90)
- camel_folder_summary_set_filename (summary, filename);
-#endif
camel_folder_summary_load_from_db (summary, NULL);
return summary;
@@ -207,24 +167,6 @@ summary_header_from_db (CamelFolderSummary *s, CamelFIRecord *mir)
return SUM_DB_RET_OK;
}
-#if !EDS_CHECK_VERSION(3,3,90)
-static gint
-eas_summary_header_load (CamelFolderSummary *s, FILE *in)
-{
- CamelEasSummary *gms = CAMEL_EAS_SUMMARY (s);
-
- if (CAMEL_FOLDER_SUMMARY_CLASS (camel_eas_summary_parent_class)->summary_header_load (s, in) == -1)
- return -1;
-
- if (camel_file_util_decode_fixed_int32(in, &gms->version) == -1)
- return -1;
-
- if (camel_file_util_decode_string (in, &gms->sync_state) == -1)
- return -1;
- return 0;
-}
-#endif
-
static CamelFIRecord *
summary_header_to_db (CamelFolderSummary *s, GError **error)
{
@@ -241,20 +183,6 @@ summary_header_to_db (CamelFolderSummary *s, GError **error)
}
-#if !EDS_CHECK_VERSION(3,3,90)
-static gint
-eas_summary_header_save (CamelFolderSummary *s, FILE *out)
-{
- CamelEasSummary *gms = CAMEL_EAS_SUMMARY(s);
-
- if (CAMEL_FOLDER_SUMMARY_CLASS (camel_eas_summary_parent_class)->summary_header_save (s, out) == -1)
- return -1;
-
- camel_file_util_encode_fixed_int32(out, CAMEL_EAS_SUMMARY_VERSION);
- return camel_file_util_encode_string (out, gms->sync_state);
-}
-#endif
-
static CamelMessageInfo *
message_info_from_db (CamelFolderSummary *s, CamelMIRecord *mir)
{
@@ -279,27 +207,6 @@ message_info_from_db (CamelFolderSummary *s, CamelMIRecord *mir)
return info;
}
-#if !EDS_CHECK_VERSION(3,3,90)
-static CamelMessageInfo *
-eas_message_info_migrate (CamelFolderSummary *s, FILE *in)
-{
- CamelMessageInfo *info;
- CamelEasMessageInfo *eas_info;
-
- info = CAMEL_FOLDER_SUMMARY_CLASS (camel_eas_summary_parent_class)->message_info_migrate (s,in);
- if (info) {
- eas_info = (CamelEasMessageInfo*) info;
- if (camel_file_util_decode_uint32 (in, &eas_info->server_flags) == -1)
- goto error;
- }
-
- return info;
-error:
- camel_message_info_free (info);
- return NULL;
-}
-#endif
-
static CamelMIRecord *
message_info_to_db (CamelFolderSummary *s, CamelMessageInfo *info)
{
@@ -333,17 +240,6 @@ content_info_from_db (CamelFolderSummary *s, CamelMIRecord *mir)
return camel_folder_summary_content_info_new (s);
}
-#if !EDS_CHECK_VERSION(3,3,90)
-static CamelMessageContentInfo *
-eas_content_info_migrate (CamelFolderSummary *s, FILE *in)
-{
- if (fgetc (in))
- return CAMEL_FOLDER_SUMMARY_CLASS (camel_eas_summary_parent_class)->content_info_migrate (s,
in);
- else
- return camel_folder_summary_content_info_new (s);
-}
-#endif
-
static SUM_DB_RETTYPE
content_info_to_db (CamelFolderSummary *s, CamelMessageContentInfo *info, CamelMIRecord *mir)
{
@@ -357,72 +253,6 @@ content_info_to_db (CamelFolderSummary *s, CamelMessageContentInfo *info, CamelM
}
}
-#if ! EDS_CHECK_VERSION(3,3,0)
-static gboolean
-eas_info_set_flags (CamelMessageInfo *info, guint32 flags, guint32 set)
-{
- guint32 old;
- CamelMessageInfoBase *mi = (CamelMessageInfoBase *)info;
- gint read = 0 , deleted = 0;
-
- gint junk_flag = 0, junk_learn_flag = 0;
-
- /* TODO: locking? */
-
- if (flags & CAMEL_MESSAGE_SEEN && ((set & CAMEL_MESSAGE_SEEN) != (mi->flags &
CAMEL_MESSAGE_SEEN)))
- { read = set & CAMEL_MESSAGE_SEEN ? 1 : -1; d(printf("Setting read as %d\n", set &
CAMEL_MESSAGE_SEEN ? 1 : 0));}
-
- if (flags & CAMEL_MESSAGE_DELETED && ((set & CAMEL_MESSAGE_DELETED) != (mi->flags &
CAMEL_MESSAGE_DELETED)))
- { deleted = set & CAMEL_MESSAGE_DELETED ? 1 : -1; d(printf("Setting deleted as %d\n", set &
CAMEL_MESSAGE_DELETED ? 1 : 0));}
-
- old = mi->flags;
- mi->flags = (old & ~flags) | (set & flags);
-
- if (old != mi->flags) {
- mi->flags |= CAMEL_MESSAGE_FOLDER_FLAGGED;
- mi->dirty = TRUE;
-
- if (((old & ~CAMEL_MESSAGE_SYSTEM_MASK) == (mi->flags &
~CAMEL_MESSAGE_SYSTEM_MASK)) )
- return FALSE;
-
- if (mi->summary) {
- mi->summary->deleted_count += deleted;
- mi->summary->unread_count -= read;
- camel_folder_summary_touch(mi->summary);
- }
- }
-
- junk_flag = ((flags & CAMEL_MESSAGE_JUNK) && (set & CAMEL_MESSAGE_JUNK));
- junk_learn_flag = ((flags & CAMEL_MESSAGE_JUNK_LEARN) && (set & CAMEL_MESSAGE_JUNK_LEARN));
-
- /* This is a hack, we are using CAMEL_MESSAGE_JUNK justo to hide the item
- * we make sure this doesn't have any side effects*/
-
- if (junk_learn_flag && !junk_flag && (old & CAMEL_GW_MESSAGE_JUNK)) {
- /*
- This has ugly side-effects. Evo will never learn unjunk.
- We need to create one CAMEL_MESSAGE_HIDDEN flag which must be
- used for all hiding operations. We must also get rid of the seperate file
- that is maintained somewhere in evolution/mail/em-folder-browser.c for
hidden messages
- */
- mi->flags |= CAMEL_GW_MESSAGE_NOJUNK | CAMEL_MESSAGE_JUNK |
CAMEL_MESSAGE_JUNK_LEARN;
- } else if (junk_learn_flag && junk_flag && !(old & CAMEL_GW_MESSAGE_JUNK)) {
- mi->flags |= CAMEL_GW_MESSAGE_JUNK | CAMEL_MESSAGE_JUNK |
CAMEL_MESSAGE_JUNK_LEARN;
- }
-
- if (mi->summary && mi->summary->folder && mi->uid) {
- CamelFolderChangeInfo *changes = camel_folder_change_info_new();
-
- camel_folder_change_info_change_uid(changes, camel_message_info_uid(info));
- camel_folder_changed (mi->summary->folder, changes);
- camel_folder_change_info_free(changes);
- camel_folder_summary_touch(mi->summary);
- }
-
- return TRUE;
-}
-#endif
-
void
camel_eas_summary_add_message (CamelFolderSummary *summary,
const gchar *uid,
@@ -466,92 +296,14 @@ camel_eas_summary_add_message_info (CamelFolderSummary *summary,
{
CamelMessageInfoBase *binfo = (CamelMessageInfoBase *) mi;
CamelEasMessageInfo *einfo = (CamelEasMessageInfo *) mi;
-#if ! EDS_CHECK_VERSION(3,3,0)
-#endif
binfo->flags |= server_flags;
einfo->server_flags = server_flags;
-#if ! EDS_CHECK_VERSION(3,3,0)
-{
- gint unread=0, junk=0;
- guint32 flags;
- /* TODO update user flags */
-
- /* update the summary count */
- flags = binfo->flags;
-
- if (!(flags & CAMEL_MESSAGE_SEEN))
- unread = 1;
-
- if (flags & CAMEL_MESSAGE_JUNK)
- junk = 1;
-
- if (summary) {
- if (unread)
- summary->unread_count += unread;
- if (junk)
- summary->junk_count += junk;
- summary->visible_count++;
- if (junk)
- summary->visible_count -= junk;
-
- summary->saved_count++;
- camel_folder_summary_touch (summary);
- }
-}
-#endif
-
binfo->flags &= ~CAMEL_MESSAGE_FOLDER_FLAGGED;
camel_folder_summary_add (summary, (CamelMessageInfo *)mi);
}
-#if ! EDS_CHECK_VERSION(3,3,0)
-/* Caller should use camel_db_delete_uids to permanently delete the mi
- from summary */
-void
-camel_eas_summary_delete_id (CamelFolderSummary *summary,
- const gchar *uid)
-{
- CamelMessageInfo *mi;
-
- mi = camel_folder_summary_get (summary, uid);
- if (mi) {
- CamelMessageInfoBase *dinfo = (CamelMessageInfoBase *) mi;
- gint unread=0, deleted=0, junk=0;
- guint32 flags;
-
- flags = dinfo->flags;
- if (!(flags & CAMEL_MESSAGE_SEEN))
- unread = 1;
-
- if (flags & CAMEL_MESSAGE_DELETED)
- deleted = 1;
-
- if (flags & CAMEL_MESSAGE_JUNK)
- junk = 1;
-
- if (unread)
- summary->unread_count--;
-
- if (deleted)
- summary->deleted_count--;
- if (junk)
- summary->junk_count--;
-
- if (junk && !deleted)
- summary->junk_not_deleted_count--;
-
- if (!junk && !deleted)
- summary->visible_count--;
-
- summary->saved_count--;
- camel_message_info_free (mi);
- }
- camel_folder_summary_remove_uid_fast (summary, uid);
-}
-#endif
-
static gboolean
eas_update_user_flags (CamelMessageInfo *info, CamelFlag *server_user_flags)
{
@@ -586,44 +338,8 @@ camel_eas_update_message_info_flags (CamelFolderSummary *summary,
server_set = server_flags & ~einfo->server_flags;
server_cleared = einfo->server_flags & ~server_flags;
-#if ! EDS_CHECK_VERSION(3,3,0)
-{
- gint read=0, deleted=0, junk=0;
-
- if (server_set & CAMEL_MESSAGE_SEEN)
- read = 1;
- else if (server_cleared & CAMEL_MESSAGE_SEEN)
- read = -1;
-
- if (server_set & CAMEL_MESSAGE_DELETED)
- deleted = 1;
- else if (server_cleared & CAMEL_MESSAGE_DELETED)
- deleted = -1;
-
- if (server_set & CAMEL_MESSAGE_JUNK)
- junk = 1;
- else if (server_cleared & CAMEL_MESSAGE_JUNK)
- junk = -1;
-
- if (read) {
- summary->unread_count -= read;
- }
- if (deleted)
- summary->deleted_count += deleted;
- if (junk)
- summary->junk_count += junk;
- if (junk && !deleted)
- summary->junk_not_deleted_count += junk;
- if (junk || deleted)
- summary->visible_count -= junk ? junk : deleted;
-
- einfo->info.flags = (einfo->info.flags | server_set) & ~server_cleared;
- einfo->info.dirty = TRUE;
-}
-#else
camel_message_info_set_flags (info, server_set | server_cleared,
(einfo->info.flags | server_set) & ~server_cleared);
-#endif
einfo->server_flags = server_flags;
if (info->summary)
camel_folder_summary_touch (info->summary);
@@ -644,14 +360,9 @@ eas_summary_clear (CamelFolderSummary *summary,
CamelFolderChangeInfo *changes;
const gchar *uid;
gint i;
-#if EDS_CHECK_VERSION(3,3,0)
GPtrArray *known_uids;
-#else
- gint count;
-#endif
changes = camel_folder_change_info_new ();
-#if EDS_CHECK_VERSION(3,3,0)
known_uids = camel_folder_summary_get_array (summary);
for (i = 0; i < known_uids->len; i++) {
uid = g_ptr_array_index (known_uids, i);
@@ -664,28 +375,11 @@ eas_summary_clear (CamelFolderSummary *summary,
}
camel_folder_summary_clear (summary, NULL);
-#else
- count = camel_folder_summary_count (summary);
- for (i = 0; i < count; i++) {
- CamelMessageInfo *info;
- if (!(info = camel_folder_summary_index (summary, i)))
- continue;
-
- uid = camel_message_info_uid (info);
- camel_folder_change_info_remove_uid (changes, uid);
- camel_folder_summary_remove_uid (summary, uid);
- camel_message_info_free(info);
- }
-
- camel_folder_summary_clear_db (summary);
-#endif
/*camel_folder_summary_save (summary);*/
if (camel_folder_change_info_changed (changes))
camel_folder_changed (camel_folder_summary_get_folder (summary), changes);
camel_folder_change_info_free (changes);
-#if EDS_CHECK_VERSION(3,3,0)
camel_folder_summary_free_array (known_uids);
-#endif
}
diff --git a/camel/camel-eas-summary.h b/camel/camel-eas-summary.h
index d18910e..17e59da 100644
--- a/camel/camel-eas-summary.h
+++ b/camel/camel-eas-summary.h
@@ -102,11 +102,6 @@ void camel_eas_summary_add_message_info
(CamelFolderSummary *summary,
guint32 server_flags,
CamelMessageInfo *info);
-#if ! EDS_CHECK_VERSION(3,3,0)
-void
-camel_eas_summary_delete_id (CamelFolderSummary *summary,
- const gchar *id);
-#endif
void eas_summary_clear (CamelFolderSummary *summary,
gboolean uncache);
diff --git a/camel/camel-eas-transport.c b/camel/camel-eas-transport.c
index 916031b..873b5af 100644
--- a/camel/camel-eas-transport.c
+++ b/camel/camel-eas-transport.c
@@ -31,20 +31,16 @@
#include <glib/gi18n-lib.h>
-#include <camel-eas-compat.h>
-
#include "camel-eas-store.h"
#include "camel-eas-transport.h"
-#if EDS_CHECK_VERSION(3,3,90)
#include "camel-eas-settings.h"
-#endif
G_DEFINE_TYPE (CamelEasTransport, camel_eas_transport, CAMEL_TYPE_TRANSPORT)
static gboolean
eas_transport_connect_sync (CamelService *service,
- EVO3(GCancellable *cancellable,)
+ GCancellable *cancellable,
GError **error)
{
return TRUE;
@@ -55,7 +51,6 @@ eas_transport_get_name (CamelService *service,
gboolean brief)
{
const gchar *host;
-#if EDS_CHECK_VERSION(3,3,90)
CamelNetworkSettings *network_settings;
CamelSettings *settings;
@@ -64,9 +59,6 @@ eas_transport_get_name (CamelService *service,
network_settings = CAMEL_NETWORK_SETTINGS (settings);
host = camel_network_settings_get_host (network_settings);
g_object_unref (settings);
-#else
- host = camel_service_get_camel_url (service)->host;
-#endif
if (brief)
return g_strdup_printf (
@@ -81,7 +73,7 @@ eas_send_to_sync (CamelTransport *transport,
CamelMimeMessage *message,
CamelAddress *from,
CamelAddress *recipients,
- EVO3(GCancellable *cancellable,)
+ GCancellable *cancellable,
GError **error)
{
gpointer progress_data;
@@ -94,20 +86,13 @@ eas_send_to_sync (CamelTransport *transport,
const gchar *msgid;
int fd;
gboolean res;
-#if EDS_CHECK_VERSION(3,3,90)
CamelStoreSettings *settings = CAMEL_STORE_SETTINGS (camel_service_ref_settings (service));
-#endif
- EVO3(progress_data = cancellable);
- EVO2(progress_data = camel_operation_registered());
+ progress_data = cancellable;
-#if EDS_CHECK_VERSION(3,3,90)
account_uid = g_strdup(camel_eas_settings_get_account_uid ((CamelEasSettings *) settings));
g_object_unref(settings);
-#else
- account_uid = camel_url_get_param (camel_service_get_camel_url(service),
- "account_uid");
-#endif
+
handler = eas_mail_handler_new (account_uid, error);
if (!handler)
return FALSE;
@@ -138,11 +123,11 @@ eas_send_to_sync (CamelTransport *transport,
camel_stream_filter_add (CAMEL_STREAM_FILTER (filtered), filter);
g_object_unref (filter);
- EVO3_sync(camel_data_wrapper_write_to_stream)
+ camel_data_wrapper_write_to_stream_sync
(CAMEL_DATA_WRAPPER (message),
- filtered, EVO3(cancellable,) error);
- camel_stream_flush (filtered, EVO3(cancellable,) error);
- camel_stream_flush (mimefile, EVO3(cancellable,) error);
+ filtered, cancellable, error);
+ camel_stream_flush (filtered, cancellable, error);
+ camel_stream_flush (mimefile, cancellable, error);
g_object_unref (mimefile);
g_object_unref (filtered);
@@ -164,14 +149,12 @@ camel_eas_transport_class_init (CamelEasTransportClass *class)
CamelTransportClass *transport_class;
service_class = CAMEL_SERVICE_CLASS (class);
-#if EDS_CHECK_VERSION(3,3,90)
service_class->settings_type = CAMEL_TYPE_EAS_SETTINGS;
-#endif
- service_class->EVO3_sync(connect) = eas_transport_connect_sync;
+ service_class->connect_sync = eas_transport_connect_sync;
service_class->get_name = eas_transport_get_name;
transport_class = CAMEL_TRANSPORT_CLASS (class);
- transport_class->EVO3_sync(send_to) = eas_send_to_sync;
+ transport_class->send_to_sync = eas_send_to_sync;
}
static void
diff --git a/camel/camel-eas-utils.c b/camel/camel-eas-utils.c
index feca7a7..b4a5ef7 100644
--- a/camel/camel-eas-utils.c
+++ b/camel/camel-eas-utils.c
@@ -37,7 +37,6 @@
#include <eas-folder.h>
#include "camel-eas-utils.h"
-#include "camel-eas-compat.h"
CamelFolderInfo *
camel_eas_utils_build_folder_info (CamelEasStore *store, const gchar *fid)
@@ -45,34 +44,11 @@ camel_eas_utils_build_folder_info (CamelEasStore *store, const gchar *fid)
CamelEasStoreSummary *eas_summary = store->summary;
CamelFolderInfo *fi;
-#if !EDS_CHECK_VERSION(3,1,0)
- gchar *url;
-
- url = camel_url_to_string (camel_service_get_camel_url(CAMEL_SERVICE (store)),
- (CAMEL_URL_HIDE_PASSWORD|
- CAMEL_URL_HIDE_PARAMS|
- CAMEL_URL_HIDE_AUTH) );
-
- if ( url[strlen (url) - 1] != '/') {
- gchar *temp_url;
-
- temp_url = g_strconcat (url, "/", NULL);
- g_free ((gchar *)url);
- url = temp_url;
- }
-#endif
-
fi = camel_folder_info_new ();
fi->full_name = camel_eas_store_summary_get_folder_full_name (eas_summary,
fid, NULL);
-#if EDS_CHECK_VERSION(3,1,0)
fi->display_name = camel_eas_store_summary_get_folder_name (eas_summary,
fid, NULL);
-#else
- fi->name = camel_eas_store_summary_get_folder_name (eas_summary,
- fid, NULL);
- fi->uri = g_strconcat (url, fi->full_name, NULL);
-#endif
switch (camel_eas_store_summary_get_folder_type (eas_summary, fid, NULL)) {
case EAS_FOLDER_TYPE_DEFAULT_INBOX:
@@ -90,9 +66,6 @@ camel_eas_utils_build_folder_info (CamelEasStore *store, const gchar *fid)
default:
;
}
-#if !EDS_CHECK_VERSION(3,1,0)
- g_free (url);
-#endif
return fi;
}
@@ -254,11 +227,7 @@ camel_eas_utils_sync_deleted_items (CamelEasFolder *eas_folder, GSList *items_de
CamelEasStore *eas_store;
GSList *l;
int count = 0;
-#if EDS_CHECK_VERSION(3,3,0)
GList *uids_deleted = NULL;
-#else
- GSList *uids_deleted = NULL;
-#endif
ci = camel_folder_change_info_new ();
eas_store = (CamelEasStore *) camel_folder_get_parent_store ((CamelFolder *) eas_folder);
@@ -269,12 +238,7 @@ camel_eas_utils_sync_deleted_items (CamelEasFolder *eas_folder, GSList *items_de
for (l = items_deleted; l != NULL; l = g_slist_next (l)) {
EasEmailInfo *item = l->data;
-#if ! EDS_CHECK_VERSION(3,3,0)
- camel_eas_summary_delete_id (folder->summary, item->server_id);
- uids_deleted = g_slist_prepend (uids_deleted, item->server_id);
-#else
uids_deleted = g_list_prepend (uids_deleted, item->server_id);
-#endif
camel_folder_change_info_remove_uid (ci, item->server_id);
camel_data_cache_remove (eas_folder->cache, "cur", item->server_id, NULL);
count++;
@@ -286,11 +250,7 @@ camel_eas_utils_sync_deleted_items (CamelEasFolder *eas_folder, GSList *items_de
g_slist_foreach (items_deleted, (GFunc) g_object_unref, NULL);
g_slist_free (items_deleted);
-#if EDS_CHECK_VERSION(3,3,0)
g_list_free (uids_deleted);
-#else
- g_slist_free (uids_deleted);
-#endif
return count;
}
@@ -303,13 +263,9 @@ camel_eas_utils_clear_folder (CamelEasFolder *eas_folder)
CamelFolderChangeInfo *ci;
CamelEasStore *eas_store;
gchar *uid;
-#if EDS_CHECK_VERSION(3,3,0)
GList *uids_deleted = NULL;
GPtrArray *known_uids = NULL;
int i;
-#else
- GSList *uids_deleted = NULL;
-#endif
if (!camel_folder_summary_count (folder->summary))
return;
@@ -320,7 +276,6 @@ camel_eas_utils_clear_folder (CamelEasFolder *eas_folder)
folder = (CamelFolder *) eas_folder;
full_name = camel_folder_get_full_name (folder);
-#if EDS_CHECK_VERSION(3,3,0)
known_uids = camel_folder_summary_get_array (folder->summary);
if (!known_uids)
return;
@@ -333,17 +288,6 @@ camel_eas_utils_clear_folder (CamelEasFolder *eas_folder)
}
camel_db_delete_uids (((CamelStore *)eas_store)->cdb_w, full_name, uids_deleted, NULL);
g_list_free (uids_deleted);
-#else
- while ( (uid = camel_folder_summary_uid_from_index (folder->summary, 0)) ) {
- camel_eas_summary_delete_id (folder->summary, uid);
- camel_folder_change_info_remove_uid (ci, uid);
- uids_deleted = g_slist_prepend (uids_deleted, uid);
- camel_data_cache_remove (eas_folder->cache, "cur", uid, NULL);
- }
- camel_db_delete_uids (((CamelStore *)eas_store)->cdb_w, full_name, uids_deleted, NULL);
- g_slist_foreach (uids_deleted, (GFunc) g_free, NULL);
- g_slist_free (uids_deleted);
-#endif
camel_folder_changed ((CamelFolder *) eas_folder, ci);
camel_folder_change_info_free (ci);
diff --git a/configure.ac b/configure.ac
index 830f1e9..74d93ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,18 +64,8 @@ PKG_CHECK_MODULES(LIBEBOOK, libebook-1.2)
PKG_CHECK_MODULES(LIBEBACKEND, libebackend-1.2)
PKG_CHECK_MODULES(GCONF, gconf-2.0)
-
-if $PKG_CONFIG --atleast-version=3.0 libedataserver-1.2; then
- EVO_PKG="-3.0"
-else
- EVO_PKG=""
-fi
-
-if $PKG_CONFIG --atleast-version=3.3 libedataserver-1.2; then
- CAMEL_PKG="camel-1.2"
-else
- CAMEL_PKG="camel-provider-1.2"
-fi
+EVO_PKG="-3.0"
+CAMEL_PKG="camel-1.2"
PKG_CHECK_MODULES(CAMEL, ${CAMEL_PKG})
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
