GNOME.org
 

[evolution-kolab: 1/3] updated IMAPX files as of EDS commit d8e2035026e456a1eda8eaa2a8e9226939ba6f5d

commit 9ed742a5e35313fd0dc9587312a38e67ec8a0439
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Mon Mar 5 16:07:07 2012 +0100

    updated IMAPX files as of EDS commit d8e2035026e456a1eda8eaa2a8e9226939ba6f5d
    
    * updated the local IMAPX code from upstream
    * now at EDS commit
      d8e2035026e456a1eda8eaa2a8e9226939ba6f5d

 src/camel/providers/imapx/camel-imapx-folder.c   |   30 ++++----
 src/camel/providers/imapx/camel-imapx-provider.c |    2 +-
 src/camel/providers/imapx/camel-imapx-server.c   |   77 +++++++++-------------
 src/camel/providers/imapx/camel-imapx-server.h   |    8 +-
 src/camel/providers/imapx/camel-imapx-store.c    |    2 +-
 src/camel/providers/imapx/camel-imapx-utils.c    |    4 +-
 6 files changed, 54 insertions(+), 69 deletions(-)
---
diff --git a/src/camel/providers/imapx/camel-imapx-folder.c b/src/camel/providers/imapx/camel-imapx-folder.c
index 9505554..7122f7e 100644
--- a/src/camel/providers/imapx/camel-imapx-folder.c
+++ b/src/camel/providers/imapx/camel-imapx-folder.c
@@ -156,7 +156,7 @@ imapx_folder_get_apply_filters (CamelIMAPXFolder *folder)
 
 static void
 imapx_folder_set_apply_filters (CamelIMAPXFolder *folder,
-				gboolean apply_filters)
+                                gboolean apply_filters)
 {
 	g_return_if_fail (folder != NULL);
 	g_return_if_fail (CAMEL_IS_IMAPX_FOLDER (folder));
@@ -171,9 +171,9 @@ imapx_folder_set_apply_filters (CamelIMAPXFolder *folder,
 
 static void
 imapx_folder_set_property (GObject *object,
-			   guint property_id,
-			   const GValue *value,
-			   GParamSpec *pspec)
+                           guint property_id,
+                           const GValue *value,
+                           GParamSpec *pspec)
 {
 	switch (property_id) {
 		case PROP_APPLY_FILTERS:
@@ -188,9 +188,9 @@ imapx_folder_set_property (GObject *object,
 
 static void
 imapx_folder_get_property (GObject *object,
-			   guint property_id,
-			   GValue *value,
-			   GParamSpec *pspec)
+                           guint property_id,
+                           GValue *value,
+                           GParamSpec *pspec)
 {
 	switch (property_id) {
 		case PROP_APPLY_FILTERS:
@@ -454,10 +454,10 @@ imapx_expunge_sync (CamelFolder *folder,
 
 static gboolean
 imapx_fetch_messages_sync (CamelFolder *folder,
-			   CamelFetchType type,
-			   int limit,
-			   GCancellable *cancellable,
-			   GError **error)
+                           CamelFetchType type,
+                           gint limit,
+                           GCancellable *cancellable,
+                           GError **error)
 {
 	CamelStore *parent_store;
 	CamelIMAPXStore *istore;
@@ -558,10 +558,10 @@ imapx_get_message_sync (CamelFolder *folder,
 
 static gboolean
 imapx_purge_message_cache_sync (CamelFolder *folder,
-				gchar *start_uid,
-				gchar *end_uid,
-				GCancellable *cancellable,
-				GError **error)
+                                gchar *start_uid,
+                                gchar *end_uid,
+                                GCancellable *cancellable,
+                                GError **error)
 {
 	/* Not Implemented for now. */
 	return TRUE;
diff --git a/src/camel/providers/imapx/camel-imapx-provider.c b/src/camel/providers/imapx/camel-imapx-provider.c
index 14bb8ba..aa99fd9 100644
--- a/src/camel/providers/imapx/camel-imapx-provider.c
+++ b/src/camel/providers/imapx/camel-imapx-provider.c
@@ -101,7 +101,7 @@ static CamelProvider imapx_provider = {
 
 	CAMEL_PROVIDER_IS_REMOTE | CAMEL_PROVIDER_IS_SOURCE |
 	CAMEL_PROVIDER_IS_STORAGE | CAMEL_PROVIDER_SUPPORTS_SSL|
-	CAMEL_PROVIDER_SUPPORTS_MOBILE_DEVICES | 
+	CAMEL_PROVIDER_SUPPORTS_MOBILE_DEVICES |
 	CAMEL_PROVIDER_SUPPORTS_BATCH_FETCH |
 	CAMEL_PROVIDER_SUPPORTS_PURGE_MESSAGE_CACHE,
 
diff --git a/src/camel/providers/imapx/camel-imapx-server.c b/src/camel/providers/imapx/camel-imapx-server.c
index 7c38064..51d1975 100644
--- a/src/camel/providers/imapx/camel-imapx-server.c
+++ b/src/camel/providers/imapx/camel-imapx-server.c
@@ -952,10 +952,7 @@ imapx_expunge_uid_from_summary (CamelIMAPXServer *is,
 	camel_folder_change_info_remove_uid (is->changes, uid);
 
 	if (imapx_idle_supported (is) && imapx_in_idle (is)) {
-		const gchar *full_name;
-
-		full_name = camel_folder_get_full_name (is->select_folder);
-		camel_db_delete_uids (is->store->cdb_w, full_name, is->expunged, NULL);
+		camel_folder_summary_save_to_db (is->select_folder->summary, NULL);
 		imapx_update_store_summary (is->select_folder);
 		camel_folder_changed (is->select_folder, is->changes);
 
@@ -1740,14 +1737,7 @@ imapx_completion (CamelIMAPXServer *is,
 	c(is->tagprefix, "Got completion response for command %05u '%s'\n", ic->tag, ic->name);
 
 	if (camel_folder_change_info_changed (is->changes)) {
-		if (is->changes->uid_changed->len)
-			camel_folder_summary_save_to_db (is->select_folder->summary, NULL);
-		else {
-			const gchar *full_name;
-
-			full_name = camel_folder_get_full_name (is->select_folder);
-			camel_db_delete_uids (is->store->cdb_w, full_name, is->expunged, NULL);
-		}
+		camel_folder_summary_save_to_db (is->select_folder->summary, NULL);
 
 		g_list_free_full (is->expunged, (GDestroyNotify) g_free);
 		is->expunged = NULL;
@@ -3648,8 +3638,8 @@ imapx_command_step_fetch_done (CamelIMAPXServer *is,
 	camel_folder_change_info_clear (data->changes);
 
 	if (i < data->infos->len) {
-		int total = camel_folder_summary_count (job->folder->summary);
-		int fetch_limit = data->fetch_msg_limit;
+		gint total = camel_folder_summary_count (job->folder->summary);
+		gint fetch_limit = data->fetch_msg_limit;
 
 		camel_imapx_command_unref (ic);
 
@@ -3877,13 +3867,12 @@ imapx_job_scan_changes_done (CamelIMAPXServer *is,
 		}
 
 		if (removed != NULL) {
-			const gchar *full_name;
+			camel_folder_summary_touch (s);
 
-			full_name = camel_folder_get_full_name (camel_folder_summary_get_folder (s));
-			camel_db_delete_uids (is->store->cdb_w, full_name, removed, NULL);
 			g_list_free_full (removed, (GDestroyNotify) g_free);
 		}
 
+		camel_folder_summary_save_to_db (s, NULL);
 		imapx_update_store_summary (job->folder);
 
 		if (camel_folder_change_info_changed (data->changes))
@@ -3985,8 +3974,8 @@ imapx_command_fetch_new_messages_done (CamelIMAPXServer *is,
 	}
 
 	if (camel_folder_change_info_changed (data->changes)) {
-		imapx_update_store_summary (job->folder);
 		camel_folder_summary_save_to_db (job->folder->summary, NULL);
+		imapx_update_store_summary (job->folder);
 		camel_folder_changed (job->folder, data->changes);
 		camel_folder_change_info_clear (data->changes);
 	}
@@ -4109,12 +4098,11 @@ imapx_job_fetch_new_messages_start (CamelIMAPXJob *job,
 
 static void
 imapx_job_fetch_messages_start (CamelIMAPXJob *job,
-				CamelIMAPXServer *is)
+                                CamelIMAPXServer *is)
 {
 	CamelIMAPXCommand *ic;
 	CamelFolder *folder = job->folder;
-	CamelIMAPXFolder *ifolder = (CamelIMAPXFolder *) folder;
-	guint32 total, diff;
+	guint32 total;
 	gchar *start_uid = NULL, *end_uid = NULL;
 	CamelFetchType ftype;
 	gint fetch_limit;
@@ -4122,10 +4110,10 @@ imapx_job_fetch_messages_start (CamelIMAPXJob *job,
 	CamelService *service;
 	CamelSettings *settings;
 	guint uidset_size;
-        RefreshInfoData *data;
+	RefreshInfoData *data;
 
-        data = camel_imapx_job_get_data (job);
-        g_return_if_fail (data != NULL);
+	data = camel_imapx_job_get_data (job);
+	g_return_if_fail (data != NULL);
 
 	service = CAMEL_SERVICE (is->store);
 	settings = camel_service_get_settings (service);
@@ -4134,7 +4122,6 @@ imapx_job_fetch_messages_start (CamelIMAPXJob *job,
 		CAMEL_IMAPX_SETTINGS (settings));
 
 	total = camel_folder_summary_count (folder->summary);
-	diff = ifolder->exists_on_server - total;
 
 	ftype = data->fetch_type;
 	fetch_limit = data->fetch_msg_limit;
@@ -4142,10 +4129,10 @@ imapx_job_fetch_messages_start (CamelIMAPXJob *job,
 	uidset_size = camel_imapx_settings_get_batch_fetch_count (
 		CAMEL_IMAPX_SETTINGS (settings));
 
-	if (ftype == CAMEL_FETCH_NEW_MESSAGES || 
+	if (ftype == CAMEL_FETCH_NEW_MESSAGES ||
 		(ftype ==  CAMEL_FETCH_OLD_MESSAGES && total <=0 )) {
 
-		char *uid;
+		gchar *uid;
 
 		if (total > 0) {
 			/* This means that we are fetching limited number of new mails */
@@ -4181,7 +4168,7 @@ imapx_job_fetch_messages_start (CamelIMAPXJob *job,
 			job->cancellable,
 			ngettext ("Fetching summary information for %d message in %s",
 				  "Fetching summary information for %d messages in %s", data->fetch_msg_limit),
-			data->fetch_msg_limit, camel_folder_get_full_name (folder));		
+			data->fetch_msg_limit, camel_folder_get_full_name (folder));
 		/* New account and fetching old messages, we would return just the limited number of newest messages */
 		ic = camel_imapx_command_new (
 			is, "FETCH", job->folder, 
@@ -4202,16 +4189,16 @@ imapx_job_fetch_messages_start (CamelIMAPXJob *job,
 
 		return;
 	} else if (ftype == CAMEL_FETCH_OLD_MESSAGES && total > 0) {
-			unsigned long long uidl;
+			guint64 uidl;
 			start_uid = imapx_get_uid_from_index (folder->summary, 0);
-			uidl = strtoull(start_uid, NULL, 10);
+			uidl = strtoull (start_uid, NULL, 10);
 			end_uid = g_strdup_printf("%lld", (((int)uidl)-fetch_limit > 0) ? (uidl-fetch_limit) : 1);
 
-			camel_operation_push_message(
+			camel_operation_push_message (
 				job->cancellable,
 				ngettext ("Fetching summary information for %d message in %s",
 					  "Fetching summary information for %d messages in %s", data->fetch_msg_limit),
-				data->fetch_msg_limit, camel_folder_get_full_name (folder));		
+				data->fetch_msg_limit, camel_folder_get_full_name (folder));
 
 			ic = camel_imapx_command_new (is, "FETCH", job->folder,
 						"UID FETCH %s:%s (RFC822.SIZE RFC822.HEADER FLAGS)", start_uid, end_uid);
@@ -4483,7 +4470,6 @@ imapx_command_expunge_done (CamelIMAPXServer *is,
 				removed = g_list_prepend (removed, (gpointer) uids->pdata[i]);
 			}
 
-			camel_db_delete_uids (parent_store->cdb_w, full_name, removed, NULL);
 			camel_folder_summary_save_to_db (folder->summary, NULL);
 			camel_folder_changed (folder, changes);
 			camel_folder_change_info_free (changes);
@@ -6215,29 +6201,29 @@ imapx_job_fetch_messages_matches (CamelIMAPXJob *job,
                                       CamelFolder *folder,
                                       const gchar *uid)
 {
-        return (folder == job->folder);
+	return (folder == job->folder);
 }
 
-gboolean	
+gboolean
 camel_imapx_server_fetch_messages (CamelIMAPXServer *is,
-				   CamelFolder *folder,
-				   CamelFetchType type,
-				   int limit,
-				   GCancellable *cancellable,
-				   GError **error)
+                                   CamelFolder *folder,
+                                   CamelFetchType type,
+                                   gint limit,
+                                   GCancellable *cancellable,
+                                   GError **error)
 {
 	CamelIMAPXJob *job;
 	RefreshInfoData *data;
 	gboolean registered = TRUE;
 	const gchar *full_name;
 	gboolean success = TRUE;
-	unsigned long long firstuid, newfirstuid;
+	guint64 firstuid, newfirstuid;
 	gchar *uid;
- 	int old_len;
+	gint old_len;
 
 	old_len = camel_folder_summary_count (folder->summary);
 	uid = imapx_get_uid_from_index (folder->summary, 0);
-	firstuid = strtoull(uid, NULL, 10);
+	firstuid = strtoull (uid, NULL, 10);
 	g_free (uid);
 
 	QUEUE_LOCK (is);
@@ -6249,7 +6235,6 @@ camel_imapx_server_fetch_messages (CamelIMAPXServer *is,
 		return TRUE;
 	}
 
-
 	data = g_slice_new0 (RefreshInfoData);
 	data->changes = camel_folder_change_info_new ();
 	data->fetch_msg_limit = limit;
@@ -6263,7 +6248,7 @@ camel_imapx_server_fetch_messages (CamelIMAPXServer *is,
 	job->pri = IMAPX_PRIORITY_NEW_MESSAGES;
 
 	full_name = camel_folder_get_full_name (folder);
-	
+
 	if (g_ascii_strcasecmp(full_name, "INBOX") == 0)
 		job->pri += 10;
 
@@ -6280,7 +6265,7 @@ camel_imapx_server_fetch_messages (CamelIMAPXServer *is,
 		camel_folder_changed (folder, data->changes);
 
 	uid = imapx_get_uid_from_index (folder->summary, 0);
-	newfirstuid = strtoull(uid, NULL, 10);
+	newfirstuid = strtoull (uid, NULL, 10);
 	g_free (uid);
 
 	camel_imapx_job_unref (job);
diff --git a/src/camel/providers/imapx/camel-imapx-server.h b/src/camel/providers/imapx/camel-imapx-server.h
index a7ce0a3..0172228 100644
--- a/src/camel/providers/imapx/camel-imapx-server.h
+++ b/src/camel/providers/imapx/camel-imapx-server.h
@@ -166,13 +166,13 @@ gboolean	camel_imapx_server_expunge	(CamelIMAPXServer *is,
 						 CamelFolder *folder,
 						 GCancellable *cancellable,
 						 GError **error);
-gboolean	camel_imapx_server_fetch_messages 		
+gboolean	camel_imapx_server_fetch_messages
 						(CamelIMAPXServer *is,
-                                       		 CamelFolder *folder,
+						 CamelFolder *folder,
 						 CamelFetchType type,
-				       		 int limit,
+						 gint limit,
 						 GCancellable *cancellable,
-                                       		 GError **error);
+						 GError **error);
 gboolean	camel_imapx_server_noop		(CamelIMAPXServer *is,
 						 CamelFolder *folder,
 						 GCancellable *cancellable,
diff --git a/src/camel/providers/imapx/camel-imapx-store.c b/src/camel/providers/imapx/camel-imapx-store.c
index 3b1d55c..2253f84 100644
--- a/src/camel/providers/imapx/camel-imapx-store.c
+++ b/src/camel/providers/imapx/camel-imapx-store.c
@@ -392,7 +392,7 @@ fill_fi (CamelStore *store,
          guint32 flags)
 {
 	CamelFolder *folder;
-	CamelService *service = (CamelService *)store;
+	CamelService *service = (CamelService *) store;
 	CamelSettings *settings;
 	gboolean mobile_mode;
 
diff --git a/src/camel/providers/imapx/camel-imapx-utils.c b/src/camel/providers/imapx/camel-imapx-utils.c
index 776f615..0b50d5d 100644
--- a/src/camel/providers/imapx/camel-imapx-utils.c
+++ b/src/camel/providers/imapx/camel-imapx-utils.c
@@ -333,8 +333,8 @@ imapx_update_store_summary (CamelFolder *folder)
 
 			if (!mobile_mode)
 				si->unread = unread;
-			else 
-				si->unread =  ((CamelIMAPXFolder *)folder)->unread_on_server;
+			else
+				si->unread =  ((CamelIMAPXFolder *) folder)->unread_on_server;
 			si->total = total;
 
 			camel_store_summary_touch ((CamelStoreSummary *)((CamelIMAPXStore *) parent_store)->summary);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]