GNOME.org
 

[evolution-mapi] Coding style and whitespace cleanup.

commit 07ed28a07032f43e272bc3ae5db4da1490df44a7
Author: Matthew Barnes <mbarnes redhat com>
Date:   Mon Aug 2 18:02:21 2010 -0400

    Coding style and whitespace cleanup.

 .../exchange-mapi-account-listener.c               |   44 +++++++++-----------
 .../exchange-mapi-account-settings.c               |    1 -
 .../exchange-mapi-account-setup.c                  |    2 +-
 src/addressbook/e-book-backend-mapi-contacts.c     |    5 +-
 src/addressbook/e-book-backend-mapi.c              |    6 +-
 src/calendar/e-cal-backend-mapi.c                  |   18 ++++----
 src/camel/camel-mapi-folder.c                      |    7 +--
 src/camel/camel-mapi-store.c                       |   38 ++++++++--------
 src/libexchangemapi/em-operation-queue.c           |    1 -
 src/libexchangemapi/exchange-mapi-cal-utils.c      |   30 +++++++-------
 src/libexchangemapi/exchange-mapi-connection.c     |    4 +-
 src/libexchangemapi/exchange-mapi-connection.h     |    2 +-
 src/libexchangemapi/exchange-mapi-mail-utils.c     |    1 -
 src/libexchangemapi/exchange-mapi-utils.c          |    2 +-
 14 files changed, 75 insertions(+), 86 deletions(-)
---
diff --git a/src/account-setup-eplugin/exchange-mapi-account-listener.c b/src/account-setup-eplugin/exchange-mapi-account-listener.c
index 9ce653d..52014bc 100644
--- a/src/account-setup-eplugin/exchange-mapi-account-listener.c
+++ b/src/account-setup-eplugin/exchange-mapi-account-listener.c
@@ -191,7 +191,6 @@ add_cal_esource (EAccount *account, GSList *folders, ExchangeMAPIFolderType fold
 	GSList *ids, *temp_list, *old_sources = NULL;
 	gchar *base_uri = NULL;
 	gboolean is_new_group = FALSE;
-	
 
 	if (folder_type == MAPI_FOLDER_TYPE_APPOINTMENT) {
 		conf_key = CALENDAR_SOURCES;
@@ -307,7 +306,7 @@ add_cal_esource (EAccount *account, GSList *folders, ExchangeMAPIFolderType fold
 		/* these were not found on the server by fid, thus remove them */
 		for (temp_list = old_sources; temp_list; temp_list = temp_list->next) {
 			ESource *source = temp_list->data;
-		
+
 			if (source && E_IS_SOURCE (source)) {
 				if (strcmp (e_source_get_property (source, "public"), "yes") != 0)
 					e_source_group_remove_source (group, source);
@@ -338,15 +337,15 @@ void exchange_mapi_add_esource (CamelURL *url, const gchar *folder_name, const g
 	ESource *source = NULL;
 	gchar *relative_uri = NULL;
 	gchar *base_uri = NULL;
-	
+
 	if (url == NULL)
 		return;
-	
-	if (folder_type == MAPI_FOLDER_TYPE_APPOINTMENT) 
+
+	if (folder_type == MAPI_FOLDER_TYPE_APPOINTMENT)
 		conf_key = CALENDAR_SOURCES;
-	else if (folder_type == MAPI_FOLDER_TYPE_TASK) 
+	else if (folder_type == MAPI_FOLDER_TYPE_TASK)
 		conf_key = TASK_SOURCES;
-	else if (folder_type == MAPI_FOLDER_TYPE_MEMO) 
+	else if (folder_type == MAPI_FOLDER_TYPE_MEMO)
 		conf_key = JOURNAL_SOURCES;
 	else if (folder_type == MAPI_FOLDER_TYPE_JOURNAL)
 		conf_key = JOURNAL_SOURCES;
@@ -361,21 +360,20 @@ void exchange_mapi_add_esource (CamelURL *url, const gchar *folder_name, const g
 	source_list = e_source_list_new_for_gconf (client, conf_key);
 	base_uri = g_strdup_printf ("%s%s %s/", MAPI_URI_PREFIX, url->user, url->host);
 	group = e_source_list_peek_group_by_base_uri (source_list, base_uri);
-	sources = e_source_group_peek_sources (group);	
+	sources = e_source_group_peek_sources (group);
 	for (; sources != NULL; sources = g_slist_next (sources)) {
 		ESource *source = E_SOURCE (sources->data);
-		gchar* folder_id = e_source_get_duped_property (source, "folder-id");
-		if (folder_id && fid) { 
-			if (strcmp (fid, folder_id) != 0) 
+		gchar * folder_id = e_source_get_duped_property (source, "folder-id");
+		if (folder_id && fid) {
+			if (strcmp (fid, folder_id) != 0)
 				continue;
 			else {
 				g_warning ("%s: %s: Esource Already exist \n", G_STRLOC, G_STRFUNC);
-				return;	
+				return;
 			}
 		}
 	}
 
-	
 	relative_uri = g_strconcat (";", fid, NULL);
 	source = e_source_new (folder_name, relative_uri);
 	e_source_set_property (source, "auth", "1");
@@ -395,7 +393,7 @@ void exchange_mapi_add_esource (CamelURL *url, const gchar *folder_name, const g
 
 	g_object_unref (source);
 	g_free (relative_uri);
-			
+
 	if (!e_source_list_add_group (source_list, group, -1))
 		return;
 
@@ -407,8 +405,7 @@ void exchange_mapi_add_esource (CamelURL *url, const gchar *folder_name, const g
 	g_object_unref (client);
 }
 
-
-void exchange_mapi_remove_esource (CamelURL *url, const gchar* folder_name, const gchar *fid, gint folder_type)
+void exchange_mapi_remove_esource (CamelURL *url, const gchar * folder_name, const gchar *fid, gint folder_type)
 {
 	ESourceList *source_list = NULL;
 	ESourceGroup *group = NULL;
@@ -416,15 +413,15 @@ void exchange_mapi_remove_esource (CamelURL *url, const gchar* folder_name, cons
 	GConfClient* client;
 	GSList *sources=NULL;
 	gchar *base_uri = NULL;
-	
+
 	if (url == NULL)
 		return;
 
-	if (folder_type == MAPI_FOLDER_TYPE_APPOINTMENT) 
+	if (folder_type == MAPI_FOLDER_TYPE_APPOINTMENT)
 		conf_key = CALENDAR_SOURCES;
-	else if (folder_type == MAPI_FOLDER_TYPE_TASK) 
+	else if (folder_type == MAPI_FOLDER_TYPE_TASK)
 		conf_key = TASK_SOURCES;
-	else if (folder_type == MAPI_FOLDER_TYPE_MEMO) 
+	else if (folder_type == MAPI_FOLDER_TYPE_MEMO)
 		conf_key = JOURNAL_SOURCES;
 	else if (folder_type == MAPI_FOLDER_TYPE_JOURNAL)
 		conf_key = JOURNAL_SOURCES;
@@ -439,11 +436,11 @@ void exchange_mapi_remove_esource (CamelURL *url, const gchar* folder_name, cons
 	source_list = e_source_list_new_for_gconf (client, conf_key);
 	base_uri = g_strdup_printf ("%s%s %s/", MAPI_URI_PREFIX, url->user, url->host);
 	group = e_source_list_peek_group_by_base_uri (source_list, base_uri);
-	sources = e_source_group_peek_sources (group);	
-	
+	sources = e_source_group_peek_sources (group);
+
 	for (; sources != NULL; sources = g_slist_next (sources)) {
 		ESource *source = E_SOURCE (sources->data);
-		gchar* folder_id = e_source_get_duped_property (source, "folder-id"); 
+		gchar * folder_id = e_source_get_duped_property (source, "folder-id");
 		if (folder_id && fid)
 			if (strcmp(fid, folder_id) == 0) {
 				e_source_group_remove_source(group, source);
@@ -457,7 +454,6 @@ void exchange_mapi_remove_esource (CamelURL *url, const gchar* folder_name, cons
 
 }
 
-
 static void
 remove_cal_esource (EAccount *existing_account_info, ExchangeMAPIFolderType folder_type, CamelURL *url)
 {
diff --git a/src/account-setup-eplugin/exchange-mapi-account-settings.c b/src/account-setup-eplugin/exchange-mapi-account-settings.c
index 7c5c181..c292ebe 100644
--- a/src/account-setup-eplugin/exchange-mapi-account-settings.c
+++ b/src/account-setup-eplugin/exchange-mapi-account-settings.c
@@ -214,7 +214,6 @@ folder_size_clicked (GtkButton *button, EAccount *account)
 	g_return_if_fail (account != NULL);
 	g_return_if_fail (E_IS_ACCOUNT (account));
 
-	
 	url = camel_url_new (e_account_get_string (account,  E_ACCOUNT_SOURCE_URL), NULL);
 	g_return_if_fail (url != NULL);
 
diff --git a/src/account-setup-eplugin/exchange-mapi-account-setup.c b/src/account-setup-eplugin/exchange-mapi-account-setup.c
index 1571d43..00326e7 100644
--- a/src/account-setup-eplugin/exchange-mapi-account-setup.c
+++ b/src/account-setup-eplugin/exchange-mapi-account-setup.c
@@ -760,7 +760,7 @@ exchange_mapi_book_commit (EPlugin *epl, EConfigTarget *target)
 	uri_text = e_source_get_uri (source);
 	if (uri_text && g_ascii_strncasecmp (uri_text, MAPI_URI_PREFIX, MAPI_PREFIX_LENGTH))
 		return;
-	
+
 	exchange_mapi_util_mapi_id_from_string (e_source_get_property (source, "parent-fid"), &pfid);
 
 	/* the profile should be already connected */
diff --git a/src/addressbook/e-book-backend-mapi-contacts.c b/src/addressbook/e-book-backend-mapi-contacts.c
index 71a45eb..d0be89e 100644
--- a/src/addressbook/e-book-backend-mapi-contacts.c
+++ b/src/addressbook/e-book-backend-mapi-contacts.c
@@ -331,7 +331,6 @@ mapi_book_write_props (ExchangeMapiConnection *conn, mapi_id_t fid, TALLOC_CTX *
 		set_str_con_value (PR_DISPLAY_NAME_UNICODE, E_CONTACT_FILE_AS);
 		set_str_con_value (PR_NORMALIZED_SUBJECT_UNICODE, E_CONTACT_FILE_AS);
 
-
 		local = e_contact_get_attributes (mcd->contact, E_CONTACT_EMAIL);
 		if (member_ids)
 			local = g_list_sort_with_data (local, cmp_member_id, member_ids);
@@ -641,7 +640,7 @@ fetch_contacts_uids_cb (FetchItemsCallbackData *item_data, gpointer data)
 	gchar *suid;
 
 	g_return_val_if_fail (data != NULL, FALSE);
-	
+
 	suid = exchange_mapi_util_mapi_ids_to_uid (item_data->fid, item_data->mid);
 	if (suid)
 		g_hash_table_insert (fcud->uids, suid, GINT_TO_POINTER (1));
@@ -1190,7 +1189,7 @@ e_book_backend_mapi_contacts_class_init (EBookBackendMAPIContactsClass *klass)
 	parent_class->op_get_contact_list		= ebbm_contacts_get_contact_list;
 
 	parent_class->op_connection_status_changed	= ebbm_contacts_connection_status_changed;
-	parent_class->op_get_status_message     	= ebbm_contacts_get_status_message;
+	parent_class->op_get_status_message		= ebbm_contacts_get_status_message;
 	parent_class->op_fetch_contacts			= ebbm_contacts_fetch_contacts;
 	parent_class->op_fetch_known_uids		= ebbm_contacts_fetch_known_uids;
 }
diff --git a/src/addressbook/e-book-backend-mapi.c b/src/addressbook/e-book-backend-mapi.c
index 30b9f20..ea57943 100644
--- a/src/addressbook/e-book-backend-mapi.c
+++ b/src/addressbook/e-book-backend-mapi.c
@@ -1149,7 +1149,7 @@ ebbm_op_load_source (EBookBackend *backend, ESource *source, gboolean only_if_ex
 	ebmac = E_BOOK_BACKEND_MAPI_GET_CLASS (ebbm);
 	g_return_if_fail (ebmac != NULL);
 
-	/* it's a sync op by e_book_backend_open 
+	/* it's a sync op by e_book_backend_open
 	op = g_new0 (OperationLoadSource, 1);
 	op->base.ot = OP_LOAD_SOURCE;
 	op->base.book = book;
@@ -1479,7 +1479,7 @@ e_book_backend_mapi_update_view_by_cache (EBookBackendMAPI *ebma, EDataBookView
 
 		ids = e_book_backend_summary_search (summary, query);
 		if (ids) {
-			for (i = 0; i < ids->len; i ++) {
+			for (i = 0; i < ids->len; i++) {
 				gchar *uid;
 				EContact *contact;
 
@@ -1663,7 +1663,7 @@ mapi_book_utils_get_prop_list (ExchangeMapiConnection *conn, mapi_id_t fid, TALL
 		PR_MID,
 		PR_EMAIL_ADDRESS_UNICODE
 	};
-	
+
 	/* do not make this array static, the function modifies it on run */
 	ResolveNamedIDsData nids[] = {
 		{ PidLidDistributionListName, 0 },
diff --git a/src/calendar/e-cal-backend-mapi.c b/src/calendar/e-cal-backend-mapi.c
index 30f6616..0701804 100644
--- a/src/calendar/e-cal-backend-mapi.c
+++ b/src/calendar/e-cal-backend-mapi.c
@@ -713,7 +713,7 @@ get_deltas (gpointer handle)
 		if (strcmp (e_source_get_property(source, "public"), "yes") == 0 ) {
 			options |= MAPI_OPTIONS_USE_PFSTORE;
 			is_public = TRUE;
-			use_restriction = FALSE;	
+			use_restriction = FALSE;
 		}
 
 		if (!exchange_mapi_connection_fetch_items (priv->conn, priv->fid, use_restriction ? &res : NULL, NULL,
@@ -740,7 +740,7 @@ get_deltas (gpointer handle)
 			options |= MAPI_OPTIONS_USE_PFSTORE;
 			is_public = TRUE;
 			use_restriction = FALSE;
-		} 
+		}
 
 		if (!exchange_mapi_connection_fetch_items (priv->conn, priv->fid, use_restriction ? &res : NULL, NULL,
 						is_public ? NULL : exchange_mapi_cal_utils_get_props_cb, GINT_TO_POINTER (kind),
@@ -809,7 +809,7 @@ get_deltas (gpointer handle)
 	}
 
 	options = MAPI_OPTIONS_FETCH_ALL;
-	e_cal_backend_store_freeze_changes (priv->store);	
+	e_cal_backend_store_freeze_changes (priv->store);
 	for (ls = did.cache_ids; ls; ls = g_slist_next (ls)) {
 		ECalComponent *comp = NULL;
 		icalcomponent *icalcomp = NULL;
@@ -866,12 +866,12 @@ get_deltas (gpointer handle)
 				options |= MAPI_OPTIONS_USE_PFSTORE;
 				is_public = TRUE;
 			}
- 			
+
 			if (!exchange_mapi_connection_fetch_items (priv->conn, priv->fid, &res, NULL,
 						is_public ? NULL : mapi_cal_get_known_ids, NULL,
 						mapi_cal_get_changes_cb, cbmapi,
 						options, &mapi_error)) {
-								
+
 				if (mapi_error) {
 					gchar *msg = g_strdup_printf (_("Failed to fetch changes from a server: %s"), mapi_error->message);
 					e_cal_backend_notify_error (E_CAL_BACKEND (cbmapi), msg);
@@ -1239,9 +1239,9 @@ populate_cache (ECalBackendMAPI *cbmapi, GError **perror)
 	if (kind == ICAL_VTODO_COMPONENT) {
 		if (strcmp (e_source_get_property(source, "public"), "yes") == 0) {
 			options |= MAPI_OPTIONS_USE_PFSTORE;
-			is_public = TRUE;	
+			is_public = TRUE;
 		}
-		
+
 		if (!exchange_mapi_connection_fetch_items (priv->conn, priv->fid, NULL, NULL,
 						is_public ? NULL : mapi_cal_get_known_ids, NULL,
 						mapi_cal_cache_create_cb, cbmapi,
@@ -1261,7 +1261,7 @@ populate_cache (ECalBackendMAPI *cbmapi, GError **perror)
 			options |= MAPI_OPTIONS_USE_PFSTORE;
 			is_public = TRUE;
 		}
-		
+
 		if (!exchange_mapi_connection_fetch_items (priv->conn, priv->fid, NULL, NULL,
 						is_public ? NULL : exchange_mapi_cal_utils_get_props_cb, GINT_TO_POINTER (kind),
 						mapi_cal_cache_create_cb, cbmapi,
@@ -1506,7 +1506,7 @@ mapi_cal_get_required_props (ExchangeMapiConnection *conn, mapi_id_t fid, TALLOC
 		PR_SENDER_NAME_UNICODE,
 		PR_SENDER_ADDRTYPE_UNICODE,
 		PR_SENDER_EMAIL_ADDRESS_UNICODE
-	};	
+	};
 
 	g_return_val_if_fail (props != NULL, FALSE);
 
diff --git a/src/camel/camel-mapi-folder.c b/src/camel/camel-mapi-folder.c
index 653bb6f..4dde21e 100644
--- a/src/camel/camel-mapi-folder.c
+++ b/src/camel/camel-mapi-folder.c
@@ -446,7 +446,7 @@ mapi_update_cache (CamelFolder *folder, GSList *list, CamelFolderChangeInfo **ch
 							g_free (tmp);
 						} else
 							to = formatted_id;
-						count_to ++;
+						count_to++;
 						break;
 
 					case MAPI_CC:
@@ -457,7 +457,7 @@ mapi_update_cache (CamelFolder *folder, GSList *list, CamelFolderChangeInfo **ch
 							g_free (tmp);
 						} else
 							cc = formatted_id;
-						count_cc ++;
+						count_cc++;
 						break;
 
 					default:
@@ -862,7 +862,6 @@ mapi_sync (CamelFolder *folder, gboolean expunge, GError **error)
 		camel_service_unlock (CAMEL_SERVICE (mapi_store), CAMEL_SERVICE_REC_CONNECT_LOCK);
 	}
 
-	
 	if (junk_items) {
 		mapi_id_t junk_fid = 0;
 		GError *err = NULL;
@@ -1533,7 +1532,7 @@ mapi_transfer_messages_to (CamelFolder *source, GPtrArray *uids,
 
 	if (delete_originals) {
 		GError *err = NULL;
-		
+
 		if (!exchange_mapi_connection_move_items (camel_mapi_store_get_exchange_connection (mapi_store), src_fid, src_fid_options, dest_fid, dest_fid_options, src_msg_ids, &err)) {
 			g_set_error (
 				error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
diff --git a/src/camel/camel-mapi-store.c b/src/camel/camel-mapi-store.c
index e3f213b..d0bebe9 100644
--- a/src/camel/camel-mapi-store.c
+++ b/src/camel/camel-mapi-store.c
@@ -706,7 +706,7 @@ mapi_delete_folder(CamelStore *store, const gchar *folder_name, GError **error)
 				error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
 				_("Cannot remove folder '%s': %s"),
 				folder_name, local_error->message);
-			
+
 			g_error_free (local_error);
 		} else {
 			g_set_error (
@@ -1191,8 +1191,8 @@ mapi_get_folder_info_offline (CamelStore *store, const gchar *top,
 			camel_store_summary_info_free ((CamelStoreSummary *)mapi_store->summary, si);
 			continue;
 		}
-		
-		if (!subscription_list && !(si->flags & CAMEL_MAPI_FOLDER_MAIL) && si->flags & CAMEL_STORE_INFO_FOLDER_SUBSCRIBED && 
+
+		if (!subscription_list && !(si->flags & CAMEL_MAPI_FOLDER_MAIL) && si->flags & CAMEL_STORE_INFO_FOLDER_SUBSCRIBED &&
 												si->flags & CAMEL_MAPI_FOLDER_PUBLIC)
 			continue;
 		if (!strcmp(name, camel_mapi_store_info_full_name (mapi_store->summary, si))
@@ -1337,7 +1337,7 @@ camel_mapi_store_connected (CamelMapiStore *store, GError **error)
 	    && camel_service_connect ((CamelService *)store, error));
 }
 
-static void 
+static void
 mapi_update_hash_table_type (CamelMapiStore *store, const gchar *full_name, guint *folder_type)
 {
 	CamelMapiStorePrivate  *priv = store->priv;
@@ -1387,12 +1387,12 @@ mapi_folders_update_hash_tables_from_cache (CamelMapiStore *store)
 
 /* static const gchar * */
 
-guint 
-mapi_folders_hash_table_type_lookup (CamelMapiStore *store, const gchar *name) 
+guint
+mapi_folders_hash_table_type_lookup (CamelMapiStore *store, const gchar *name)
 {
 	CamelMapiStorePrivate  *priv = store->priv;
 	guint *folder_type = g_hash_table_lookup (priv->container_hash, name);
-	
+
 	return *folder_type;
 }
 
@@ -1593,33 +1593,33 @@ mapi_folders_sync (CamelMapiStore *store, guint32 flags, GError **error)
 			info = mapi_convert_to_folder_info (store, folder, (const gchar *)url, NULL);
 			info->flags |= CAMEL_MAPI_FOLDER_MAIL;
 			mapi_si = (CamelMapiStoreInfo *) camel_store_summary_path ((CamelStoreSummary *)store->summary, info->full_name);
-			
+
 			if (!mapi_si) {
 				gchar *fid, *pfid = NULL;
-	
+
 				fid = g_strdup_printf ("%016" G_GINT64_MODIFIER "X",
 						       exchange_mapi_folder_get_fid((ExchangeMAPIFolder *)(folder_list->data)));
 				pfid = g_strdup_printf ("%016" G_GINT64_MODIFIER "X",
 							exchange_mapi_folder_get_parent_id((ExchangeMAPIFolder *)(folder_list->data)));
-	
+
 				mapi_si = camel_mapi_store_summary_add_from_full (store->summary, info->full_name, '/', fid, pfid);
 				g_free (fid);
 				g_free (pfid);
 				if (mapi_si == NULL)
 					continue;
-	
+
 				camel_store_summary_info_ref ((CamelStoreSummary *)store->summary, (CamelStoreInfo *)mapi_si);
-	
+
 				if (!subscription_list) {
 					camel_store_folder_created (CAMEL_STORE (store), info);
 					camel_store_folder_subscribed (CAMEL_STORE (store), info);
 				}
 			}
-		
+
 			mapi_si->info.flags |= info->flags;
 			mapi_si->info.total = info->total;
 			mapi_si->info.unread = info->unread;
-			
+
 			camel_store_summary_info_free ((CamelStoreSummary *)store->summary, (CamelStoreInfo *)mapi_si);
 			camel_folder_info_free (info);
 		} else if (folder->category == MAPI_FAVOURITE_FOLDER) {
@@ -1640,10 +1640,10 @@ mapi_folders_sync (CamelMapiStore *store, guint32 flags, GError **error)
 			camel_store_summary_info_ref ((CamelStoreSummary *)store->summary, (CamelStoreInfo *)mapi_si);
 			mapi_si->info.flags |= info->flags;
 			camel_store_summary_info_free ((CamelStoreSummary *)store->summary, (CamelStoreInfo *)mapi_si);
-			camel_folder_info_free (info);	
+			camel_folder_info_free (info);
 		}
 	}
-	
+
 	/* Weed out deleted folders */
 	g_hash_table_foreach (old_cache_folders, (GHFunc) remove_path_from_store_summary, store);
 	g_hash_table_destroy (old_cache_folders);
@@ -1770,7 +1770,7 @@ mapi_subscribe_folder(CamelStore *store, const gchar *folder_name, GError **erro
 	const gchar *parent_name = NULL, *use_folder_name = folder_name, *fid = NULL;
 	gboolean favourites = FALSE;
 	/* TODO : exchange_mapi_add_to_favorites (); */
-	
+
 	fid = camel_mapi_store_folder_id_lookup(mapi_store, folder_name);
 
 	if (g_str_has_prefix (folder_name, DISPLAY_NAME_ALL_PUBLIC_FOLDERS) ) {
@@ -1798,7 +1798,7 @@ mapi_subscribe_folder(CamelStore *store, const gchar *folder_name, GError **erro
 	}
 
 	if (si->flags & CAMEL_MAPI_FOLDER_MAIL) {
-		fi = mapi_build_folder_info (mapi_store, parent_name, use_folder_name);		
+		fi = mapi_build_folder_info (mapi_store, parent_name, use_folder_name);
 		if (favourites) {
 			CamelURL *url;
 			url = camel_url_new (mapi_store->priv->base_url, NULL);
@@ -1878,7 +1878,7 @@ mapi_unsubscribe_folder(CamelStore *store, const gchar *folder_name, GError **er
 		exchange_mapi_remove_esource(url, folder_name, fid, folder_type);
 	}
 	camel_store_summary_info_free((CamelStoreSummary *)mapi_store->summary, si);
-		
+
 	return TRUE;
 }
 
diff --git a/src/libexchangemapi/em-operation-queue.c b/src/libexchangemapi/em-operation-queue.c
index e506699..b69b642 100644
--- a/src/libexchangemapi/em-operation-queue.c
+++ b/src/libexchangemapi/em-operation-queue.c
@@ -217,7 +217,6 @@ em_operation_queue_cancel (EMOperationQueue *queue, gpointer worker_data)
 			break;
 		}
 	}
-	
 
 	UNLOCK ();
 
diff --git a/src/libexchangemapi/exchange-mapi-cal-utils.c b/src/libexchangemapi/exchange-mapi-cal-utils.c
index f1ae838..753ad0a 100644
--- a/src/libexchangemapi/exchange-mapi-cal-utils.c
+++ b/src/libexchangemapi/exchange-mapi-cal-utils.c
@@ -1265,9 +1265,9 @@ exchange_mapi_cal_utils_write_props_cb (ExchangeMapiConnection *conn, mapi_id_t
 			return FALSE;	\
 		} G_STMT_END
 
-	#define set_datetime_value(hex, dtval) G_STMT_START { 		\
-		struct FILETIME	filetime; 				\
-		NTTIME		nttime; 					\
+	#define set_datetime_value(hex, dtval) G_STMT_START {		\
+		struct FILETIME	filetime;				\
+		NTTIME		nttime;					\
 									\
 		nttime = timeval_to_nttime(dtval);				\
 									\
@@ -1279,8 +1279,8 @@ exchange_mapi_cal_utils_write_props_cb (ExchangeMapiConnection *conn, mapi_id_t
 		} G_STMT_END
 
 	#define set_named_datetime_value(named_id, dtval) G_STMT_START { \
-		struct FILETIME	filetime; 				\
-		NTTIME		nttime; 					\
+		struct FILETIME	filetime;				\
+		NTTIME		nttime;					\
 									\
 		nttime = timeval_to_nttime(dtval);				\
 									\
@@ -1855,9 +1855,9 @@ populate_freebusy_data (struct Binary_r *bin, uint32_t month, uint32_t year, GLi
 	uint16_t	event_start;
 	uint16_t	event_end;
 	uint32_t	i;
-	uint32_t       	hour;
+	uint32_t	hour;
 	uint32_t	day;
-	const char	*month_name;
+	const gchar	*month_name;
 	uint32_t	minutes;
 	uint32_t	real_month;
 	gchar *date_string = NULL;
@@ -1889,7 +1889,7 @@ populate_freebusy_data (struct Binary_r *bin, uint32_t month, uint32_t year, GLi
 				day = ((event_start - (60 * hour)) / 1440) + 1;
 				minutes = (event_start - (60 * hour)) % 1440;
 				real_month = month - (year * 16);
-				
+
 				date_string = g_strdup_printf ("%.2u-%.2u-%.2u", year, real_month, day);
 				start = g_strdup_printf ("%sT%.2u:%.2u:00Z", date_string, hour + daylight, minutes);
 				g_free (date_string);
@@ -1910,13 +1910,13 @@ populate_freebusy_data (struct Binary_r *bin, uint32_t month, uint32_t year, GLi
 				end_date = mapi_get_date_from_string (end);
 
 				memset (&ipt, 0, sizeof (struct icalperiodtype));
-				
+
 				itt = icaltime_from_timet_with_zone (start_date, 0, icaltimezone_get_utc_timezone ());
 				ipt.start = itt;
 
 				itt = icaltime_from_timet_with_zone (end_date, 0, icaltimezone_get_utc_timezone ());
 				ipt.end = itt;
-			
+
 				icalcomp = e_cal_component_get_icalcomponent (comp);
 				icalprop = icalproperty_new_freebusy (ipt);
 
@@ -1945,11 +1945,11 @@ exchange_mapi_cal_utils_get_free_busy_data (ExchangeMapiConnection *conn, GList
 	GList *l;
 
 	const uint32_t			*publish_start;
-	const struct LongArray_r       	*busy_months;
+	const struct LongArray_r	*busy_months;
 	const struct BinaryArray_r	*busy_events;
-	const struct LongArray_r       	*tentative_months;
+	const struct LongArray_r	*tentative_months;
 	const struct BinaryArray_r	*tentative_events;
-	const struct LongArray_r       	*oof_months;
+	const struct LongArray_r	*oof_months;
 	const struct BinaryArray_r	*oof_events;
 	uint32_t			year;
 	uint32_t			event_year;
@@ -1965,7 +1965,7 @@ exchange_mapi_cal_utils_get_free_busy_data (ExchangeMapiConnection *conn, GList
 	if (!exchange_mapi_connection_get_public_folder (conn, &obj_store, mapi_error)) {
 		return FALSE;
 	}
-	
+
 	for ( l = users; l != NULL; l = g_list_next (l)) {
 		ms = GetUserFreeBusyData (&obj_store, (const gchar *)l->data, &aRow);
 
@@ -2024,7 +2024,7 @@ exchange_mapi_cal_utils_get_free_busy_data (ExchangeMapiConnection *conn, GList
 				populate_freebusy_data (&busy_events->lpbin[i], busy_months->lpl[i], event_year, freebusy, "Busy", comp);
 			}
 		}
-		
+
 		if (tentative_months && ((*(const uint32_t *) tentative_months) != MAPI_E_NOT_FOUND) &&
 		    tentative_events && ((*(const uint32_t *) tentative_events) != MAPI_E_NOT_FOUND)) {
 			for (i = 0; i < tentative_months->cValues; i++) {
diff --git a/src/libexchangemapi/exchange-mapi-connection.c b/src/libexchangemapi/exchange-mapi-connection.c
index f6484af..ceb3845 100644
--- a/src/libexchangemapi/exchange-mapi-connection.c
+++ b/src/libexchangemapi/exchange-mapi-connection.c
@@ -328,7 +328,6 @@ exchange_mapi_connection_find (const gchar *profile)
 
 /* tracking alive connections - end  */
 
-
 /* Specifies READ/WRITE sizes to be used while handling normal streams */
 #define STREAM_MAX_READ_SIZE    0x8000
 #define STREAM_MAX_READ_SIZE_DF 0x1000
@@ -340,7 +339,7 @@ exchange_mapi_connection_find (const gchar *profile)
 #define CHECK_CORRECT_CONN_AND_GET_PRIV(_conn, _val)								\
 	ExchangeMapiConnectionPrivate *priv;									\
 														\
-	e_return_val_mapi_error_if_fail (_conn != NULL, MAPI_E_INVALID_PARAMETER, _val); 			\
+	e_return_val_mapi_error_if_fail (_conn != NULL, MAPI_E_INVALID_PARAMETER, _val);			\
 	e_return_val_mapi_error_if_fail (EXCHANGE_IS_MAPI_CONNECTION (_conn), MAPI_E_INVALID_PARAMETER, _val);	\
 														\
 	priv = EXCHANGE_MAPI_CONNECTION_GET_PRIVATE (_conn);							\
@@ -2933,7 +2932,6 @@ get_child_folders (TALLOC_CTX *mem_ctx, ExchangeMAPIFolderCategory folder_hier,
 			goto cleanup;
 		}
 
-
 		for (i = 0; i < rowset.cRows; i++) {
 			ExchangeMAPIFolder *folder = NULL;
 			gchar *newname = NULL;
diff --git a/src/libexchangemapi/exchange-mapi-connection.h b/src/libexchangemapi/exchange-mapi-connection.h
index 491bba2..49948cb 100644
--- a/src/libexchangemapi/exchange-mapi-connection.h
+++ b/src/libexchangemapi/exchange-mapi-connection.h
@@ -202,7 +202,7 @@ gboolean		exchange_mapi_connection_set_flags (ExchangeMapiConnection *conn, uint
 gboolean		exchange_mapi_connection_remove_items (ExchangeMapiConnection *conn, uint32_t olFolder, mapi_id_t fid, guint32 fid_options, GSList *mids, GError **perror);
 gboolean		exchange_mapi_connection_copy_items (ExchangeMapiConnection *conn, mapi_id_t src_fid, guint32 src_fid_options, mapi_id_t dest_fid, guint32 dest_fid_options, GSList *mids, GError **perror);
 gboolean		exchange_mapi_connection_move_items (ExchangeMapiConnection *conn, mapi_id_t src_fid, guint32 src_fid_options, mapi_id_t dest_fid, guint32 dest_fid_options, GSList *mids, GError **perror);
-gboolean 		exchange_mapi_connection_get_folders_list (ExchangeMapiConnection *conn, GSList **mapi_folders, GError **perror);
+gboolean		exchange_mapi_connection_get_folders_list (ExchangeMapiConnection *conn, GSList **mapi_folders, GError **perror);
 gboolean		exchange_mapi_connection_get_pf_folders_list (ExchangeMapiConnection *conn, GSList **mapi_folders, GError **perror);
 GSList *		exchange_mapi_connection_peek_folders_list (ExchangeMapiConnection *conn);
 
diff --git a/src/libexchangemapi/exchange-mapi-mail-utils.c b/src/libexchangemapi/exchange-mapi-mail-utils.c
index fc2165f..6740d46 100644
--- a/src/libexchangemapi/exchange-mapi-mail-utils.c
+++ b/src/libexchangemapi/exchange-mapi-mail-utils.c
@@ -294,7 +294,6 @@ mapi_mail_get_item_prop_list (ExchangeMapiConnection *conn, mapi_id_t fid, TALLO
 	return exchange_mapi_utils_add_props_to_props_array (mem_ctx, props, item_props, G_N_ELEMENTS (item_props));
 }
 
-
 static void
 mapi_mime_set_recipient_list (CamelMimeMessage *msg, MailItem *item)
 {
diff --git a/src/libexchangemapi/exchange-mapi-utils.c b/src/libexchangemapi/exchange-mapi-utils.c
index a79d783..3197fe4 100644
--- a/src/libexchangemapi/exchange-mapi-utils.c
+++ b/src/libexchangemapi/exchange-mapi-utils.c
@@ -930,7 +930,7 @@ exchange_crlf_to_lf (const gchar *in)
  *
  * Constructs profile name from given parameters and
  * returns it as a newly allocated string. It can also
- * rename old profile name string to a new name, if requested. 
+ * rename old profile name string to a new name, if requested.
  **/
 gchar *
 exchange_mapi_util_profile_name (const gchar *username, const gchar *domain, const gchar *hostname, gboolean migrate)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]