[evolution-groupwise] Coding style cleanups.



commit e7d4141afb68104051e299591edd5fa1595943c2
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun May 8 14:15:52 2011 -0400

    Coding style cleanups.

 src/addressbook/e-book-backend-groupwise.c   |   20 +++---
 src/calendar/e-cal-backend-groupwise-utils.c |    4 +-
 src/calendar/e-cal-backend-groupwise.c       |    4 +-
 src/camel/camel-groupwise-folder.c           |   92 +++++++++++++-------------
 src/camel/camel-groupwise-journal.c          |    2 +-
 src/camel/camel-groupwise-private.h          |    8 +-
 src/camel/camel-groupwise-provider.c         |    2 +-
 src/camel/camel-groupwise-store-summary.c    |   48 +++++++-------
 src/camel/camel-groupwise-store.c            |   56 ++++++++--------
 src/camel/camel-groupwise-summary.c          |   22 +++---
 src/camel/camel-groupwise-utils.c            |   34 +++++-----
 src/plugins/camel-gw-listener.c              |    4 +-
 src/plugins/groupwise-account-setup.c        |    2 +-
 src/plugins/install-shared.c                 |   14 ++--
 src/plugins/junk-mail-settings.c             |    6 +-
 src/plugins/junk-settings.c                  |    6 +-
 src/plugins/mail-send-options.c              |    2 +-
 src/plugins/process-meeting.c                |    4 +-
 src/plugins/proxy-login.c                    |    4 +-
 src/plugins/proxy.c                          |   16 ++--
 src/plugins/send-options.c                   |    2 +-
 src/plugins/share-folder-common.c            |   10 ++--
 src/plugins/share-folder.c                   |   12 ++--
 src/server/e-gw-connection.c                 |    4 +-
 src/server/e-gw-container.c                  |    2 +-
 src/server/e-gw-filter.c                     |    4 +-
 src/server/e-gw-item.c                       |   10 ++--
 src/server/soup-soap-message.c               |   22 +++---
 src/server/soup-soap-response.c              |   16 ++--
 29 files changed, 216 insertions(+), 216 deletions(-)
---
diff --git a/src/addressbook/e-book-backend-groupwise.c b/src/addressbook/e-book-backend-groupwise.c
index 3fc997e..9fd6193 100644
--- a/src/addressbook/e-book-backend-groupwise.c
+++ b/src/addressbook/e-book-backend-groupwise.c
@@ -892,7 +892,7 @@ set_members_in_gw_item (EGwItem  *item, EContact *contact, EBookBackendGroupwise
 
 		temp_item = E_GW_ITEM (items->data);
 		emails = e_gw_item_get_email_list (temp_item);
-		if (emails_without_ids && (ptr = g_list_find_custom (emails_without_ids, emails->data, (GCompareFunc)strcasecmp ))) {
+		if (emails_without_ids && (ptr = g_list_find_custom (emails_without_ids, emails->data, (GCompareFunc) strcasecmp ))) {
 			gint pos = g_list_position (emails_without_ids, ptr);
 			emails_without_ids = g_list_remove_link (emails_without_ids, ptr);
 			g_list_free (ptr);
@@ -923,7 +923,7 @@ set_members_in_gw_item (EGwItem  *item, EContact *contact, EBookBackendGroupwise
 		EContact *new_contact = e_contact_new ();
 		EGwItem *new_item = e_gw_item_new_empty ();
 		FullName *full_name;
-		EDestination *tdest = (EDestination *)dtemp->data;
+		EDestination *tdest = (EDestination *) dtemp->data;
 
 		e_contact_set (new_contact,E_CONTACT_FULL_NAME, e_contact_name_from_string (strdup (e_destination_get_email (tdest))));
 		e_contact_set (new_contact, E_CONTACT_EMAIL_1, strdup (e_destination_get_email (tdest)));
@@ -1005,12 +1005,12 @@ set_member_changes (EGwItem *new_item, EGwItem *old_item, EBookBackendGroupwise
 
 	for (;old_members != NULL; old_members = g_list_next (old_members)) {
 		EGroupMember *member;
-		member = (EGroupMember *)old_members->data;
+		member = (EGroupMember *) old_members->data;
 		old_ids = g_list_append (old_ids, member->id);
 	}
 	for (;new_members != NULL; new_members = g_list_next (new_members)) {
 		EGroupMember *member;
-		member = (EGroupMember *)new_members->data;
+		member = (EGroupMember *) new_members->data;
 		new_ids = g_list_append (new_ids, member->id);
 	}
 
@@ -1862,7 +1862,7 @@ e_book_backend_groupwise_build_gw_filter (EBookBackendGroupwise *ebgw, const gch
 	for (i = 0; i < G_N_ELEMENTS (symbols); i++) {
 		if (symbols[i].type == 1) {
 			e_sexp_add_ifunction (sexp, 0, symbols[i].name,
-					     (ESExpIFunc *)symbols[i].func, sexp_data);
+					     (ESExpIFunc *) symbols[i].func, sexp_data);
 		} else {
 			e_sexp_add_function (sexp, 0, symbols[i].name,
 					    symbols[i].func, sexp_data);
@@ -2078,7 +2078,7 @@ init_closure (EDataBookView *book_view, EBookBackendGroupwise *bg)
 	closure->running = e_flag_new ();
 
 	g_object_set_data_full (G_OBJECT (book_view), "EBookBackendGroupwise.BookView::closure",
-				closure, (GDestroyNotify)closure_destroy);
+				closure, (GDestroyNotify) closure_destroy);
 
 	return closure;
 }
@@ -2462,7 +2462,7 @@ find_book_view (EBookBackendGroupwise *ebgw)
 
 	if (e_iterator_is_valid (iter)) {
 		/* just always use the first book view */
-		EDataBookView *v = (EDataBookView*)e_iterator_get (iter);
+		EDataBookView *v = (EDataBookView*) e_iterator_get (iter);
 		if (v)
 			rv = v;
 	}
@@ -3344,7 +3344,7 @@ e_book_backend_groupwise_authenticate_user (EBookBackend *backend,
 					printf ("creating cache refresh thread for GW system book \n");
 				priv->cache_timeout = g_timeout_add (cache_refresh_interval,
 								     (GSourceFunc) update_address_book_cache,
-								     (gpointer)ebgw);
+								     (gpointer) ebgw);
 			}
 		}
 		else if (priv->is_writable) {  /* for personal books we always cache */
@@ -3370,7 +3370,7 @@ e_book_backend_groupwise_authenticate_user (EBookBackend *backend,
 				printf ("creating cache refresh thread for GW system book \n");
 			priv->cache_timeout = g_timeout_add (cache_refresh_interval,
 							     (GSourceFunc) update_address_book_cache,
-							     (gpointer)ebgw);
+							     (gpointer) ebgw);
 		}
 		return;
 	default :
@@ -3388,7 +3388,7 @@ e_book_backend_groupwise_get_required_fields (EBookBackend *backend,
 	if (enable_debug)
 		printf ("\ne_book_backend_groupwise_get_required_fields...\n");
 
-	fields = g_list_append (fields, (gchar *)e_contact_field_name (E_CONTACT_FILE_AS));
+	fields = g_list_append (fields, (gchar *) e_contact_field_name (E_CONTACT_FILE_AS));
 	e_data_book_respond_get_supported_fields (book, opid,
 						  EDB_ERROR (SUCCESS),
 						  fields);
diff --git a/src/calendar/e-cal-backend-groupwise-utils.c b/src/calendar/e-cal-backend-groupwise-utils.c
index 23984bd..623c3e3 100644
--- a/src/calendar/e-cal-backend-groupwise-utils.c
+++ b/src/calendar/e-cal-backend-groupwise-utils.c
@@ -317,7 +317,7 @@ e_cal_backend_groupwise_set_attachments_from_comp (ECalComponent *comp,
 		gchar *attach_filename_full, *filename;
 		const gchar *uid;
 
-		attach_filename_full = g_filename_from_uri ((gchar *)l->data, NULL, NULL);
+		attach_filename_full = g_filename_from_uri ((gchar *) l->data, NULL, NULL);
 		if (!g_file_get_contents (attach_filename_full, &file_contents, &file_len, NULL)) {
 			g_message ("DEBUG: could not read %s\n", attach_filename_full);
 			g_free (attach_filename_full);
@@ -340,7 +340,7 @@ e_cal_backend_groupwise_set_attachments_from_comp (ECalComponent *comp,
 		attach_item = g_new0 (EGwItemAttachment, 1);
 		/* FIXME the member does not follow the naming convention.
 		 * Should be fixed in e-gw-item*/
-		attach_item->contentType = get_mime_type ((gchar *)l->data);
+		attach_item->contentType = get_mime_type ((gchar *) l->data);
 
 		attach_item->name = g_strdup (filename + strlen (uid) + 1);
 		/* do a base64 encoding so it can be embedded in a soap
diff --git a/src/calendar/e-cal-backend-groupwise.c b/src/calendar/e-cal-backend-groupwise.c
index 11d717c..37d638a 100644
--- a/src/calendar/e-cal-backend-groupwise.c
+++ b/src/calendar/e-cal-backend-groupwise.c
@@ -1796,7 +1796,7 @@ e_cal_backend_groupwise_compute_changes (ECalBackendGroupwise *cbgw, const gchar
 	be_data.kind = e_cal_backend_get_kind (E_CAL_BACKEND (cbgw));
 	be_data.deletes = NULL;
 	be_data.ehash = ehash;
-	e_xmlhash_foreach_key (ehash, (EXmlHashFunc)e_cal_backend_groupwise_compute_changes_foreach_key, &be_data);
+	e_xmlhash_foreach_key (ehash, (EXmlHashFunc) e_cal_backend_groupwise_compute_changes_foreach_key, &be_data);
 
 	*deletes = be_data.deletes;
 
@@ -2347,7 +2347,7 @@ fetch_attachments (ECalBackendGroupwise *cbgw, ECalComponent *comp)
 	cache_dir = e_cal_backend_get_cache_dir (E_CAL_BACKEND (cbgw));
 
 	for (l = attach_list; l; l = l->next) {
-		gchar *sfname = (gchar *)l->data;
+		gchar *sfname = (gchar *) l->data;
 		gchar *filename, *new_filename;
 		GMappedFile *mapped_file;
 		GError *error = NULL;
diff --git a/src/camel/camel-groupwise-folder.c b/src/camel/camel-groupwise-folder.c
index e8ad768..d8e63f7 100644
--- a/src/camel/camel-groupwise-folder.c
+++ b/src/camel/camel-groupwise-folder.c
@@ -157,7 +157,7 @@ groupwise_populate_details_from_item (CamelMimeMessage *msg, EGwItem *item)
 	gchar *dtstring = NULL;
 	gchar *temp_str = NULL;
 
-	temp_str = (gchar *)e_gw_item_get_subject (item);
+	temp_str = (gchar *) e_gw_item_get_subject (item);
 	if (temp_str)
 		camel_mime_message_set_subject (msg, temp_str);
 	type = e_gw_item_get_item_type (item);
@@ -378,7 +378,7 @@ groupwise_folder_rename (CamelFolder *folder, const gchar *new)
 	camel_data_cache_set_path (gw_folder->cache, folder_dir);
 	CAMEL_GROUPWISE_FOLDER_REC_UNLOCK (folder, cache_lock);
 
-	((CamelFolderClass *)camel_groupwise_folder_parent_class)->rename (folder, new);
+	((CamelFolderClass *) camel_groupwise_folder_parent_class)->rename (folder, new);
 	camel_folder_summary_set_filename (folder->summary, summary_path);
 
 	state_file = g_strdup_printf ("%s/cmeta", folder_dir);
@@ -612,8 +612,8 @@ groupwise_sync_summary (CamelFolder *folder, GError **error)
 		si->total = total;
 	}
 
-	camel_store_summary_touch ((CamelStoreSummary *)((CamelGroupwiseStore *)parent_store)->summary);
-	camel_store_summary_save ((CamelStoreSummary *)((CamelGroupwiseStore *)parent_store)->summary);
+	camel_store_summary_touch ((CamelStoreSummary *)((CamelGroupwiseStore *) parent_store)->summary);
+	camel_store_summary_save ((CamelStoreSummary *)((CamelGroupwiseStore *) parent_store)->summary);
 
 	return TRUE;
 }
@@ -782,11 +782,11 @@ groupwise_sync (CamelFolder *folder,
 						deleted_read_items = g_list_prepend (deleted_read_items, (gchar *) uid);
 
 					if (deleted_items) {
-						deleted_items = g_list_prepend (deleted_items, (gchar *)camel_message_info_uid (info));
+						deleted_items = g_list_prepend (deleted_items, (gchar *) camel_message_info_uid (info));
 					} else {
 						g_list_free (deleted_head);
 						deleted_head = NULL;
-						deleted_head = deleted_items = g_list_prepend (deleted_items, (gchar *)camel_message_info_uid (info));
+						deleted_head = deleted_items = g_list_prepend (deleted_items, (gchar *) camel_message_info_uid (info));
 					}
 
 					if (g_list_length (deleted_items) == GROUPWISE_BULK_DELETE_LIMIT ) {
@@ -819,7 +819,7 @@ groupwise_sync (CamelFolder *folder,
 						if (status == E_GW_CONNECTION_STATUS_OK) {
 							gchar *uid;
 							while (deleted_items) {
-								uid = (gchar *)deleted_items->data;
+								uid = (gchar *) deleted_items->data;
 								CAMEL_GROUPWISE_FOLDER_REC_LOCK (folder, cache_lock);
 								camel_folder_summary_remove_uid (folder->summary, uid);
 								camel_data_cache_remove(gw_folder->cache, "cache", uid, NULL);
@@ -832,9 +832,9 @@ groupwise_sync (CamelFolder *folder,
 						}
 					}
 				} else if (diff.bits & CAMEL_MESSAGE_SEEN) {
-					read_items = g_list_prepend (read_items, (gchar *)uid);
+					read_items = g_list_prepend (read_items, (gchar *) uid);
 				} else if (unset_flags.bits & CAMEL_MESSAGE_SEEN) {
-					unread_items = g_list_prepend (unread_items, (gchar *)uid);
+					unread_items = g_list_prepend (unread_items, (gchar *) uid);
 				}
 			}
 		}
@@ -875,7 +875,7 @@ groupwise_sync (CamelFolder *folder,
 		if (status == E_GW_CONNECTION_STATUS_OK) {
 			gchar *uid;
 			while (deleted_items) {
-				uid = (gchar *)deleted_items->data;
+				uid = (gchar *) deleted_items->data;
 				CAMEL_GROUPWISE_FOLDER_REC_LOCK (folder, cache_lock);
 				camel_folder_summary_remove_uid (folder->summary, uid);
 				camel_data_cache_remove(gw_folder->cache, "cache", uid, NULL);
@@ -1111,14 +1111,14 @@ update_update (CamelSession *session,
 
 	  while (item_list->next) {
 	  i = 0;
-	  while (((const gchar *)item_list->data)[i++]!='@');
-	  ((gchar *)item_list->data)[i-1] = '\0';
+	  while (((const gchar *) item_list->data)[i++]!='@');
+	  ((gchar *) item_list->data)[i-1] = '\0';
 	  item_list = item_list->next;
 	  }
 
 	  i = 0;
-	  while (((const gchar *)item_list->data)[i++]!='@');
-	  ((gchar *)item_list->data)[i-1] = '\0';
+	  while (((const gchar *) item_list->data)[i++]!='@');
+	  ((gchar *) item_list->data)[i-1] = '\0';
 	  }*/
 
 	g_print ("\nNumber of items in the folder: %d \n", g_list_length(items_full_list));
@@ -1130,7 +1130,7 @@ update_update (CamelSession *session,
 	camel_service_unlock (service, CAMEL_SERVICE_REC_CONNECT_LOCK);
 	camel_operation_pop_message (cancellable);
 	if (items_full_list) {
-		g_list_foreach (items_full_list, (GFunc)g_free, NULL);
+		g_list_foreach (items_full_list, (GFunc) g_free, NULL);
 		g_list_free (items_full_list);
 	}
 	return;
@@ -1226,7 +1226,7 @@ groupwise_refresh_folder (CamelFolder *folder,
 {
 	CamelGroupwiseStore *gw_store;
 	CamelGroupwiseFolder *gw_folder;
-	CamelGroupwiseSummary *summary = (CamelGroupwiseSummary *)folder->summary;
+	CamelGroupwiseSummary *summary = (CamelGroupwiseSummary *) folder->summary;
 	EGwConnection *cnc;
 	CamelService *service;
 	CamelSession *session;
@@ -1440,7 +1440,7 @@ groupwise_folder_set_threading_data (CamelGroupwiseMessageInfo *mi, EGwItem *ite
 
 	/* set message id */
 	msgid = camel_header_msgid_decode (message_id);
-	digest = get_md5_digest ((const guchar *)msgid);
+	digest = get_md5_digest ((const guchar *) msgid);
 	memcpy (mi->info.message_id.id.hash, digest, sizeof (mi->info.message_id.id.hash));
 	g_free (digest);
 	g_free (msgid);
@@ -1546,7 +1546,7 @@ gw_update_cache (CamelFolder *folder,
 		exists = FALSE;
 
 		if (uid_flag == FALSE) {
-			temp_item = (EGwItem *)item_list->data;
+			temp_item = (EGwItem *) item_list->data;
 			id = e_gw_item_get_id (temp_item);
 		} else
 			id = (gchar *) item_list->data;
@@ -1581,7 +1581,7 @@ gw_update_cache (CamelFolder *folder,
 		if (pmi) {
 			exists = TRUE;
 			camel_message_info_ref (pmi);
-			mi = (CamelGroupwiseMessageInfo *)pmi;
+			mi = (CamelGroupwiseMessageInfo *) pmi;
 		}
 
 		type = e_gw_item_get_item_type (item);
@@ -1591,7 +1591,7 @@ gw_update_cache (CamelFolder *folder,
 				continue;
 			}
 
-			mi = (CamelGroupwiseMessageInfo *)camel_message_info_new (folder->summary);
+			mi = (CamelGroupwiseMessageInfo *) camel_message_info_new (folder->summary);
 			if (mi->info.content == NULL) {
 				mi->info.content = camel_folder_summary_content_info_new (folder->summary);
 				mi->info.content->type = camel_content_type_new ("multipart", "mixed");
@@ -1686,7 +1686,7 @@ gw_update_cache (CamelFolder *folder,
 			mi->info.subject = camel_pstring_strdup (e_gw_item_get_subject (item));
 			groupwise_folder_set_threading_data (mi, item);
 
-			camel_folder_summary_add (folder->summary,(CamelMessageInfo *)mi);
+			camel_folder_summary_add (folder->summary,(CamelMessageInfo *) mi);
 			camel_folder_change_info_add_uid (changes, mi->info.uid);
 			camel_folder_change_info_recent_uid (changes, mi->info.uid);
 		}
@@ -1808,7 +1808,7 @@ gw_update_summary (CamelFolder *folder,
 	}
 
 	for (; item_list != NULL; item_list = g_list_next (item_list) ) {
-		EGwItem *item = (EGwItem *)item_list->data;
+		EGwItem *item = (EGwItem *) item_list->data;
 		EGwItemType type = E_GW_ITEM_TYPE_UNKNOWN;
 		EGwItemOrganizer *org;
 		gchar *temp_date = NULL;
@@ -1820,7 +1820,7 @@ gw_update_summary (CamelFolder *folder,
 		status_flags = 0;
 		id = e_gw_item_get_id (item);
 
-		mi = (CamelGroupwiseMessageInfo *)camel_folder_summary_uid (folder->summary, id);
+		mi = (CamelGroupwiseMessageInfo *) camel_folder_summary_uid (folder->summary, id);
 		if (mi)
 			exists = TRUE;
 
@@ -1926,7 +1926,7 @@ gw_update_summary (CamelFolder *folder,
 			camel_folder_change_info_change_uid (changes, e_gw_item_get_id (item));
 			camel_message_info_free (&mi->info);
 		} else {
-			camel_folder_summary_add (folder->summary,(CamelMessageInfo *)mi);
+			camel_folder_summary_add (folder->summary,(CamelMessageInfo *) mi);
 			camel_folder_change_info_add_uid (changes, mi->info.uid);
 			camel_folder_change_info_recent_uid (changes, mi->info.uid);
 		}
@@ -1982,7 +1982,7 @@ groupwise_folder_item_to_msg ( CamelFolder *folder,
 	if (attach_list) {
 		/*int attach_count = g_slist_length (attach_list);*/
 		GSList *al = attach_list;
-		EGwItemAttachment *attach = (EGwItemAttachment *)al->data;
+		EGwItemAttachment *attach = (EGwItemAttachment *) al->data;
 		gchar *attachment = NULL;
 		gint len = 0;
 
@@ -2010,7 +2010,7 @@ groupwise_folder_item_to_msg ( CamelFolder *folder,
 
 		if (!ignore_mime_822) {
 			for (al = attach_list; al != NULL; al = al->next) {
-				EGwItemAttachment *attach = (EGwItemAttachment *)al->data;
+				EGwItemAttachment *attach = (EGwItemAttachment *) al->data;
 				if (!g_ascii_strcasecmp (attach->name, "Mime.822")) {
 					if (attach->size > MAX_ATTACHMENT_SIZE) {
 						gint t_len , offset = 0, t_offset = 0;
@@ -2135,7 +2135,7 @@ groupwise_folder_item_to_msg ( CamelFolder *folder,
 		GSList *al;
 
 		for (al = attach_list; al != NULL; al = al->next) {
-			EGwItemAttachment *attach = (EGwItemAttachment *)al->data;
+			EGwItemAttachment *attach = (EGwItemAttachment *) al->data;
 			gchar *attachment = NULL;
 			gint len = 0;
 			CamelMimePart *part;
@@ -2301,7 +2301,7 @@ gw_update_all_items (CamelFolder *folder,
 		temp = NULL;
 
 		if (item_list) {
-			temp = g_list_find_custom (item_list, (const gchar *)uid, (GCompareFunc) strcmp);
+			temp = g_list_find_custom (item_list, (const gchar *) uid, (GCompareFunc) strcmp);
 		}
 
 		if (!temp) {
@@ -2329,7 +2329,7 @@ gw_update_all_items (CamelFolder *folder,
 		gw_update_cache (folder, item_list, TRUE, cancellable, error);
 		camel_service_unlock (CAMEL_SERVICE (parent_store), CAMEL_SERVICE_REC_CONNECT_LOCK);
 
-		g_list_foreach (item_list, (GFunc)g_free, NULL);
+		g_list_foreach (item_list, (GFunc) g_free, NULL);
 		g_list_free (item_list);
 	}
 
@@ -2341,7 +2341,7 @@ This code was used in some other provider also , imap4rev1 iirc */
 static gint
 uid_compar (gconstpointer va, gconstpointer vb)
 {
-	const gchar **sa = (const gchar **)va, **sb = (const gchar **)vb;
+	const gchar **sa = (const gchar **) va, **sb = (const gchar **) vb;
 	gulong a, b;
 
 	a = strtoul (*sa, NULL, 10);
@@ -2443,7 +2443,7 @@ groupwise_append_message_sync (CamelFolder *folder,
 	offline = CAMEL_OFFLINE_STORE (parent_store);
 
 	if (!camel_offline_store_get_online (offline)) {
-		camel_groupwise_journal_append ((CamelGroupwiseJournal *) ((CamelGroupwiseFolder *)folder)->journal, message, info, appended_uid, cancellable, error);
+		camel_groupwise_journal_append ((CamelGroupwiseJournal *) ((CamelGroupwiseFolder *) folder)->journal, message, info, appended_uid, cancellable, error);
 		return FALSE;
 	}
 	cnc = cnc_lookup (gw_store->priv);
@@ -2557,11 +2557,11 @@ groupwise_expunge_sync (CamelFolder *folder,
 		if (ginfo && (ginfo->info.flags & CAMEL_MESSAGE_DELETED)) {
 
 			if (deleted_items)
-				deleted_items = g_list_prepend (deleted_items, (gchar *)camel_message_info_uid (info));
+				deleted_items = g_list_prepend (deleted_items, (gchar *) camel_message_info_uid (info));
 			else {
 				g_list_free (deleted_head);
 				deleted_head = NULL;
-				deleted_head = deleted_items = g_list_prepend (deleted_items, (gchar *)camel_message_info_uid (info));
+				deleted_head = deleted_items = g_list_prepend (deleted_items, (gchar *) camel_message_info_uid (info));
 			}
 			if (g_list_length (deleted_items) == GROUPWISE_BULK_DELETE_LIMIT ) {
 				/* Read the FIXME below */
@@ -2571,7 +2571,7 @@ groupwise_expunge_sync (CamelFolder *folder,
 				if (status == E_GW_CONNECTION_STATUS_OK) {
 					gchar *uid;
 					while (deleted_items) {
-						uid = (gchar *)deleted_items->data;
+						uid = (gchar *) deleted_items->data;
 						CAMEL_GROUPWISE_FOLDER_REC_LOCK (folder, cache_lock);
 						camel_folder_change_info_remove_uid (changes, uid);
 						camel_folder_summary_remove_uid (folder->summary, uid);
@@ -2596,7 +2596,7 @@ groupwise_expunge_sync (CamelFolder *folder,
 		if (status == E_GW_CONNECTION_STATUS_OK) {
 			gchar *uid;
 			while (deleted_items) {
-				uid = (gchar *)deleted_items->data;
+				uid = (gchar *) deleted_items->data;
 				CAMEL_GROUPWISE_FOLDER_REC_LOCK (folder, cache_lock);
 				camel_folder_change_info_remove_uid (changes, uid);
 				camel_folder_summary_remove_uid (folder->summary, uid);
@@ -2777,7 +2777,7 @@ groupwise_refresh_info_sync (CamelFolder *folder,
 	 */
 	if (summary->time_string && (strlen (summary->time_string) > 0))  {
 		groupwise_refresh_folder (folder, cancellable, error);
-		si = camel_store_summary_path ((CamelStoreSummary *)((CamelGroupwiseStore *)parent_store)->summary, full_name);
+		si = camel_store_summary_path ((CamelStoreSummary *)((CamelGroupwiseStore *) parent_store)->summary, full_name);
 		if (si) {
 			guint32 unread, total;
 
@@ -2787,12 +2787,12 @@ groupwise_refresh_info_sync (CamelFolder *folder,
 			if (si->total != total || si->unread != unread) {
 				si->total = total;
 				si->unread = unread;
-				camel_store_summary_touch ((CamelStoreSummary *)((CamelGroupwiseStore *)parent_store)->summary);
+				camel_store_summary_touch ((CamelStoreSummary *)((CamelGroupwiseStore *) parent_store)->summary);
 			}
-			camel_store_summary_info_free ((CamelStoreSummary *)((CamelGroupwiseStore *)parent_store)->summary, si);
+			camel_store_summary_info_free ((CamelStoreSummary *)((CamelGroupwiseStore *) parent_store)->summary, si);
 		}
 		/* camel_folder_summary_save_to_db (folder->summary, ex); */
-		camel_store_summary_save ((CamelStoreSummary *)((CamelGroupwiseStore *)parent_store)->summary);
+		camel_store_summary_save ((CamelStoreSummary *)((CamelGroupwiseStore *) parent_store)->summary);
 	} else {
 		/* We probably could not get the messages the first time. (get_folder) failed???!
 		 * so do a get_folder again. And hope that it works
@@ -2889,7 +2889,7 @@ groupwise_transfer_messages_to_sync (CamelFolder *source,
 			if (!(message = groupwise_folder_get_message_sync (source, camel_message_info_uid (info), cancellable, error)))
 				break;
 
-			success = camel_groupwise_journal_transfer (journal, (CamelGroupwiseFolder *)source, message, info, uids->pdata[i], NULL, cancellable, error);
+			success = camel_groupwise_journal_transfer (journal, (CamelGroupwiseFolder *) source, message, info, uids->pdata[i], NULL, cancellable, error);
 			g_object_unref (message);
 
 			if (!success)
@@ -2948,7 +2948,7 @@ groupwise_transfer_messages_to_sync (CamelFolder *source,
 					need/use for a e_gw_connection_mark_ITEM_[un]read
 					*/
 
-					wrapper = g_list_prepend (wrapper, (gchar *)uid);
+					wrapper = g_list_prepend (wrapper, (gchar *) uid);
 					camel_service_lock (CAMEL_SERVICE (source_parent_store), CAMEL_SERVICE_REC_CONNECT_LOCK);
 					e_gw_connection_mark_read (cnc, wrapper);
 					camel_service_unlock (CAMEL_SERVICE (source_parent_store), CAMEL_SERVICE_REC_CONNECT_LOCK);
@@ -2964,7 +2964,7 @@ groupwise_transfer_messages_to_sync (CamelFolder *source,
 				*/
 
 				if (unset_flags.bits & CAMEL_MESSAGE_SEEN) {
-					wrapper = g_list_prepend (wrapper, (gchar *)uid);
+					wrapper = g_list_prepend (wrapper, (gchar *) uid);
 					camel_service_lock (CAMEL_SERVICE (source_parent_store), CAMEL_SERVICE_REC_CONNECT_LOCK);
 					e_gw_connection_mark_unread (cnc, wrapper);
 					camel_service_unlock (CAMEL_SERVICE (source_parent_store), CAMEL_SERVICE_REC_CONNECT_LOCK);
@@ -2981,18 +2981,18 @@ groupwise_transfer_messages_to_sync (CamelFolder *source,
 		} else {
 				if (delete_originals) {
 					if (strcmp(source_full_name, "Sent Items")) {
-							status = e_gw_connection_move_item (cnc, (const gchar *)uids->pdata[index],
+							status = e_gw_connection_move_item (cnc, (const gchar *) uids->pdata[index],
 											dest_container_id, source_container_id);
 					} else {
 							gchar *container_id = NULL;
 							container_id = e_gw_connection_get_container_id (cnc, "Mailbox");
-							status = e_gw_connection_move_item (cnc, (const gchar *)uids->pdata[index],
+							status = e_gw_connection_move_item (cnc, (const gchar *) uids->pdata[index],
 											dest_container_id, container_id);
 							g_free (container_id);
 					}
 
 				} else
-						status = e_gw_connection_move_item (cnc, (const gchar *)uids->pdata[index],
+						status = e_gw_connection_move_item (cnc, (const gchar *) uids->pdata[index],
 										dest_container_id, NULL);
 
 				if (status == E_GW_CONNECTION_STATUS_OK) {
@@ -3171,7 +3171,7 @@ convert_to_calendar (EGwItem *item, gchar **str, gint *len)
 		GSList *al;
 
 		for (al = attach_list; al != NULL; al = al->next) {
-			EGwItemAttachment *attach = (EGwItemAttachment *)al->data;
+			EGwItemAttachment *attach = (EGwItemAttachment *) al->data;
 			g_string_append_printf (gstr, "ATTACH:%s\n", attach->id);
 		}
 	}
diff --git a/src/camel/camel-groupwise-journal.c b/src/camel/camel-groupwise-journal.c
index 64bb281..aa688f6 100644
--- a/src/camel/camel-groupwise-journal.c
+++ b/src/camel/camel-groupwise-journal.c
@@ -411,7 +411,7 @@ camel_groupwise_journal_transfer (CamelGroupwiseJournal *groupwise_journal,
 	entry->type = CAMEL_GROUPWISE_JOURNAL_ENTRY_APPEND;
 	entry->uid = uid;
 	entry->original_uid = g_strdup (original_uid);
-	entry->source_container = g_strdup (camel_groupwise_store_container_id_lookup (gw_store, camel_folder_get_display_name (((CamelFolder *)source_folder))));
+	entry->source_container = g_strdup (camel_groupwise_store_container_id_lookup (gw_store, camel_folder_get_display_name (((CamelFolder *) source_folder))));
 
 	camel_dlist_addtail (&journal->queue, (CamelDListNode *) entry);
 
diff --git a/src/camel/camel-groupwise-private.h b/src/camel/camel-groupwise-private.h
index 6c06de6..ebc9bfe 100644
--- a/src/camel/camel-groupwise-private.h
+++ b/src/camel/camel-groupwise-private.h
@@ -31,13 +31,13 @@
 
 #ifdef ENABLE_THREADS
 #define CAMEL_GROUPWISE_FOLDER_LOCK(f, l) \
-	(g_static_mutex_lock (&((CamelGroupwiseFolder *)f)->priv->l))
+	(g_static_mutex_lock (&((CamelGroupwiseFolder *) f)->priv->l))
 #define CAMEL_GROUPWISE_FOLDER_UNLOCK(f, l) \
-	(g_static_mutex_unlock (&((CamelGroupwiseFolder *)f)->priv->l))
+	(g_static_mutex_unlock (&((CamelGroupwiseFolder *) f)->priv->l))
 #define CAMEL_GROUPWISE_FOLDER_REC_LOCK(f, l) \
-	(g_static_rec_mutex_lock (&((CamelGroupwiseFolder *)f)->priv->l))
+	(g_static_rec_mutex_lock (&((CamelGroupwiseFolder *) f)->priv->l))
 #define CAMEL_GROUPWISE_FOLDER_REC_UNLOCK(f, l) \
-	(g_static_rec_mutex_unlock (&((CamelGroupwiseFolder *)f)->priv->l))
+	(g_static_rec_mutex_unlock (&((CamelGroupwiseFolder *) f)->priv->l))
 #else
 #define GROUPWISE_FOLDER_LOCK(f, l)
 #define GROUPWISE_FOLDER_UNLOCK(f, l)
diff --git a/src/camel/camel-groupwise-provider.c b/src/camel/camel-groupwise-provider.c
index 681d348..4150275 100644
--- a/src/camel/camel-groupwise-provider.c
+++ b/src/camel/camel-groupwise-provider.c
@@ -158,7 +158,7 @@ add_hash (guint *hash, gchar *s)
 static guint
 groupwise_url_hash (gconstpointer key)
 {
-	const CamelURL *u = (CamelURL *)key;
+	const CamelURL *u = (CamelURL *) key;
 	guint hash = 0;
 
 	add_hash (&hash, u->user);
diff --git a/src/camel/camel-groupwise-store-summary.c b/src/camel/camel-groupwise-store-summary.c
index 80c0da2..38dede2 100644
--- a/src/camel/camel-groupwise-store-summary.c
+++ b/src/camel/camel-groupwise-store-summary.c
@@ -88,13 +88,13 @@ camel_groupwise_store_summary_full_name (CamelGroupwiseStoreSummary *s, const gc
 	gint count, i;
 	CamelGroupwiseStoreInfo *info;
 
-	count = camel_store_summary_count ((CamelStoreSummary *)s);
+	count = camel_store_summary_count ((CamelStoreSummary *) s);
 	for (i=0;i<count;i++) {
-		info = (CamelGroupwiseStoreInfo *)camel_store_summary_index ((CamelStoreSummary *)s, i);
+		info = (CamelGroupwiseStoreInfo *) camel_store_summary_index ((CamelStoreSummary *) s, i);
 		if (info) {
 			if (strcmp (info->full_name, full_name) == 0)
 				return info;
-			camel_store_summary_info_free ((CamelStoreSummary *)s, (CamelStoreInfo *)info);
+			camel_store_summary_info_free ((CamelStoreSummary *) s, (CamelStoreInfo *) info);
 		}
 	}
 
@@ -121,7 +121,7 @@ camel_groupwise_store_summary_full_to_path (CamelGroupwiseStoreSummary *s, const
 		}
 		*p = 0;
 	} else
-		path = (gchar *)full_name;
+		path = (gchar *) full_name;
 
 	return g_strdup (path);
 }
@@ -140,7 +140,7 @@ namespace_save (CamelStoreSummary *s, FILE *in, CamelGroupwiseStoreNamespace *ns
 {
 	if (camel_file_util_encode_string (in, ns->path) == -1
 			|| camel_file_util_encode_string (in, ns->full_name) == -1
-			|| camel_file_util_encode_uint32 (in, (guint32)ns->sep) == -1)
+			|| camel_file_util_encode_uint32 (in, (guint32) ns->sep) == -1)
 		return -1;
 
 	return 0;
@@ -157,7 +157,7 @@ namespace_free (CamelStoreSummary *s, CamelGroupwiseStoreNamespace *ns)
 static void
 namespace_clear (CamelStoreSummary *s)
 {
-	CamelGroupwiseStoreSummary *is = (CamelGroupwiseStoreSummary *)s;
+	CamelGroupwiseStoreSummary *is = (CamelGroupwiseStoreSummary *) s;
 
 	if (is->namespace)
 		namespace_free (s, is->namespace);
@@ -198,7 +198,7 @@ camel_groupwise_store_summary_path_to_full (CamelGroupwiseStoreSummary *s, const
 	subpath = alloca (strlen (path)+1);
 	strcpy (subpath, path);
 	do {
-		si = camel_store_summary_path ((CamelStoreSummary *)s, subpath);
+		si = camel_store_summary_path ((CamelStoreSummary *) s, subpath);
 		if (si == NULL) {
 			last = strrchr (subpath, '/');
 			if (last)
@@ -209,7 +209,7 @@ camel_groupwise_store_summary_path_to_full (CamelGroupwiseStoreSummary *s, const
 	/* path is already present, use the raw version we have */
 	if (si && strlen (subpath) == strlen (path)) {
 		f = g_strdup (camel_groupwise_store_info_full_name (s, si));
-		camel_store_summary_info_free ((CamelStoreSummary *)s, si);
+		camel_store_summary_info_free ((CamelStoreSummary *) s, si);
 		return f;
 	}
 
@@ -252,7 +252,7 @@ camel_groupwise_store_summary_path_to_full (CamelGroupwiseStoreSummary *s, const
 	if (si) {
 		full = g_strdup_printf("%s%s", camel_groupwise_store_info_full_name(s, si), f);
 		g_free (f);
-		camel_store_summary_info_free ((CamelStoreSummary *)s, si);
+		camel_store_summary_info_free ((CamelStoreSummary *) s, si);
 		f = full;
 	} else if (ns) {
 		full = g_strdup_printf("%s%s", ns->full_name, f);
@@ -303,7 +303,7 @@ camel_groupwise_store_summary_add_from_full (CamelGroupwiseStoreSummary *s, cons
 
 	info = camel_groupwise_store_summary_full_name (s, full_name);
 	if (info) {
-		camel_store_summary_info_free ((CamelStoreSummary *)s, (CamelStoreInfo *)info);
+		camel_store_summary_info_free ((CamelStoreSummary *) s, (CamelStoreInfo *) info);
 		d(printf("  already there\n"));
 		return info;
 	}
@@ -332,10 +332,10 @@ camel_groupwise_store_summary_add_from_full (CamelGroupwiseStoreSummary *s, cons
 		pathu8 = camel_groupwise_store_summary_full_to_path (s, full_name, dir_sep);
 	}
 
-	info = (CamelGroupwiseStoreInfo *)camel_store_summary_add_from_path ((CamelStoreSummary *)s, pathu8);
+	info = (CamelGroupwiseStoreInfo *) camel_store_summary_add_from_path ((CamelStoreSummary *) s, pathu8);
 	if (info) {
 		d(printf("  '%s' -> '%s'\n", pathu8, full_name));
-		camel_store_info_set_string ((CamelStoreSummary *)s, (CamelStoreInfo *)info, CAMEL_STORE_INFO_LAST, full_name);
+		camel_store_info_set_string ((CamelStoreSummary *) s, (CamelStoreInfo *) info, CAMEL_STORE_INFO_LAST, full_name);
 	} else {
 		d(printf("  failed\n"));
 	}
@@ -389,9 +389,9 @@ void
 camel_groupwise_store_summary_namespace_set (CamelGroupwiseStoreSummary *s, CamelGroupwiseStoreNamespace *ns)
 {
 	d(printf("Setting namesapce to '%s' '%c' -> '%s'\n", ns->full_name, ns->sep, ns->path));
-	namespace_clear ((CamelStoreSummary *)s);
+	namespace_clear ((CamelStoreSummary *) s);
 	s->namespace = ns;
-	camel_store_summary_touch ((CamelStoreSummary *)s);
+	camel_store_summary_touch ((CamelStoreSummary *) s);
 }
 
 CamelGroupwiseStoreNamespace *
@@ -418,12 +418,12 @@ camel_groupwise_store_summary_namespace_find_path (CamelGroupwiseStoreSummary *s
 static gint
 summary_header_load (CamelStoreSummary *s, FILE *in)
 {
-	CamelGroupwiseStoreSummary *summary = (CamelGroupwiseStoreSummary *)s;
+	CamelGroupwiseStoreSummary *summary = (CamelGroupwiseStoreSummary *) s;
 	 gint32 version, capabilities, count;
 
 	namespace_clear (s);
 
-	if (CAMEL_STORE_SUMMARY_CLASS (camel_groupwise_store_summary_parent_class)->summary_header_load ((CamelStoreSummary *)s, in) == -1
+	if (CAMEL_STORE_SUMMARY_CLASS (camel_groupwise_store_summary_parent_class)->summary_header_load ((CamelStoreSummary *) s, in) == -1
 			|| camel_file_util_decode_fixed_int32 (in, &version) == -1)
 		return -1;
 
@@ -449,7 +449,7 @@ summary_header_save (CamelStoreSummary *s, FILE *out)
 	guint32 count;
 
 	count = summary->namespace?1:0;
-	if (CAMEL_STORE_SUMMARY_CLASS (camel_groupwise_store_summary_parent_class)->summary_header_save ((CamelStoreSummary *)s, out) == -1
+	if (CAMEL_STORE_SUMMARY_CLASS (camel_groupwise_store_summary_parent_class)->summary_header_save ((CamelStoreSummary *) s, out) == -1
 			|| camel_file_util_encode_fixed_int32 (out, 0) == -1
 			|| camel_file_util_encode_fixed_int32 (out, summary->capabilities) == -1
 			|| camel_file_util_encode_fixed_int32 (out, count) == -1)
@@ -466,21 +466,21 @@ store_info_load (CamelStoreSummary *s, FILE *in)
 {
 	CamelGroupwiseStoreInfo *si;
 
-	si = (CamelGroupwiseStoreInfo *)CAMEL_STORE_SUMMARY_CLASS (camel_groupwise_store_summary_parent_class)->store_info_load (s, in);
+	si = (CamelGroupwiseStoreInfo *) CAMEL_STORE_SUMMARY_CLASS (camel_groupwise_store_summary_parent_class)->store_info_load (s, in);
 	if (si) {
 		if (camel_file_util_decode_string (in, &si->full_name) == -1) {
-			camel_store_summary_info_free (s, (CamelStoreInfo *)si);
+			camel_store_summary_info_free (s, (CamelStoreInfo *) si);
 			si = NULL;
 		}
 	}
 
-	return (CamelStoreInfo *)si;
+	return (CamelStoreInfo *) si;
 }
 
 static gint
 store_info_save (CamelStoreSummary *s, FILE *out, CamelStoreInfo *mi)
 {
-	CamelGroupwiseStoreInfo *summary = (CamelGroupwiseStoreInfo *)mi;
+	CamelGroupwiseStoreInfo *summary = (CamelGroupwiseStoreInfo *) mi;
 
 	if (CAMEL_STORE_SUMMARY_CLASS (camel_groupwise_store_summary_parent_class)->store_info_save (s, out, mi) == -1
 			|| camel_file_util_encode_string (out, summary->full_name) == -1)
@@ -492,7 +492,7 @@ store_info_save (CamelStoreSummary *s, FILE *out, CamelStoreInfo *mi)
 static void
 store_info_free (CamelStoreSummary *s, CamelStoreInfo *mi)
 {
-	CamelGroupwiseStoreInfo *si = (CamelGroupwiseStoreInfo *)mi;
+	CamelGroupwiseStoreInfo *si = (CamelGroupwiseStoreInfo *) mi;
 
 	g_free (si->full_name);
 	CAMEL_STORE_SUMMARY_CLASS (camel_groupwise_store_summary_parent_class)->store_info_free (s, mi);
@@ -501,7 +501,7 @@ store_info_free (CamelStoreSummary *s, CamelStoreInfo *mi)
 static const gchar *
 store_info_string (CamelStoreSummary *s, const CamelStoreInfo *mi, gint type)
 {
-	CamelGroupwiseStoreInfo *isi = (CamelGroupwiseStoreInfo *)mi;
+	CamelGroupwiseStoreInfo *isi = (CamelGroupwiseStoreInfo *) mi;
 
 	/* FIXME: Locks? */
 
@@ -518,7 +518,7 @@ store_info_string (CamelStoreSummary *s, const CamelStoreInfo *mi, gint type)
 static void
 store_info_set_string (CamelStoreSummary *s, CamelStoreInfo *mi, gint type, const gchar *str)
 {
-	CamelGroupwiseStoreInfo *isi = (CamelGroupwiseStoreInfo *)mi;
+	CamelGroupwiseStoreInfo *isi = (CamelGroupwiseStoreInfo *) mi;
 
 	g_assert (mi != NULL);
 
diff --git a/src/camel/camel-groupwise-store.c b/src/camel/camel-groupwise-store.c
index 86b8b94..5352a88 100644
--- a/src/camel/camel-groupwise-store.c
+++ b/src/camel/camel-groupwise-store.c
@@ -269,7 +269,7 @@ groupwise_connect_sync (CamelService *service,
 		store->summary, user_data_dir, '/');
 	camel_groupwise_store_summary_namespace_set (store->summary, ns);
 
-	if (camel_store_summary_count ((CamelStoreSummary *)store->summary) == 0) {
+	if (camel_store_summary_count ((CamelStoreSummary *) store->summary) == 0) {
 		/*Settting the refresh stamp to the current time*/
 		store->refresh_stamp = time (NULL);
 	}
@@ -292,7 +292,7 @@ groupwise_disconnect_cleanup (CamelService *service, gboolean clean, GError **er
 	CamelGroupwiseStorePrivate *priv = groupwise_store->priv;
 
 	if (groupwise_store->summary) {
-		camel_store_summary_save ((CamelStoreSummary *)groupwise_store->summary);
+		camel_store_summary_save ((CamelStoreSummary *) groupwise_store->summary);
 		g_object_unref (groupwise_store->summary);
 	}
 
@@ -454,8 +454,8 @@ groupwise_forget_folder (CamelGroupwiseStore *gw_store, const gchar *folder_name
 	g_rmdir (folder_dir);
 	g_free (folder_dir);
 
-	camel_store_summary_remove_path ( (CamelStoreSummary *)gw_store->summary, folder_name);
-	camel_store_summary_save ( (CamelStoreSummary *)gw_store->summary);
+	camel_store_summary_remove_path ( (CamelStoreSummary *) gw_store->summary, folder_name);
+	camel_store_summary_save ( (CamelStoreSummary *) gw_store->summary);
 
 	fi = groupwise_build_folder_info (gw_store, NULL, folder_name);
 	camel_store_folder_deleted (CAMEL_STORE (gw_store), fi);
@@ -570,7 +570,7 @@ groupwise_store_get_folder_sync (CamelStore *store,
 	}
 	g_free (folder_dir);
 
-	si = camel_store_summary_path ((CamelStoreSummary *)gw_store->summary, folder_name);
+	si = camel_store_summary_path ((CamelStoreSummary *) gw_store->summary, folder_name);
 	if (si) {
 		total = si->total;
 		camel_store_summary_info_free ((CamelStoreSummary *)(gw_store)->summary, si);
@@ -635,7 +635,7 @@ groupwise_store_get_folder_sync (CamelStore *store,
 				if (count == total || !list)
 						done = TRUE;
 
-				g_list_foreach (list, (GFunc)g_object_unref, NULL);
+				g_list_foreach (list, (GFunc) g_object_unref, NULL);
 				g_list_free (list);
 				list = NULL;
 				position = E_GW_CURSOR_POSITION_CURRENT;
@@ -692,7 +692,7 @@ gw_store_reload_folder (CamelGroupwiseStore *gw_store,
 	}
 
 	if (!E_IS_GW_CONNECTION ( priv->cnc)) {
-		if (!groupwise_connect_sync (CAMEL_SERVICE ((CamelStore*)gw_store), cancellable, error)) {
+		if (!groupwise_connect_sync (CAMEL_SERVICE ((CamelStore*) gw_store), cancellable, error)) {
 			camel_service_unlock (CAMEL_SERVICE (gw_store), CAMEL_SERVICE_REC_CONNECT_LOCK);
 			return FALSE;
 		}
@@ -700,7 +700,7 @@ gw_store_reload_folder (CamelGroupwiseStore *gw_store,
 
 	container_id =	g_strdup (g_hash_table_lookup (priv->name_hash, full_name));
 
-	si = camel_store_summary_path ((CamelStoreSummary *)gw_store->summary, name);
+	si = camel_store_summary_path ((CamelStoreSummary *) gw_store->summary, name);
 	if (si) {
 		total = si->total;
 		camel_store_summary_info_free ((CamelStoreSummary *)(gw_store)->summary, si);
@@ -772,7 +772,7 @@ gw_store_reload_folder (CamelGroupwiseStore *gw_store,
 					if (count == total || !list)
 							done = TRUE;
 
-					g_list_foreach (list, (GFunc)g_object_unref, NULL);
+					g_list_foreach (list, (GFunc) g_object_unref, NULL);
 					g_list_free (list);
 					list = NULL;
 					position = E_GW_CURSOR_POSITION_CURRENT;
@@ -974,23 +974,23 @@ groupwise_folders_sync (CamelGroupwiseStore *store,
 	}
 
 	e_gw_connection_free_container_list (list);
-	count = camel_store_summary_count ((CamelStoreSummary *)store->summary);
+	count = camel_store_summary_count ((CamelStoreSummary *) store->summary);
 
-	count = camel_store_summary_count ((CamelStoreSummary *)store->summary);
+	count = camel_store_summary_count ((CamelStoreSummary *) store->summary);
 	for (i=0;i<count;i++) {
-		si = camel_store_summary_index ((CamelStoreSummary *)store->summary, i);
+		si = camel_store_summary_index ((CamelStoreSummary *) store->summary, i);
 		if (si == NULL)
 			continue;
 
 		info = g_hash_table_lookup (present, camel_store_info_path (store->summary, si));
 		if (info != NULL) {
-			camel_store_summary_touch ((CamelStoreSummary *)store->summary);
+			camel_store_summary_touch ((CamelStoreSummary *) store->summary);
 		} else {
-			camel_store_summary_remove ((CamelStoreSummary *)store->summary, si);
+			camel_store_summary_remove ((CamelStoreSummary *) store->summary, si);
 			count--;
 			i--;
 		}
-		camel_store_summary_info_free ((CamelStoreSummary *)store->summary, si);
+		camel_store_summary_info_free ((CamelStoreSummary *) store->summary, si);
 	}
 
 	g_hash_table_foreach (present, get_folders_free, NULL);
@@ -1025,21 +1025,21 @@ groupwise_get_folder_info_offline (CamelStore *store, const gchar *top,
 
 	path = gw_concat (name, "*");
 
-	for (i=0;i<camel_store_summary_count ((CamelStoreSummary *)groupwise_store->summary);i++) {
-		CamelStoreInfo *si = camel_store_summary_index ((CamelStoreSummary *)groupwise_store->summary, i);
+	for (i=0;i<camel_store_summary_count ((CamelStoreSummary *) groupwise_store->summary);i++) {
+		CamelStoreInfo *si = camel_store_summary_index ((CamelStoreSummary *) groupwise_store->summary, i);
 
 		if (si == NULL)
 			continue;
 
 		if ( !strcmp (name, camel_groupwise_store_info_full_name (groupwise_store->summary, si))
 		     || match_path (path, camel_groupwise_store_info_full_name (groupwise_store->summary, si))) {
-			fi = groupwise_build_folder_info (groupwise_store, NULL, camel_store_info_path ((CamelStoreSummary *)groupwise_store->summary, si));
+			fi = groupwise_build_folder_info (groupwise_store, NULL, camel_store_info_path ((CamelStoreSummary *) groupwise_store->summary, si));
 			fi->unread = si->unread;
 			fi->total = si->total;
 			fi->flags = si->flags;
 			g_ptr_array_add (folders, fi);
 		}
-		camel_store_summary_info_free ((CamelStoreSummary *)groupwise_store->summary, si);
+		camel_store_summary_info_free ((CamelStoreSummary *) groupwise_store->summary, si);
 	}
 
 	g_free (name);
@@ -1062,7 +1062,7 @@ groupwise_store_get_folder_info_sync (CamelStore *store,
 	/* Do not call groupwise_store_connected function as it would internall call folders_sync
 	   to populate the hash table which is used for mapping container id */
 	if (!(camel_offline_store_get_online (CAMEL_OFFLINE_STORE (store))
-	    && camel_service_connect_sync ((CamelService *)store, error)))
+	    && camel_service_connect_sync ((CamelService *) store, error)))
 		goto offline;
 
 	camel_service_lock (CAMEL_SERVICE (store), CAMEL_SERVICE_REC_CONNECT_LOCK);
@@ -1072,8 +1072,8 @@ groupwise_store_get_folder_info_sync (CamelStore *store,
 		return NULL;
 	}
 
-	camel_store_summary_touch ((CamelStoreSummary *)groupwise_store->summary);
-	camel_store_summary_save ((CamelStoreSummary *)groupwise_store->summary);
+	camel_store_summary_touch ((CamelStoreSummary *) groupwise_store->summary);
+	camel_store_summary_save ((CamelStoreSummary *) groupwise_store->summary);
 
 	camel_service_unlock (CAMEL_SERVICE (store), CAMEL_SERVICE_REC_CONNECT_LOCK);
 
@@ -1103,7 +1103,7 @@ create_junk_folder (CamelStore *store)
 		status = e_gw_connection_modify_junk_settings (priv->cnc, JUNK_ENABLE, 0, 0,  JUNK_PERSISTENCE);
 	if (status == E_GW_CONNECTION_STATUS_OK) {
 		root = groupwise_build_folder_info (groupwise_store, parent_name, folder_name);
-		camel_store_summary_save ((CamelStoreSummary *)groupwise_store->summary);
+		camel_store_summary_save ((CamelStoreSummary *) groupwise_store->summary);
 
 		child_container_id = e_gw_connection_get_container_id (priv->cnc, "Junk Mail");
 		if (!child_container_id)
@@ -1173,7 +1173,7 @@ groupwise_store_create_folder_sync (CamelStore *store,
 		status = e_gw_connection_create_folder (priv->cnc,parent_id,folder_name, &child_container_id);
 	if (status == E_GW_CONNECTION_STATUS_OK) {
 		root = groupwise_build_folder_info (groupwise_store, parent_name,folder_name);
-		camel_store_summary_save ((CamelStoreSummary *)groupwise_store->summary);
+		camel_store_summary_save ((CamelStoreSummary *) groupwise_store->summary);
 
 		g_hash_table_insert (priv->id_hash, g_strdup (child_container_id), g_strdup (folder_name));
 		g_hash_table_insert (priv->name_hash, g_strdup (root->full_name), g_strdup (child_container_id));
@@ -1264,7 +1264,7 @@ groupwise_store_rename_folder_sync (CamelStore *store,
 	if (temp_new)
 		temp_new++;
 	else
-		temp_new = (gchar *)new_name;
+		temp_new = (gchar *) new_name;
 
 	if (!container_id || e_gw_connection_rename_folder (priv->cnc, container_id , temp_new) != E_GW_CONNECTION_STATUS_OK)
 	{
@@ -1399,7 +1399,7 @@ camel_groupwise_store_connected (CamelGroupwiseStore *store,
                                  GError **error)
 {
 	if (camel_offline_store_get_online (CAMEL_OFFLINE_STORE (store))
-	    && camel_service_connect_sync ((CamelService *)store, error)) {
+	    && camel_service_connect_sync ((CamelService *) store, error)) {
 		CamelGroupwiseStore *gw_store = (CamelGroupwiseStore *) store;
 		CamelGroupwiseStorePrivate *priv = gw_store->priv;
 
@@ -1527,8 +1527,8 @@ groupwise_store_initable_init (GInitable *initable,
 	path = g_alloca (strlen (user_data_dir) + 32);
 	sprintf (path, "%s/.summary", user_data_dir);
 	groupwise_store->summary = camel_groupwise_store_summary_new ();
-	camel_store_summary_set_filename ((CamelStoreSummary *)groupwise_store->summary, path);
-	camel_store_summary_touch ((CamelStoreSummary *)groupwise_store->summary);
+	camel_store_summary_set_filename ((CamelStoreSummary *) groupwise_store->summary, path);
+	camel_store_summary_touch ((CamelStoreSummary *) groupwise_store->summary);
 	camel_store_summary_load ((CamelStoreSummary *) groupwise_store->summary);
 
 	/*host and user*/
diff --git a/src/camel/camel-groupwise-summary.c b/src/camel/camel-groupwise-summary.c
index ccedf9e..f647dbe 100644
--- a/src/camel/camel-groupwise-summary.c
+++ b/src/camel/camel-groupwise-summary.c
@@ -64,15 +64,15 @@ static CamelMessageInfo *
 gw_message_info_clone (CamelFolderSummary *s, const CamelMessageInfo *mi)
 {
 	CamelGroupwiseMessageInfo *to;
-	const CamelGroupwiseMessageInfo *from = (const CamelGroupwiseMessageInfo *)mi;
+	const CamelGroupwiseMessageInfo *from = (const CamelGroupwiseMessageInfo *) mi;
 
-	to = (CamelGroupwiseMessageInfo *)CAMEL_FOLDER_SUMMARY_CLASS (camel_groupwise_summary_parent_class)->message_info_clone (s, mi);
+	to = (CamelGroupwiseMessageInfo *) CAMEL_FOLDER_SUMMARY_CLASS (camel_groupwise_summary_parent_class)->message_info_clone (s, mi);
 	to->server_flags = from->server_flags;
 
 	/* FIXME: parent clone should do this */
 	to->info.content = camel_folder_summary_content_info_new (s);
 
-	return (CamelMessageInfo *)to;
+	return (CamelMessageInfo *) to;
 }
 
 static void
@@ -206,7 +206,7 @@ message_info_from_db (CamelFolderSummary *s, CamelMIRecord *mir)
 	info = CAMEL_FOLDER_SUMMARY_CLASS (camel_groupwise_summary_parent_class)->message_info_from_db (s, mir);
 	if (info) {
 		gchar *part = mir->bdata;
-		iinfo = (CamelGroupwiseMessageInfo *)info;
+		iinfo = (CamelGroupwiseMessageInfo *) info;
 		iinfo->server_flags = bdata_extract_digit (&part);
 	}
 
@@ -234,7 +234,7 @@ error:
 static CamelMIRecord *
 message_info_to_db (CamelFolderSummary *s, CamelMessageInfo *info)
 {
-	CamelGroupwiseMessageInfo *iinfo = (CamelGroupwiseMessageInfo *)info;
+	CamelGroupwiseMessageInfo *iinfo = (CamelGroupwiseMessageInfo *) info;
 	struct _CamelMIRecord *mir;
 
 	mir = CAMEL_FOLDER_SUMMARY_CLASS (camel_groupwise_summary_parent_class)->message_info_to_db (s, info);
@@ -292,7 +292,7 @@ gw_info_set_flags (CamelMessageInfo *info,
                    guint32 set)
 {
 		guint32 old;
-		CamelMessageInfoBase *mi = (CamelMessageInfoBase *)info;
+		CamelMessageInfoBase *mi = (CamelMessageInfoBase *) info;
 		gint read = 0 , deleted = 0;
 
 		gint junk_flag = 0, junk_learn_flag = 0;
@@ -363,26 +363,26 @@ camel_gw_summary_add_offline (CamelFolderSummary *summary,
 	const CamelTag *tag;
 
 	/* Create summary entry */
-	mi = (CamelGroupwiseMessageInfo *)camel_folder_summary_info_new_from_message (summary, message, NULL);
+	mi = (CamelGroupwiseMessageInfo *) camel_folder_summary_info_new_from_message (summary, message, NULL);
 
 	/* Copy flags 'n' tags */
 	mi->info.flags = camel_message_info_flags (info);
 
 	flag = camel_message_info_user_flags (info);
 	while (flag) {
-		camel_message_info_set_user_flag ((CamelMessageInfo *)mi, flag->name, TRUE);
+		camel_message_info_set_user_flag ((CamelMessageInfo *) mi, flag->name, TRUE);
 		flag = flag->next;
 	}
 	tag = camel_message_info_user_tags (info);
 	while (tag) {
-		camel_message_info_set_user_tag ((CamelMessageInfo *)mi, tag->name, tag->value);
+		camel_message_info_set_user_tag ((CamelMessageInfo *) mi, tag->name, tag->value);
 		tag = tag->next;
 	}
 
 	mi->info.size = camel_message_info_size (info);
 	mi->info.uid = camel_pstring_strdup (uid);
 
-	camel_folder_summary_add (summary, (CamelMessageInfo *)mi);
+	camel_folder_summary_add (summary, (CamelMessageInfo *) mi);
 
 }
 
@@ -395,7 +395,7 @@ camel_gw_summary_add_offline_uncached (CamelFolderSummary *summary,
 
 	mi = camel_message_info_clone (info);
 	mi->info.uid = camel_pstring_strdup (uid);
-	camel_folder_summary_add (summary, (CamelMessageInfo *)mi);
+	camel_folder_summary_add (summary, (CamelMessageInfo *) mi);
 }
 
 void
diff --git a/src/camel/camel-groupwise-utils.c b/src/camel/camel-groupwise-utils.c
index 0c8f11b..eeaacf0 100644
--- a/src/camel/camel-groupwise-utils.c
+++ b/src/camel/camel-groupwise-utils.c
@@ -261,7 +261,7 @@ add_recipients (GSList *recipient_list, CamelAddress *recipients, gint recipient
 	total_add = camel_address_length (recipients);
 	for (i=0; i<total_add; i++) {
 		const gchar *name = NULL, *addr = NULL;
-		if (camel_internet_address_get ((CamelInternetAddress *)recipients, i , &name, &addr )) {
+		if (camel_internet_address_get ((CamelInternetAddress *) recipients, i , &name, &addr )) {
 
 			recipient = g_new0 (EGwItemRecipient, 1);
 
@@ -356,7 +356,7 @@ send_as_attachment (EGwConnection *cnc, EGwItem *item, CamelStream *content, Cam
 			attachment->contentType = g_strdup ("Mail");
 		} else {
 			GSList *attach_list = e_gw_item_get_attach_id_list (temp_item);
-			EGwItemAttachment *temp_attach = (EGwItemAttachment *)attach_list->data;
+			EGwItemAttachment *temp_attach = (EGwItemAttachment *) attach_list->data;
 			attachment->id = g_strdup (temp_attach->id);
 			attachment->item_reference = g_strdup (temp_attach->item_reference);
 			g_free (attachment->name);
@@ -421,7 +421,7 @@ camel_groupwise_util_item_from_message (EGwConnection *cnc, CamelMimeMessage *me
 		recipient_list = populate_recipients (message, item, FALSE);
 
 	/** Get the mime parts from CamelMimemessge **/
-	mp = (CamelMultipart *)camel_medium_get_content (CAMEL_MEDIUM (message));
+	mp = (CamelMultipart *) camel_medium_get_content (CAMEL_MEDIUM (message));
 	if (!mp) {
 		g_warning ("ERROR: Could not get content object");
 		return NULL;
@@ -441,7 +441,7 @@ camel_groupwise_util_item_from_message (EGwConnection *cnc, CamelMimeMessage *me
 		content = camel_stream_mem_new_with_byte_array (byte_array);
 
 		dw = camel_medium_get_content (CAMEL_MEDIUM (message));
-		type = camel_mime_part_get_content_type ((CamelMimePart *)message);
+		type = camel_mime_part_get_content_type ((CamelMimePart *) message);
 
 		if (camel_content_type_is (type, "text", "plain")) {
 			CamelStream *filtered_stream;
@@ -469,7 +469,7 @@ camel_groupwise_util_item_from_message (EGwConnection *cnc, CamelMimeMessage *me
 			g_object_unref (filtered_stream);
 
 			camel_stream_write (content, "", 1, NULL, NULL);
-			e_gw_item_set_message (item, (const gchar *)byte_array->data);
+			e_gw_item_set_message (item, (const gchar *) byte_array->data);
 		} else {
 			camel_data_wrapper_decode_to_stream_sync (dw, content, NULL, NULL);
 			send_as_attachment (cnc, item, content, type, dw, NULL, NULL, &attach_list);
@@ -479,7 +479,7 @@ camel_groupwise_util_item_from_message (EGwConnection *cnc, CamelMimeMessage *me
 	}
 	/*Populate EGwItem*/
 	/*From Address*/
-	camel_internet_address_get ((CamelInternetAddress *)from, 0 , &display_name, &email);
+	camel_internet_address_get ((CamelInternetAddress *) from, 0 , &display_name, &email);
 	org->display_name = g_strdup (display_name);
 	org->email = g_strdup (email);
 	e_gw_item_set_organizer (item, org);
@@ -495,23 +495,23 @@ camel_groupwise_util_item_from_message (EGwConnection *cnc, CamelMimeMessage *me
 	/*send options*/
 	e_gw_item_set_sendoptions (item, TRUE);
 
-	if ((gchar *)camel_medium_get_header (CAMEL_MEDIUM (message), X_REPLY_CONVENIENT))
+	if ((gchar *) camel_medium_get_header (CAMEL_MEDIUM (message), X_REPLY_CONVENIENT))
 		e_gw_item_set_reply_request (item, TRUE);
 
-	send_options = (gchar *)camel_medium_get_header (CAMEL_MEDIUM (message), X_REPLY_WITHIN);
+	send_options = (gchar *) camel_medium_get_header (CAMEL_MEDIUM (message), X_REPLY_WITHIN);
 	if (send_options) {
 		e_gw_item_set_reply_request (item, TRUE);
 		e_gw_item_set_reply_within (item, send_options);
 	}
-	send_options = (gchar *)camel_medium_get_header (CAMEL_MEDIUM (message),X_EXPIRE_AFTER);
+	send_options = (gchar *) camel_medium_get_header (CAMEL_MEDIUM (message),X_EXPIRE_AFTER);
 	if (send_options)
 		e_gw_item_set_expires (item, send_options);
 
-	send_options = (gchar *)camel_medium_get_header (CAMEL_MEDIUM (message), X_DELAY_UNTIL);
+	send_options = (gchar *) camel_medium_get_header (CAMEL_MEDIUM (message), X_DELAY_UNTIL);
 	if (send_options)
 		e_gw_item_set_delay_until (item, send_options);
 
-	send_options = (gchar *)camel_medium_get_header (CAMEL_MEDIUM (message), X_TRACK_WHEN);
+	send_options = (gchar *) camel_medium_get_header (CAMEL_MEDIUM (message), X_TRACK_WHEN);
 
 	/*we check if user has modified the status tracking options, if no then we anyway
 	 * set status tracking all*/
@@ -529,10 +529,10 @@ camel_groupwise_util_item_from_message (EGwConnection *cnc, CamelMimeMessage *me
 	} else
 		e_gw_item_set_track_info (item, E_GW_ITEM_ALL);
 
-	if ((gchar *)camel_medium_get_header (CAMEL_MEDIUM (message), X_AUTODELETE))
+	if ((gchar *) camel_medium_get_header (CAMEL_MEDIUM (message), X_AUTODELETE))
 		e_gw_item_set_autodelete (item, TRUE);
 
-	send_options = (gchar *)camel_medium_get_header (CAMEL_MEDIUM (message), X_RETURN_NOTIFY_OPEN);
+	send_options = (gchar *) camel_medium_get_header (CAMEL_MEDIUM (message), X_RETURN_NOTIFY_OPEN);
 	if (send_options) {
 		switch (atoi (send_options)) {
 			case 0: e_gw_item_set_notify_opened (item, E_GW_ITEM_NOTIFY_NONE);
@@ -540,7 +540,7 @@ camel_groupwise_util_item_from_message (EGwConnection *cnc, CamelMimeMessage *me
 			case 1: e_gw_item_set_notify_opened (item, E_GW_ITEM_NOTIFY_MAIL);
 		}
 	}
-	send_options = (gchar *)camel_medium_get_header (CAMEL_MEDIUM (message), X_RETURN_NOTIFY_DELETE);
+	send_options = (gchar *) camel_medium_get_header (CAMEL_MEDIUM (message), X_RETURN_NOTIFY_DELETE);
 	if (send_options) {
 		switch (atoi (send_options)) {
 			case 0: e_gw_item_set_notify_deleted (item, E_GW_ITEM_NOTIFY_NONE);
@@ -549,7 +549,7 @@ camel_groupwise_util_item_from_message (EGwConnection *cnc, CamelMimeMessage *me
 		}
 	}
 
-	send_options = (gchar *)camel_medium_get_header (CAMEL_MEDIUM (message), X_SEND_OPT_PRIORITY);
+	send_options = (gchar *) camel_medium_get_header (CAMEL_MEDIUM (message), X_SEND_OPT_PRIORITY);
 	if (send_options) {
 		switch (atoi (send_options)) {
 			case E_GW_PRIORITY_HIGH: e_gw_item_set_priority(item, "High");
@@ -561,7 +561,7 @@ camel_groupwise_util_item_from_message (EGwConnection *cnc, CamelMimeMessage *me
 		}
 	}
 
-	send_options = (gchar *)camel_medium_get_header (CAMEL_MEDIUM (message), X_SEND_OPT_SECURITY);
+	send_options = (gchar *) camel_medium_get_header (CAMEL_MEDIUM (message), X_SEND_OPT_SECURITY);
 	if (send_options) {
 		switch (atoi (send_options)) {
 			case E_GW_SECURITY_NORMAL : e_gw_item_set_security(item, "Normal");
@@ -663,7 +663,7 @@ do_multipart (EGwConnection *cnc, EGwItem *item, CamelMultipart *mp, GSList **at
 			temp_buffer = g_byte_array_new ();
 			temp_content = camel_stream_mem_new_with_byte_array (temp_buffer);
 
-			temp_part = camel_multipart_get_part ((CamelMultipart *)dw, 1);
+			temp_part = camel_multipart_get_part ((CamelMultipart *) dw, 1);
 			if (temp_part) {
 				temp_dw = camel_medium_get_content (CAMEL_MEDIUM (temp_part));
 				camel_data_wrapper_write_to_stream_sync (temp_dw, temp_content, NULL, NULL);
diff --git a/src/plugins/camel-gw-listener.c b/src/plugins/camel-gw-listener.c
index ed73953..34aaae0 100644
--- a/src/plugins/camel-gw-listener.c
+++ b/src/plugins/camel-gw-listener.c
@@ -810,7 +810,7 @@ account_added (EAccountList *account_listener, EAccount *account)
 	info->auto_check = account->source->auto_check;
 	info->auto_check_time = account->source->auto_check_time;
 	if (account->parent_uid) {
-		parent = (EAccount *)e_account_list_find (account_listener, E_ACCOUNT_FIND_UID, account->parent_uid);
+		parent = (EAccount *) e_account_list_find (account_listener, E_ACCOUNT_FIND_UID, account->parent_uid);
 
 		if (!parent)
 			return;
@@ -960,7 +960,7 @@ prune_proxies (void) {
 			if (!strcmp (e_source_group_peek_base_uri (group), "groupwise://")) {
 				e_sources = e_source_group_peek_sources (group);
 				for (p = e_sources; p != NULL; p = p->next) {
-					source = (ESource *)p->data;
+					source = (ESource *) p->data;
 					parent_id_name = e_source_get_property (source, "parent_id_name");
 					if (parent_id_name) {
 						e_source_group_remove_source (group, source);
diff --git a/src/plugins/groupwise-account-setup.c b/src/plugins/groupwise-account-setup.c
index f232bab..da9ff06 100644
--- a/src/plugins/groupwise-account-setup.c
+++ b/src/plugins/groupwise-account-setup.c
@@ -92,7 +92,7 @@ ensure_mandatory_esource_properties (EPlugin *ep, ESEventTargetUpgrade *target)
 	al = e_get_account_list ();
 	client = gconf_client_get_default ();
 
-	for (it = e_list_get_iterator ((EList *)al);
+	for (it = e_list_get_iterator ((EList *) al);
 			e_iterator_is_valid (it);
 			e_iterator_next (it)) {
 		EAccount *a;
diff --git a/src/plugins/install-shared.c b/src/plugins/install-shared.c
index 6d290d0..e8007c6 100644
--- a/src/plugins/install-shared.c
+++ b/src/plugins/install-shared.c
@@ -50,7 +50,7 @@ void org_gnome_popup_wizard (EPlugin *ep, EMEventTargetMessage *target);
 static void
 install_folder_response (EMFolderSelector *emfs, gint response, gpointer *data)
 {
-	struct AcceptData *accept_data = (struct AcceptData *)data;
+	struct AcceptData *accept_data = (struct AcceptData *) data;
 	EMFolderTreeModel *model;
 	const gchar *uri, *path;
 	gint parts = 0;
@@ -81,7 +81,7 @@ install_folder_response (EMFolderSelector *emfs, gint response, gpointer *data)
 		path = em_folder_selector_get_selected_path (emfs);
 		names = g_strsplit (path, "/", -1);
 		if (names == NULL) {
-			folder_name = (gchar *)path;
+			folder_name = (gchar *) path;
 			parent_name = NULL;
 		} else {
 			while (names[parts])
@@ -109,7 +109,7 @@ install_folder_response (EMFolderSelector *emfs, gint response, gpointer *data)
 		if (E_IS_GW_CONNECTION (cnc)) {
 			container_id = get_container_id (cnc, parent_name);
 
-			if (e_gw_connection_accept_shared_folder (cnc, folder_name, container_id, (gchar *)item_id, NULL) == E_GW_CONNECTION_STATUS_OK) {
+			if (e_gw_connection_accept_shared_folder (cnc, folder_name, container_id, (gchar *) item_id, NULL) == E_GW_CONNECTION_STATUS_OK) {
 				const gchar *uid;
 
 				/* FIXME Not passing a GCancellable or GError here. */
@@ -150,7 +150,7 @@ install_folder_response (EMFolderSelector *emfs, gint response, gpointer *data)
 		}
 
 		g_strfreev (names);
-		gtk_widget_destroy ((GtkWidget *)emfs);
+		gtk_widget_destroy ((GtkWidget *) emfs);
 	}
 
 }
@@ -217,13 +217,13 @@ org_gnome_popup_wizard (EPlugin *ep, EMEventTargetMessage *target)
 		return;
 
 	if (((gchar *)camel_medium_get_header (CAMEL_MEDIUM(msg),"X-notification")) == NULL
-	    || (from_addr = camel_mime_message_get_from ((CamelMimeMessage *)target->message)) == NULL
+	    || (from_addr = camel_mime_message_get_from ((CamelMimeMessage *) target->message)) == NULL
 	    || !camel_internet_address_get (from_addr, 0, &name, &email)
 	    || (dw = camel_medium_get_content (CAMEL_MEDIUM (msg))) == NULL) {
 		return;
 	} else {
 		if (CAMEL_IS_MULTIPART (dw)) {
-			dw = camel_medium_get_content ((CamelMedium *)camel_multipart_get_part ((CamelMultipart *)dw, 0));
+			dw = camel_medium_get_content ((CamelMedium *) camel_multipart_get_part ((CamelMultipart *) dw, 0));
 			if (dw == NULL)
 				return;
 		}
@@ -233,7 +233,7 @@ org_gnome_popup_wizard (EPlugin *ep, EMEventTargetMessage *target)
 		camel_data_wrapper_write_to_stream_sync (dw, stream, NULL, NULL);
 		camel_stream_write (stream, "", 1, NULL, NULL);
 
-		from_addr = camel_mime_message_get_from ((CamelMimeMessage *)target->message);
+		from_addr = camel_mime_message_get_from ((CamelMimeMessage *) target->message);
 		if (from_addr && camel_internet_address_get (from_addr, 0, &name, &email)) {
 			GtkWidget *page;
 			GtkAssistant *assistant = GTK_ASSISTANT (gtk_assistant_new ());
diff --git a/src/plugins/junk-mail-settings.c b/src/plugins/junk-mail-settings.c
index 901e74a..4a8fa7a 100644
--- a/src/plugins/junk-mail-settings.c
+++ b/src/plugins/junk-mail-settings.c
@@ -41,7 +41,7 @@
 static void
 abort_changes (JunkSettings *js)
 {
-	g_object_run_dispose ((GObject *)js);
+	g_object_run_dispose ((GObject *) js);
 }
 
 static void
@@ -98,13 +98,13 @@ gw_junk_mail_settings_cb (GtkAction *action, EShellView *shell_view)
 	g_free (msg);
 
 	junk_tab = junk_settings_new (cnc);
-	w = (GtkWidget *)junk_tab->vbox;
+	w = (GtkWidget *) junk_tab->vbox;
 	gtk_box_pack_start ((GtkBox *) box, w, FALSE, FALSE, 6);
 
 	/* We might have to add more options for settings i.e. more pages */
 	while (page_count > 0 ) {
 		notebook = gtk_notebook_new ();
-		gtk_notebook_append_page ((GtkNotebook *)notebook, box, NULL);
+		gtk_notebook_append_page ((GtkNotebook *) notebook, box, NULL);
 		gtk_box_pack_start (
 			GTK_BOX (content_area), notebook, TRUE, TRUE, 0);
 	}
diff --git a/src/plugins/junk-settings.c b/src/plugins/junk-settings.c
index da88b54..547d601 100644
--- a/src/plugins/junk-settings.c
+++ b/src/plugins/junk-settings.c
@@ -314,7 +314,7 @@ add_clicked (GtkButton *button, JunkSettings *js)
 		else {
 			/*check whether already exists*/
 			if (js->junk_list && email) {
-				new_entry = find_node (js->junk_list, (gchar *)email);
+				new_entry = find_node (js->junk_list, (gchar *) email);
 				if (new_entry)
 					return;
 
@@ -398,9 +398,9 @@ junk_settings_construct (JunkSettings *js)
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (js->scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 
 	js->model = gtk_list_store_new (4, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN);
-	js->entry_list = (GtkTreeView *)gtk_tree_view_new ();
+	js->entry_list = (GtkTreeView *) gtk_tree_view_new ();
 	/*gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (js->scrolled_window), (GtkWidget *)js->entry_list);*/
-	gtk_container_add (GTK_CONTAINER (js->scrolled_window), (GtkWidget *)js->entry_list);
+	gtk_container_add (GTK_CONTAINER (js->scrolled_window), (GtkWidget *) js->entry_list);
 	gtk_tree_view_set_model (GTK_TREE_VIEW (js->entry_list), GTK_TREE_MODEL (js->model));
 	gtk_widget_show (GTK_WIDGET (js->entry_list));
 
diff --git a/src/plugins/mail-send-options.c b/src/plugins/mail-send-options.c
index 7c31b6e..efb1612 100644
--- a/src/plugins/mail-send-options.c
+++ b/src/plugins/mail-send-options.c
@@ -228,7 +228,7 @@ gw_ui_composer_actions (GtkUIManager *manager, EMsgComposer *composer)
 void
 org_gnome_composer_message_reply (EPlugin *ep, EMEventTargetMessage *t)
 {
-	EMsgComposer *comp = (struct _EMsgComposer *)t->composer;
+	EMsgComposer *comp = (struct _EMsgComposer *) t->composer;
 	EComposerHeaderTable *table;
 	EAccount *account = NULL;
 	gchar *temp = NULL;
diff --git a/src/plugins/process-meeting.c b/src/plugins/process-meeting.c
index 3eb8d59..2ada649 100644
--- a/src/plugins/process-meeting.c
+++ b/src/plugins/process-meeting.c
@@ -182,7 +182,7 @@ process_meeting (ECalendarView *cal_view, icalparameter_partstat status)
 			else
 				msg = "org.gnome.evolution.process_meeting:recurrence-decline";
 
-			response = e_alert_run_dialog_for_args (GTK_WINDOW (gtk_widget_get_toplevel ((GtkWidget *)cal_view)),
+			response = e_alert_run_dialog_for_args (GTK_WINDOW (gtk_widget_get_toplevel ((GtkWidget *) cal_view)),
 								msg, NULL);
 			if (response == GTK_RESPONSE_YES) {
 				icalproperty *prop;
@@ -353,7 +353,7 @@ object_created_cb (CompEditor *ce, gpointer data)
 
 	gtk_widget_hide (GTK_WIDGET (ce));
 
-	response = e_alert_run_dialog_for_args (GTK_WINDOW (gtk_widget_get_toplevel ((GtkWidget *)ce)),
+	response = e_alert_run_dialog_for_args (GTK_WINDOW (gtk_widget_get_toplevel ((GtkWidget *) ce)),
 						"org.gnome.evolution.process_meeting:resend-retract",
 						NULL);
 	if (response == GTK_RESPONSE_NO) {
diff --git a/src/plugins/proxy-login.c b/src/plugins/proxy-login.c
index fd96f56..2f6bd12 100644
--- a/src/plugins/proxy-login.c
+++ b/src/plugins/proxy-login.c
@@ -81,7 +81,7 @@ proxy_login_finalize (GObject *object)
 
 	g_return_if_fail (IS_PROXY_LOGIN (prd));
 	priv = prd->priv;
-	g_list_foreach (prd->proxy_list, (GFunc)g_free, NULL);
+	g_list_foreach (prd->proxy_list, (GFunc) g_free, NULL);
 	g_list_free (prd->proxy_list);
 	prd->proxy_list = NULL;
 	g_object_unref (priv->builder);
@@ -333,7 +333,7 @@ proxy_soap_login (gchar *email, GtkWindow *error_parent)
 	}
 
 	/* README: There should not be the weird scenario of the proxy itself configured as an account.
-	   If so, it is violating the (li)unix philosophy of User creation. So dont care about that scenario*/
+	   If so, it is violating the (li) unix philosophy of User creation. So dont care about that scenario*/
 
 	if (itip_address_is_user (email)) {
 		e_alert_run_dialog_for_args (error_parent,
diff --git a/src/plugins/proxy.c b/src/plugins/proxy.c
index 00b011c..9a88ff7 100644
--- a/src/plugins/proxy.c
+++ b/src/plugins/proxy.c
@@ -336,7 +336,7 @@ proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog, GtkWindow *pa
 
 				for (; tmp != NULL; tmp = g_list_next (tmp)) {
 					email = NULL;
-					email = (gchar *)e_destination_get_email (tmp->data);
+					email = (gchar *) e_destination_get_email (tmp->data);
 
 					if (g_str_equal(email, ""))
 						continue;
@@ -517,7 +517,7 @@ proxy_abort (GtkWidget *button, EConfigHookItemFactoryData *data)
 	EAccount *account;
 	proxyDialog *prd = NULL;
 
-	target_account = (EMConfigTargetAccount *)data->config->target;
+	target_account = (EMConfigTargetAccount *) data->config->target;
 	account = target_account->modified_account;
 	prd = g_object_get_data ((GObject *)account, "prd");
 
@@ -538,7 +538,7 @@ proxy_commit (GtkWidget *button, EConfigHookItemFactoryData *data)
 	proxyHandler *aclInstance;
 	proxyDialog *prd = NULL;
 
-	target_account = (EMConfigTargetAccount *)data->config->target;
+	target_account = (EMConfigTargetAccount *) data->config->target;
 	account = target_account->modified_account;
 	prd = g_object_get_data ((GObject *)account, "prd");
 
@@ -651,7 +651,7 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data)
 	shell_backend = e_shell_get_backend_by_name (shell, "mail");
 	session = e_mail_backend_get_session (E_MAIL_BACKEND (shell_backend));
 
-	target_account = (EMConfigTargetAccount *)data->config->target;
+	target_account = (EMConfigTargetAccount *) data->config->target;
 	account = target_account->modified_account;
 	/* We are using some g_object_set on this. We shuold also avoid double-free later. So reffing */
 	g_object_ref (account);
@@ -693,19 +693,19 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data)
 			priv->tab_dialog = gtk_vbox_new (TRUE, 10);
 			/*To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation*/
 			label = gtk_label_new (_("The Proxy tab will be available only when the account is online."));
-			gtk_box_pack_start ((GtkBox *)priv->tab_dialog, label, TRUE, TRUE, 10);
+			gtk_box_pack_start ((GtkBox *) priv->tab_dialog, label, TRUE, TRUE, 10);
 		} else {
 			GtkWidget *label;
 			priv->tab_dialog = gtk_vbox_new (TRUE, 10);
 			/*To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation*/
 			label = gtk_label_new (_("The Proxy tab will be available only when the account is enabled."));
-			gtk_box_pack_start ((GtkBox *)priv->tab_dialog, label, TRUE, TRUE, 10);
+			gtk_box_pack_start ((GtkBox *) priv->tab_dialog, label, TRUE, TRUE, 10);
 		}
 
 		/*To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation*/
 		gtk_notebook_append_page ((GtkNotebook *)(data->parent), (GtkWidget *)priv->tab_dialog, gtk_label_new (C_("GW", "Proxy")));
 		g_signal_connect ((GtkNotebook *)(data->parent), "switch-page", G_CALLBACK (proxy_page_changed_cb), account);
-		pag_num = gtk_notebook_page_num ((GtkNotebook *)(data->parent), (GtkWidget *)priv->tab_dialog);
+		pag_num = gtk_notebook_page_num ((GtkNotebook *)(data->parent), (GtkWidget *) priv->tab_dialog);
 		g_object_set_data ((GObject *) account, "proxy_tab_num", GINT_TO_POINTER (pag_num));
 		gtk_widget_show_all (priv->tab_dialog);
 	}  else if (!g_strrstr (e_account_get_string(account, E_ACCOUNT_SOURCE_URL), "groupwise://")) {
@@ -936,7 +936,7 @@ proxy_add_account (GtkWidget *button, EAccount *account)
 	proxy_name = e_builder_get_widget (priv->builder, "proxy_account_name");
 	name_box = e_builder_get_widget (priv->builder, "proxy_name_box");
 	gtk_widget_hide (proxy_name);
-	gtk_container_add ((GtkContainer *)name_box, (GtkWidget *)name_selector_entry);
+	gtk_container_add ((GtkContainer *) name_box, (GtkWidget *) name_selector_entry);
 	gtk_widget_show ((GtkWidget *) name_selector_entry);
 	gtk_widget_grab_focus ((GtkWidget *) name_selector_entry);
 }
diff --git a/src/plugins/send-options.c b/src/plugins/send-options.c
index 1e6ef39..b3323ff 100644
--- a/src/plugins/send-options.c
+++ b/src/plugins/send-options.c
@@ -200,7 +200,7 @@ org_gnome_send_options (EPlugin *epl, EConfigHookItemFactoryData *data)
 	GtkWidget *frame, *button, *label, *vbox;
 	gchar *markup;
 
-	target_account = (EMConfigTargetAccount *)data->config->target;
+	target_account = (EMConfigTargetAccount *) data->config->target;
 	account = target_account->modified_account;
 
 	if (!g_strrstr (account->source->url, "groupwise://"))
diff --git a/src/plugins/share-folder-common.c b/src/plugins/share-folder-common.c
index 20720e9..cbfda21 100644
--- a/src/plugins/share-folder-common.c
+++ b/src/plugins/share-folder-common.c
@@ -92,7 +92,7 @@ refresh_folder_tree (EMFolderTreeModel *model, CamelStore *store)
 void
 shared_folder_commit (EPlugin *ep, EConfigTarget *tget)
 {
-	EMConfigTargetFolder *target =  (EMConfigTargetFolder *)tget->config->target;
+	EMConfigTargetFolder *target =  (EMConfigTargetFolder *) tget->config->target;
 	CamelStore *parent_store;
 	EMFolderTreeModel *model = em_folder_tree_model_new (); /*mail_component_peek_tree_model (mail_component_peek ());*/
 
@@ -101,7 +101,7 @@ shared_folder_commit (EPlugin *ep, EConfigTarget *tget)
 	if (common) {
 		share_folder (common);
 		refresh_folder_tree (model, parent_store);
-		g_object_run_dispose ((GObject *)common);
+		g_object_run_dispose ((GObject *) common);
 		common = NULL;
 	}
 }
@@ -110,7 +110,7 @@ void
 shared_folder_abort (EPlugin *ep, EConfigTarget *target)
 {
 	if (common) {
-		g_object_run_dispose ((GObject *)common);
+		g_object_run_dispose ((GObject *) common);
 		common = NULL;
 	}
 }
@@ -284,7 +284,7 @@ users_dialog_response (GtkWidget *dialog, gint response, struct ShareInfo *ssi)
 		rule = em_vfolder_rule_new (session);
 		e_filter_rule_set_name (rule, path);
 		vfolder_gui_add_rule (EM_VFOLDER_RULE (rule));
-		gtk_widget_destroy ((GtkWidget *)emfs);
+		gtk_widget_destroy ((GtkWidget *) emfs);
 	} else {
 		g_object_ref (emfs);
 		ssi->d = dialog;
@@ -380,7 +380,7 @@ org_gnome_shared_folder_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_d
 	gchar *folder_name = NULL;
 	EGwConnection *cnc;
 	ShareFolder *sharing_tab;
-	EMConfigTargetFolder *target=  (EMConfigTargetFolder *)hook_data->config->target;
+	EMConfigTargetFolder *target=  (EMConfigTargetFolder *) hook_data->config->target;
 	CamelFolder *folder = target->folder;
 
 	folder_name = g_strdup (camel_folder_get_full_name (folder));
diff --git a/src/plugins/share-folder.c b/src/plugins/share-folder.c
index ca56e7f..cd0a22b 100644
--- a/src/plugins/share-folder.c
+++ b/src/plugins/share-folder.c
@@ -354,7 +354,7 @@ add_clicked (GtkButton *button, ShareFolder *sf)
 
 			/*check whether already exists*/
 			if (sf->users_list && email) {
-				new_user = find_node (sf->users_list, (gchar *)email);
+				new_user = find_node (sf->users_list, (gchar *) email);
 				if (new_user)
 					return;
 
@@ -531,10 +531,10 @@ notification_clicked (GtkButton *button, ShareFolder *sf)
 	gtk_window_set_title (GTK_WINDOW (sf->window), _("Custom Notification"));
 	gtk_window_set_position (GTK_WINDOW (sf->window) , GTK_WIN_POS_CENTER_ALWAYS);
 	gtk_window_set_default_size (GTK_WINDOW (sf->window), 100, 200);
-	gtk_window_set_transient_for ((GtkWindow *)sf->window, GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (sf->table))));
-	gtk_window_set_modal ((GtkWindow *)sf->window, TRUE);
+	gtk_window_set_transient_for ((GtkWindow *) sf->window, GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (sf->table))));
+	gtk_window_set_modal ((GtkWindow *) sf->window, TRUE);
 	gtk_widget_show_all (sf->window);
-	gtk_window_present ((GtkWindow *)sf->window);
+	gtk_window_present ((GtkWindow *) sf->window);
 }
 
 static void
@@ -719,8 +719,8 @@ share_folder_construct (ShareFolder *sf)
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sf->scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 
 	sf->model = gtk_list_store_new (4, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN);
-	sf->user_list = (GtkTreeView *)gtk_tree_view_new ();
-	gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (sf->scrolled_window), (GtkWidget *)sf->user_list);
+	sf->user_list = (GtkTreeView *) gtk_tree_view_new ();
+	gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (sf->scrolled_window), (GtkWidget *) sf->user_list);
 	gtk_tree_view_set_model (GTK_TREE_VIEW (sf->user_list), GTK_TREE_MODEL (sf->model));
 	gtk_widget_show (GTK_WIDGET (sf->user_list));
 
diff --git a/src/server/e-gw-connection.c b/src/server/e-gw-connection.c
index a4e281e..5a18ff6 100644
--- a/src/server/e-gw-connection.c
+++ b/src/server/e-gw-connection.c
@@ -86,7 +86,7 @@ update_soup_session_proxy_settings (EProxy *proxy, SoupSession* session,
 static void
 proxy_settings_changed (EProxy *proxy, gpointer user_data)
 {
-	EGwConnection* conn = (EGwConnection *)user_data;
+	EGwConnection* conn = (EGwConnection *) user_data;
 	if (!conn || !conn->priv || !conn->priv->soup_session)
 		return;
 
@@ -1239,7 +1239,7 @@ e_gw_connection_get_deltas ( EGwConnection *cnc, GSList **adds, GSList **deletes
 					 g_object_unref (msg);
 					/* g_object_unref (cnc); */
 				 }
-				 uid = (gchar *)soup_soap_parameter_get_string_value (param_id);
+				 uid = (gchar *) soup_soap_parameter_get_string_value (param_id);
                                  /*if (!e_cal_backend_cache_remove_component (cache, uid, NULL))
                                          g_message ("Could not remove %s", uid); */
 				 *deletes = g_slist_append (*deletes, uid);
diff --git a/src/server/e-gw-container.c b/src/server/e-gw-container.c
index 2d433be..43bb255 100644
--- a/src/server/e-gw-container.c
+++ b/src/server/e-gw-container.c
@@ -404,7 +404,7 @@ e_gw_container_get_sequence (EGwContainer *container)
 {
 	g_return_val_if_fail (E_IS_GW_CONTAINER (container), 0);
 
-	return (gint)container->priv->sequence;
+	return (gint) container->priv->sequence;
 }
 
 static  void
diff --git a/src/server/e-gw-filter.c b/src/server/e-gw-filter.c
index 0de8fa4..d6fb37b 100644
--- a/src/server/e-gw-filter.c
+++ b/src/server/e-gw-filter.c
@@ -143,7 +143,7 @@ append_complex_component (GSList *component_list, SoupSoapMessage *msg)
 	gint num_of_condtions;
 	gint i;
 
-	filter_component = (FilterComponent* )component_list->data;
+	filter_component = (FilterComponent* ) component_list->data;
 	if (filter_component->operation == E_GW_FILTER_OP_AND || filter_component->operation == E_GW_FILTER_OP_OR
 	    ||  filter_component->operation == E_GW_FILTER_OP_NOT ) {
 
@@ -158,7 +158,7 @@ append_complex_component (GSList *component_list, SoupSoapMessage *msg)
 	num_of_condtions = filter_component->num_of_conditions;
 	for ( i = 0; i < num_of_condtions && component_list; i++) {
 		component_list = g_slist_next (component_list);
-		filter_component = (FilterComponent *)component_list->data;
+		filter_component = (FilterComponent *) component_list->data;
 		if (filter_component->operation == E_GW_FILTER_OP_AND || filter_component->operation == E_GW_FILTER_OP_OR
 		    || filter_component->operation == E_GW_FILTER_OP_NOT ) {
 			component_list = append_complex_component (component_list, msg);
diff --git a/src/server/e-gw-item.c b/src/server/e-gw-item.c
index 7b1f952..c894b96 100644
--- a/src/server/e-gw-item.c
+++ b/src/server/e-gw-item.c
@@ -731,7 +731,7 @@ set_recipient_list_from_soap_parameter (EGwItem *item, SoupSoapParameter *param)
 		} else {
 			/* if recipientStatus is not provided, use the
 			 * self_status, obtained from the mail properties. */
-			if (!strcmp ((const gchar *)email_list->data, recipient->email))
+			if (!strcmp ((const gchar *) email_list->data, recipient->email))
 				recipient->status = item->priv->self_status & (E_GW_ITEM_STAT_DECLINED |
 										E_GW_ITEM_STAT_ACCEPTED);
 			else
@@ -1234,7 +1234,7 @@ set_contact_fields_from_soap_parameter (EGwItem *item, SoupSoapParameter *param)
 
 				if (type) {
 					value = soup_soap_parameter_get_string_value (temp);
-					g_hash_table_insert (item->priv->simple_fields, (gchar *)key, value);
+					g_hash_table_insert (item->priv->simple_fields, (gchar *) key, value);
 					g_free (type);
 				}
 			}
@@ -2528,7 +2528,7 @@ e_gw_item_set_attach_id_list (EGwItem *item, GSList *attach_list)
 {
 	g_return_if_fail (E_IS_GW_ITEM (item));
 	if (attach_list) {
-		g_slist_foreach (item->priv->attach_list, (GFunc)free_attach, NULL);
+		g_slist_foreach (item->priv->attach_list, (GFunc) free_attach, NULL);
 		g_slist_free (item->priv->attach_list);
 	}
 	item->priv->attach_list = attach_list;
@@ -3250,7 +3250,7 @@ e_gw_item_set_calendar_item_elements (EGwItem *item, SoupSoapMessage *msg)
 		GSList *al;
 		soup_soap_message_start_element (msg, "attachments", NULL, NULL);
 		for (al = priv->attach_list; al != NULL;  al = al->next) {
-			EGwItemAttachment *attachment = (EGwItemAttachment *)al->data;
+			EGwItemAttachment *attachment = (EGwItemAttachment *) al->data;
 			add_attachment_to_soap_message (attachment, msg);
 
 		}
@@ -3322,7 +3322,7 @@ e_gw_item_append_to_soap_message (EGwItem *item, SoupSoapMessage *msg)
 			GSList *al;
 			soup_soap_message_start_element (msg, "attachments", NULL, NULL);
 			for (al = priv->attach_list; al != NULL;  al = al->next) {
-				EGwItemAttachment *attachment = (EGwItemAttachment *)al->data;
+				EGwItemAttachment *attachment = (EGwItemAttachment *) al->data;
 				add_attachment_to_soap_message (attachment, msg);
 			}
 			soup_soap_message_end_element (msg);
diff --git a/src/server/soup-soap-message.c b/src/server/soup-soap-message.c
index afb03dc..888fc03 100644
--- a/src/server/soup-soap-message.c
+++ b/src/server/soup-soap-message.c
@@ -67,9 +67,9 @@ fetch_ns (SoupSoapMessage *msg, const gchar *prefix, const gchar *ns_uri)
 	xmlNsPtr ns = NULL;
 
 	if (prefix && ns_uri)
-		ns = xmlNewNs (priv->last_node, (const xmlChar *)ns_uri, (const xmlChar *)prefix);
+		ns = xmlNewNs (priv->last_node, (const xmlChar *) ns_uri, (const xmlChar *) prefix);
 	else if (prefix && !ns_uri) {
-		ns = xmlSearchNs (priv->doc, priv->last_node, (const xmlChar *)prefix);
+		ns = xmlSearchNs (priv->doc, priv->last_node, (const xmlChar *) prefix);
 		if (!ns)
 			ns = xmlNewNs (priv->last_node, (const xmlChar *)"", (const xmlChar *)prefix);
 	}
@@ -142,7 +142,7 @@ soup_soap_message_new_from_uri (const gchar *method, SoupURI *uri,
 	priv->doc->standalone = standalone;
 
 	if (xml_encoding) {
-		xmlFree ((xmlChar *)priv->doc->encoding);
+		xmlFree ((xmlChar *) priv->doc->encoding);
 		priv->doc->encoding = xmlCharStrdup (xml_encoding);
 	}
 
@@ -280,7 +280,7 @@ soup_soap_message_start_element (SoupSoapMessage *msg,
 	g_return_if_fail (SOUP_IS_SOAP_MESSAGE (msg));
 	priv = msg->priv;
 
-	priv->last_node = xmlNewChild (priv->last_node, NULL, (const xmlChar *)name, NULL);
+	priv->last_node = xmlNewChild (priv->last_node, NULL, (const xmlChar *) name, NULL);
 
 	xmlSetNs (priv->last_node, fetch_ns (msg, prefix, ns_uri));
 
@@ -513,7 +513,7 @@ soup_soap_message_write_double (SoupSoapMessage *msg, gdouble d)
 void
 soup_soap_message_write_base64 (SoupSoapMessage *msg, const gchar *string, gint len)
 {
-	gchar *str = g_base64_encode ((const guchar *)string, len);
+	gchar *str = g_base64_encode ((const guchar *) string, len);
 	soup_soap_message_write_string (msg, str);
 	g_free (str);
 }
@@ -548,7 +548,7 @@ soup_soap_message_write_string (SoupSoapMessage *msg, const gchar *string)
 	g_return_if_fail (SOUP_IS_SOAP_MESSAGE (msg));
 	priv = msg->priv;
 
-	xmlNodeAddContent (priv->last_node, (const xmlChar *)string);
+	xmlNodeAddContent (priv->last_node, (const xmlChar *) string);
 }
 
 /**
@@ -568,7 +568,7 @@ soup_soap_message_write_buffer (SoupSoapMessage *msg, const gchar *buffer, gint
 	g_return_if_fail (SOUP_IS_SOAP_MESSAGE (msg));
 	priv = msg->priv;
 
-	xmlNodeAddContentLen (priv->last_node, (const xmlChar *)buffer, len);
+	xmlNodeAddContentLen (priv->last_node, (const xmlChar *) buffer, len);
 }
 
 /**
@@ -631,7 +631,7 @@ soup_soap_message_add_attribute (SoupSoapMessage *msg,
 
 	xmlNewNsProp (priv->last_node,
 		      fetch_ns (msg, prefix, ns_uri),
-		      (const xmlChar *)name, (const xmlChar *)value);
+		      (const xmlChar *) name, (const xmlChar *) value);
 }
 
 /**
@@ -740,7 +740,7 @@ soup_soap_message_persist (SoupSoapMessage *msg)
 
 	/* serialize to SoupMessage class */
 	soup_message_set_request (SOUP_MESSAGE (msg), "text/xml",
-				  SOUP_MEMORY_TAKE, (gchar *)body, len);
+				  SOUP_MEMORY_TAKE, (gchar *) body, len);
 }
 
 /**
@@ -764,10 +764,10 @@ soup_soap_message_get_namespace_prefix (SoupSoapMessage *msg, const gchar *ns_ur
 	priv = msg->priv;
 	g_return_val_if_fail (ns_uri != NULL, NULL);
 
-	ns = xmlSearchNsByHref (priv->doc, priv->last_node, (const xmlChar *)ns_uri);
+	ns = xmlSearchNsByHref (priv->doc, priv->last_node, (const xmlChar *) ns_uri);
 	if (ns) {
 		if (ns->prefix)
-			return (const gchar *)ns->prefix;
+			return (const gchar *) ns->prefix;
 		else
 			return "";
 	}
diff --git a/src/server/soup-soap-response.c b/src/server/soup-soap-response.c
index 9c3cdcc..b7a68d6 100644
--- a/src/server/soup-soap-response.c
+++ b/src/server/soup-soap-response.c
@@ -224,7 +224,7 @@ soup_soap_response_set_method_name (SoupSoapResponse *response, const gchar *met
 	g_return_if_fail (priv->xml_method != NULL);
 	g_return_if_fail (method_name != NULL);
 
-	xmlNodeSetName (priv->xml_method, (const xmlChar *)method_name);
+	xmlNodeSetName (priv->xml_method, (const xmlChar *) method_name);
 }
 
 /**
@@ -260,7 +260,7 @@ soup_soap_parameter_get_int_value (SoupSoapParameter *param)
 
 	s = xmlNodeGetContent (param);
 	if (s) {
-		i = atoi ((gchar *)s);
+		i = atoi ((gchar *) s);
 		xmlFree (s);
 
 		return i;
@@ -286,7 +286,7 @@ soup_soap_parameter_get_string_value (SoupSoapParameter *param)
 	g_return_val_if_fail (param != NULL, NULL);
 
 	xml_s = xmlNodeGetContent (param);
-	s = g_strdup ((gchar *)xml_s);
+	s = g_strdup ((gchar *) xml_s);
 	xmlFree (xml_s);
 
 	return s;
@@ -332,7 +332,7 @@ soup_soap_parameter_get_first_child_by_name (SoupSoapParameter *param, const gch
 	for (tmp = soup_soap_parameter_get_first_child (param);
 	     tmp != NULL;
 	     tmp = soup_soap_parameter_get_next_child (tmp)) {
-		if (!strcmp (name, (const gchar *)tmp->name))
+		if (!strcmp (name, (const gchar *) tmp->name))
 			return tmp;
 	}
 
@@ -384,7 +384,7 @@ soup_soap_parameter_get_next_child_by_name (SoupSoapParameter *param,
 	for (tmp = soup_soap_parameter_get_next_child (param);
 	     tmp != NULL;
 	     tmp = soup_soap_parameter_get_next_child (tmp)) {
-		if (!strcmp (name, (const gchar *)tmp->name))
+		if (!strcmp (name, (const gchar *) tmp->name))
 			return tmp;
 	}
 
@@ -409,8 +409,8 @@ soup_soap_parameter_get_property (SoupSoapParameter *param, const gchar *prop_na
 	g_return_val_if_fail (param != NULL, NULL);
 	g_return_val_if_fail (prop_name != NULL, NULL);
 
-	xml_s = xmlGetProp (param, (const xmlChar *)prop_name);
-	s = g_strdup ((gchar *)xml_s);
+	xml_s = xmlGetProp (param, (const xmlChar *) prop_name);
+	s = g_strdup ((gchar *) xml_s);
 	xmlFree (xml_s);
 
 	return s;
@@ -480,7 +480,7 @@ soup_soap_response_get_first_parameter_by_name (SoupSoapResponse *response,
 	for (l = priv->parameters; l != NULL; l = l->next) {
 		SoupSoapParameter *param = (SoupSoapParameter *) l->data;
 
-		if (!strcmp (name, (const gchar *)param->name))
+		if (!strcmp (name, (const gchar *) param->name))
 			return param;
 	}
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]