[evolution-groupwise] Coding style and whitespace cleanup.



commit 34bb4a1d41fe04a2d4d1f00a7971dcb500847312
Author: Matthew Barnes <mbarnes redhat com>
Date:   Mon Aug 22 22:07:16 2011 -0400

    Coding style and whitespace cleanup.

 src/addressbook/create-account.c                   |    8 +-
 src/addressbook/e-book-backend-groupwise-factory.c |    5 +-
 src/addressbook/e-book-backend-groupwise.c         |  322 +++++++++++-------
 src/calendar/e-cal-backend-groupwise-factory.c     |   20 +-
 src/calendar/e-cal-backend-groupwise-utils.c       |  121 +++++--
 src/calendar/e-cal-backend-groupwise.c             |  199 +++++++++---
 src/calendar/e-cal-backend-groupwise.h             |    8 +-
 src/camel/camel-groupwise-folder.c                 |  189 +++++++-----
 src/camel/camel-groupwise-folder.h                 |    6 +-
 src/camel/camel-groupwise-journal.c                |   16 +-
 src/camel/camel-groupwise-private.h                |    2 +-
 src/camel/camel-groupwise-provider.c               |   14 +-
 src/camel/camel-groupwise-store-summary.c          |   96 ++++--
 src/camel/camel-groupwise-store.c                  |   76 +++--
 src/camel/camel-groupwise-summary.c                |   52 ++-
 src/camel/camel-groupwise-transport.c              |    2 +-
 src/camel/camel-groupwise-utils.c                  |   65 +++--
 src/camel/camel-groupwise-utils.h                  |    2 +-
 src/plugins/addressbook-groupwise.c                |    6 +-
 src/plugins/camel-gw-listener.c                    |   55 ++--
 src/plugins/groupwise-account-setup.c              |   20 +-
 src/plugins/gw-ui.c                                |   36 ++-
 src/plugins/install-shared.c                       |   10 +-
 src/plugins/junk-mail-settings.c                   |    7 +-
 src/plugins/junk-settings.c                        |   24 +-
 src/plugins/mail-retract.c                         |    7 +-
 src/plugins/mail-send-options.c                    |   22 +-
 src/plugins/process-meeting.c                      |   29 ++-
 src/plugins/proxy-login.c                          |   24 +-
 src/plugins/proxy-login.h                          |    2 +-
 src/plugins/proxy.c                                |   77 +++--
 src/plugins/send-options.c                         |   22 +-
 src/plugins/share-folder-common.c                  |   37 ++-
 src/plugins/share-folder.c                         |   60 +++--
 src/plugins/status-track.c                         |    8 +-
 src/server/create-account.c                        |    7 +-
 src/server/e-gw-connection.c                       |  346 +++++++++++++++-----
 src/server/e-gw-connection.h                       |    2 +-
 src/server/e-gw-container.c                        |   53 ++-
 src/server/e-gw-filter.c                           |   26 +-
 src/server/e-gw-filter.h                           |    2 +-
 src/server/e-gw-item.c                             |  291 +++++++++++------
 src/server/e-gw-item.h                             |   34 +-
 src/server/e-gw-message.c                          |   29 ++-
 src/server/e-gw-proxy.c                            |   53 ++--
 src/server/e-gw-recur-utils.c                      |    2 +-
 src/server/e-gw-sendoptions.c                      |   43 ++-
 src/server/e-gw-sendoptions.h                      |    6 +-
 src/server/soap-test.c                             |    3 +-
 src/server/soup-soap-message.c                     |   88 +++--
 src/server/soup-soap-response.c                    |   28 +-
 51 files changed, 1764 insertions(+), 898 deletions(-)
---
diff --git a/src/addressbook/create-account.c b/src/addressbook/create-account.c
index a6433ab..7be8d96 100644
--- a/src/addressbook/create-account.c
+++ b/src/addressbook/create-account.c
@@ -9,7 +9,10 @@ static GMainLoop *main_loop;
 static gchar *arg_hostname, *arg_username, *arg_password;
 
 static void
-add_account (const gchar *conf_key, const gchar *hostname, const gchar *username, const gchar *password)
+add_account (const gchar *conf_key,
+             const gchar *hostname,
+             const gchar *username,
+             const gchar *password)
 {
 	ESourceList *source_list;
 	ESourceGroup *group;
@@ -59,7 +62,8 @@ idle_cb (gpointer data)
 }
 
 gint
-main (gint argc, gchar *argv[])
+main (gint argc,
+      gchar *argv[])
 {
 	g_type_init ();
 
diff --git a/src/addressbook/e-book-backend-groupwise-factory.c b/src/addressbook/e-book-backend-groupwise-factory.c
index 67fe7b0..b2ccfb9 100644
--- a/src/addressbook/e-book-backend-groupwise-factory.c
+++ b/src/addressbook/e-book-backend-groupwise-factory.c
@@ -40,12 +40,13 @@ eds_module_initialize (GTypeModule *module)
 }
 
 void
-eds_module_shutdown   (void)
+eds_module_shutdown (void)
 {
 }
 
 void
-eds_module_list_types (const GType **types, gint *num_types)
+eds_module_list_types (const GType **types,
+                       gint *num_types)
 {
 	*types = & groupwise_type;
 	*num_types = 1;
diff --git a/src/addressbook/e-book-backend-groupwise.c b/src/addressbook/e-book-backend-groupwise.c
index bc12fd3..dbf5bbc 100644
--- a/src/addressbook/e-book-backend-groupwise.c
+++ b/src/addressbook/e-book-backend-groupwise.c
@@ -175,7 +175,8 @@ free_attr_list (GList *attr_list)
 }
 
 static void
-populate_ims (EContact *contact, gpointer data)
+populate_ims (EContact *contact,
+              gpointer data)
 {
 	GList *im_list;
 	GList *aim_list = NULL;
@@ -264,7 +265,10 @@ populate_ims (EContact *contact, gpointer data)
 }
 
 static void
-append_ims_to_list (GList **im_list, EContact *contact, const gchar *service_name, EContactField field_id)
+append_ims_to_list (GList **im_list,
+                    EContact *contact,
+                    const gchar *service_name,
+                    EContactField field_id)
 {
 	GList *list;
 	IMAddress *address;
@@ -280,7 +284,8 @@ append_ims_to_list (GList **im_list, EContact *contact, const gchar *service_nam
 }
 
 static void
-set_ims_in_gw_item (EGwItem *item, gpointer data)
+set_ims_in_gw_item (EGwItem *item,
+                    gpointer data)
 {
 	EContact *contact;
 	GList *im_list = NULL;
@@ -300,7 +305,8 @@ set_ims_in_gw_item (EGwItem *item, gpointer data)
 }
 
 static void
-set_im_changes (EGwItem *new_item, EGwItem *old_item)
+set_im_changes (EGwItem *new_item,
+                EGwItem *old_item)
 {
 	GList *old_ims;
 	GList *new_ims;
@@ -346,7 +352,8 @@ set_im_changes (EGwItem *new_item, EGwItem *old_item)
 }
 
 static void
-copy_postal_address_to_contact_address ( EContactAddress *contact_addr, PostalAddress *address)
+copy_postal_address_to_contact_address (EContactAddress *contact_addr,
+                                        PostalAddress *address)
 {
 	contact_addr->address_format = NULL;
 	contact_addr->po = NULL;
@@ -359,7 +366,8 @@ copy_postal_address_to_contact_address ( EContactAddress *contact_addr, PostalAd
 }
 
 static void
-copy_contact_address_to_postal_address (PostalAddress *address, EContactAddress *contact_addr)
+copy_contact_address_to_postal_address (PostalAddress *address,
+                                        EContactAddress *contact_addr)
 {
 	/* ugh, contact addr has null terminated strings instead of NULLs*/
 	address->street_address = (contact_addr->street && *contact_addr->street) ? g_strdup (contact_addr->street): NULL;
@@ -371,7 +379,8 @@ copy_contact_address_to_postal_address (PostalAddress *address, EContactAddress
 }
 
 static void
-populate_address (EContact *contact, gpointer data)
+populate_address (EContact *contact,
+                  gpointer data)
 {
 	PostalAddress *address;
 	EGwItem *item;
@@ -399,7 +408,8 @@ populate_address (EContact *contact, gpointer data)
 }
 
 static void
-set_address_in_gw_item (EGwItem *item, gpointer data)
+set_address_in_gw_item (EGwItem *item,
+                        gpointer data)
 {
 	EContact *contact;
 	EContactAddress *contact_address;
@@ -441,7 +451,9 @@ copy_postal_address (PostalAddress *address)
 }
 
 static void
-set_postal_address_change (EGwItem *new_item, EGwItem *old_item, const gchar *address_type)
+set_postal_address_change (EGwItem *new_item,
+                           EGwItem *old_item,
+                           const gchar *address_type)
 {
 	PostalAddress *old_postal_address;
 	PostalAddress *new_postal_address;
@@ -512,7 +524,8 @@ set_address_changes (EGwItem *new_item , EGwItem *old_item)
 }
 
 static void
-populate_birth_date (EContact *contact, gpointer data)
+populate_birth_date (EContact *contact,
+                     gpointer data)
 {
 	EGwItem *item;
 	gchar *value;
@@ -528,7 +541,8 @@ populate_birth_date (EContact *contact, gpointer data)
 }
 
 static void
-set_birth_date_in_gw_item (EGwItem *item, gpointer data)
+set_birth_date_in_gw_item (EGwItem *item,
+                           gpointer data)
 {
 	EContact *contact;
 	EContactDate *date;
@@ -545,7 +559,8 @@ set_birth_date_in_gw_item (EGwItem *item, gpointer data)
 }
 
 static void
-set_birth_date_changes (EGwItem *new_item, EGwItem *old_item)
+set_birth_date_changes (EGwItem *new_item,
+                        EGwItem *old_item)
 {
 	gchar *new_birthday;
 	gchar *old_birthday;
@@ -573,7 +588,8 @@ static const gint email_fields[3] = {
 };
 
 static void
-populate_emails (EContact *contact, gpointer data)
+populate_emails (EContact *contact,
+                 gpointer data)
 {
 	GList *email_list;
 	EGwItem *item;
@@ -589,7 +605,8 @@ populate_emails (EContact *contact, gpointer data)
 }
 
 static void
-set_emails_in_gw_item (EGwItem *item, gpointer data)
+set_emails_in_gw_item (EGwItem *item,
+                       gpointer data)
 {
 	GList *email_list;
 	EContact *contact;
@@ -607,7 +624,10 @@ set_emails_in_gw_item (EGwItem *item, gpointer data)
 }
 
 static void
-compare_string_lists ( GList *old_list, GList *new_list, GList **additions, GList **deletions)
+compare_string_lists (GList *old_list,
+                      GList *new_list,
+                      GList **additions,
+                      GList **deletions)
 {
 	GList *temp, *old_list_copy;
 	gboolean strings_matched;
@@ -640,7 +660,8 @@ compare_string_lists ( GList *old_list, GList *new_list, GList **additions, GLis
 }
 
 static void
-set_emails_changes (EGwItem *new_item, EGwItem *old_item)
+set_emails_changes (EGwItem *new_item,
+                    EGwItem *old_item)
 {
 	GList *old_email_list;
 	GList *new_email_list;
@@ -656,7 +677,8 @@ set_emails_changes (EGwItem *new_item, EGwItem *old_item)
 }
 
 static void
-populate_full_name (EContact *contact, gpointer data)
+populate_full_name (EContact *contact,
+                    gpointer data)
 {
 	EGwItem *item;
 	FullName  *full_name;
@@ -677,7 +699,8 @@ populate_full_name (EContact *contact, gpointer data)
 }
 
 static void
-set_full_name_in_gw_item (EGwItem *item, gpointer data)
+set_full_name_in_gw_item (EGwItem *item,
+                          gpointer data)
 {
 	EContact *contact;
 	gchar   *name;
@@ -716,7 +739,8 @@ copy_full_name (FullName *full_name)
 }
 
 static void
-set_full_name_changes (EGwItem *new_item, EGwItem *old_item)
+set_full_name_changes (EGwItem *new_item,
+                       EGwItem *old_item)
 {
 	FullName *old_full_name;
 	FullName *new_full_name;
@@ -771,7 +795,8 @@ set_full_name_changes (EGwItem *new_item, EGwItem *old_item)
 }
 
 static void
-populate_contact_members (EContact *contact, gpointer data)
+populate_contact_members (EContact *contact,
+                          gpointer data)
 {
 	EGwItem *item;
 	GList *member_list;
@@ -808,7 +833,9 @@ populate_contact_members (EContact *contact, gpointer data)
 }
 
 static void
-set_members_in_gw_item (EGwItem  *item, EContact *contact, EBookBackendGroupwise *egwb)
+set_members_in_gw_item (EGwItem *item,
+                        EContact *contact,
+                        EBookBackendGroupwise *egwb)
 {
 	GList  *members, *temp, *dtemp, *items, *p, *emails_without_ids, *dest_without_ids;
 	GList *group_members;
@@ -830,7 +857,7 @@ set_members_in_gw_item (EGwItem  *item, EContact *contact, EBookBackendGroupwise
 	emails_without_ids = NULL;
 	dest_without_ids = NULL;
 
-	for (;temp != NULL; temp = g_list_next (temp)) {
+	for (; temp != NULL; temp = g_list_next (temp)) {
 		EVCardAttribute *attr = temp->data;
 		EDestination *dest;
 		id = email = NULL;
@@ -938,7 +965,7 @@ set_members_in_gw_item (EGwItem  *item, EContact *contact, EBookBackendGroupwise
 		full_name->name_suffix = NULL;
 		e_gw_item_set_full_name (new_item, full_name);
 
-		for (i=0; i < G_N_ELEMENTS (mappings); i++) {
+		for (i = 0; i < G_N_ELEMENTS (mappings); i++) {
 			element_type = mappings[i].element_type;
 			if (element_type == ELEMENT_TYPE_SIMPLE) {
 				value = e_contact_get (new_contact, mappings[i].field_id);
@@ -994,7 +1021,9 @@ set_members_in_gw_item (EGwItem  *item, EContact *contact, EBookBackendGroupwise
 }
 
 static void
-set_member_changes (EGwItem *new_item, EGwItem *old_item, EBookBackendGroupwise *egwb)
+set_member_changes (EGwItem *new_item,
+                    EGwItem *old_item,
+                    EBookBackendGroupwise *egwb)
 {
 	GList *old_members, *new_members;
 	GList *old_ids,  *new_ids,  *additions, *deletions;
@@ -1003,12 +1032,12 @@ set_member_changes (EGwItem *new_item, EGwItem *old_item, EBookBackendGroupwise
 	old_members = e_gw_item_get_member_list (old_item);
 	new_members = e_gw_item_get_member_list (new_item);
 
-	for (;old_members != NULL; old_members = g_list_next (old_members)) {
+	for (; old_members != NULL; old_members = g_list_next (old_members)) {
 		EGroupMember *member;
 		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)) {
+	for (; new_members != NULL; new_members = g_list_next (new_members)) {
 		EGroupMember *member;
 		member = (EGroupMember *) new_members->data;
 		new_ids = g_list_append (new_ids, member->id);
@@ -1027,7 +1056,8 @@ set_member_changes (EGwItem *new_item, EGwItem *old_item, EBookBackendGroupwise
 }
 
 static void
-set_organization_changes_in_gw_item (EGwItem *new_item, EGwItem *old_item)
+set_organization_changes_in_gw_item (EGwItem *new_item,
+                                     EGwItem *old_item)
 {
 	gchar *old_value;
 	gchar *new_value;
@@ -1053,7 +1083,9 @@ set_organization_changes_in_gw_item (EGwItem *new_item, EGwItem *old_item)
 }
 
 static void
-set_categories_in_gw_item (EGwItem *item, EContact *contact, EBookBackendGroupwise *egwb)
+set_categories_in_gw_item (EGwItem *item,
+                           EContact *contact,
+                           EBookBackendGroupwise *egwb)
 {
 	GHashTable *categories_by_name;
 	GList *category_names,  *category_ids;
@@ -1094,7 +1126,8 @@ set_categories_in_gw_item (EGwItem *item, EContact *contact, EBookBackendGroupwi
 }
 
 static void
-set_categories_changes (EGwItem *new_item, EGwItem *old_item)
+set_categories_changes (EGwItem *new_item,
+                        EGwItem *old_item)
 {
 	GList *old_category_list;
 	GList *new_category_list;
@@ -1135,7 +1168,9 @@ set_categories_changes (EGwItem *new_item, EGwItem *old_item)
 }
 
 static void
-fill_contact_from_gw_item (EContact *contact, EGwItem *item, GHashTable *categories_by_ids)
+fill_contact_from_gw_item (EContact *contact,
+                           EGwItem *item,
+                           GHashTable *categories_by_ids)
 {
 	gchar * value;
 	gint element_type;
@@ -1182,10 +1217,10 @@ fill_contact_from_gw_item (EContact *contact, EGwItem *item, GHashTable *categor
 
 static void
 e_book_backend_groupwise_create_contact (EBookBackend *backend,
-					 EDataBook *book,
-					 guint32 opid,
-					 GCancellable *cancellable,
-					 const gchar *vcard )
+                                         EDataBook *book,
+                                         guint32 opid,
+                                         GCancellable *cancellable,
+                                         const gchar *vcard)
 {
 	EContact *contact;
 	EBookBackendGroupwise *egwb;
@@ -1257,10 +1292,10 @@ e_book_backend_groupwise_create_contact (EBookBackend *backend,
 
 static void
 e_book_backend_groupwise_remove_contacts (EBookBackend *backend,
-					  EDataBook    *book,
-					  guint32 opid,
-					  GCancellable *cancellable,
-					  const GSList *id_list)
+                                          EDataBook *book,
+                                          guint32 opid,
+                                          GCancellable *cancellable,
+                                          const GSList *id_list)
 {
 	gchar *id;
 	EBookBackendGroupwise *ebgw;
@@ -1299,7 +1334,8 @@ e_book_backend_groupwise_remove_contacts (EBookBackend *backend,
 }
 
 static void
-set_changes_in_gw_item (EGwItem *new_item, EGwItem *old_item)
+set_changes_in_gw_item (EGwItem *new_item,
+                        EGwItem *old_item)
 {
 	gchar * new_value;
 	gchar *old_value;
@@ -1337,10 +1373,10 @@ set_changes_in_gw_item (EGwItem *new_item, EGwItem *old_item)
 
 static void
 e_book_backend_groupwise_modify_contact (EBookBackend *backend,
-					 EDataBook    *book,
-					 guint32       opid,
-					 GCancellable *cancellable,
-					 const gchar   *vcard)
+                                         EDataBook *book,
+                                         guint32 opid,
+                                         GCancellable *cancellable,
+                                         const gchar *vcard)
 {
 	EContact *contact;
 	EBookBackendGroupwise *egwb;
@@ -1426,10 +1462,10 @@ e_book_backend_groupwise_modify_contact (EBookBackend *backend,
 
 static void
 e_book_backend_groupwise_get_contact (EBookBackend *backend,
-				      EDataBook    *book,
-				      guint32       opid,
-				      GCancellable *cancellable,
-				      const gchar   *id)
+                                      EDataBook *book,
+                                      guint32 opid,
+                                      GCancellable *cancellable,
+                                      const gchar *id)
 {
 	EBookBackendGroupwise *gwb;
 	gint status;
@@ -1486,7 +1522,10 @@ typedef struct {
 } EBookBackendGroupwiseSExpData;
 
 static ESExpResult *
-func_and (ESExp *f, gint argc, ESExpResult **argv, gpointer data)
+func_and (ESExp *f,
+          gint argc,
+          ESExpResult **argv,
+          gpointer data)
 {
 	ESExpResult *r;
 	EGwFilter *filter;
@@ -1503,7 +1542,10 @@ func_and (ESExp *f, gint argc, ESExpResult **argv, gpointer data)
 }
 
 static ESExpResult *
-func_or (ESExp *f, gint argc, ESExpResult **argv, gpointer data)
+func_or (ESExp *f,
+         gint argc,
+         ESExpResult **argv,
+         gpointer data)
 {
 	ESExpResult *r;
 	EGwFilter *filter;
@@ -1520,7 +1562,10 @@ func_or (ESExp *f, gint argc, ESExpResult **argv, gpointer data)
 }
 
 static ESExpResult *
-func_not (ESExp *f, gint argc, ESExpResult **argv, gpointer data)
+func_not (ESExp *f,
+          gint argc,
+          ESExpResult **argv,
+          gpointer data)
 {
 	ESExpResult *r;
 	EBookBackendGroupwiseSExpData *sexp_data;
@@ -1534,7 +1579,10 @@ func_not (ESExp *f, gint argc, ESExpResult **argv, gpointer data)
 }
 
 static ESExpResult *
-func_contains (struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer data)
+func_contains (struct _ESExp *f,
+               gint argc,
+               struct _ESExpResult **argv,
+               gpointer data)
 {
 	ESExpResult *r;
 	EGwFilter *filter;
@@ -1595,7 +1643,10 @@ func_contains (struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer
 }
 
 static ESExpResult *
-func_is (struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer data)
+func_is (struct _ESExp *f,
+         gint argc,
+         struct _ESExpResult **argv,
+         gpointer data)
 {
 	ESExpResult *r;
 	EGwFilter *filter;
@@ -1653,7 +1704,10 @@ func_is (struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer data)
 #define AUTO_COMPLETION_QUERY 15
 
 static ESExpResult *
-func_beginswith (struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer data)
+func_beginswith (struct _ESExp *f,
+                 gint argc,
+                 struct _ESExpResult **argv,
+                 gpointer data)
 {
 	ESExpResult *r;
 	EGwFilter *filter;
@@ -1724,7 +1778,10 @@ func_beginswith (struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpoint
 }
 
 static ESExpResult *
-func_endswith (struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer data)
+func_endswith (struct _ESExp *f,
+               gint argc,
+               struct _ESExpResult **argv,
+               gpointer data)
 {
 	EBookBackendGroupwiseSExpData *sexp_data;
 	ESExpResult *r;
@@ -1740,7 +1797,10 @@ func_endswith (struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer
 }
 
 static ESExpResult *
-func_exists (struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer data)
+func_exists (struct _ESExp *f,
+             gint argc,
+             struct _ESExpResult **argv,
+             gpointer data)
 {
 	ESExpResult *r;
 	EGwFilter *filter;
@@ -1809,8 +1869,11 @@ static const struct {
 	{ "exists", func_exists, 0 },
 };
 
-static EGwFilter*
-e_book_backend_groupwise_build_gw_filter (EBookBackendGroupwise *ebgw, const gchar *query, gpointer is_auto_completion, gchar ** search_string)
+static EGwFilter *
+e_book_backend_groupwise_build_gw_filter (EBookBackendGroupwise *ebgw,
+                                          const gchar *query,
+                                          gpointer is_auto_completion,
+                                          gchar **search_string)
 {
 	ESExp *sexp;
 	ESExpResult *r;
@@ -1861,10 +1924,10 @@ e_book_backend_groupwise_build_gw_filter (EBookBackendGroupwise *ebgw, const gch
 
 static void
 e_book_backend_groupwise_get_contact_list (EBookBackend *backend,
-					   EDataBook    *book,
-					   guint32       opid,
-					   GCancellable *cancellable,
-					   const gchar   *query )
+                                           EDataBook *book,
+                                           guint32 opid,
+                                           GCancellable *cancellable,
+                                           const gchar *query)
 {
 	GSList *vcard_list;
 	gint status;
@@ -2030,8 +2093,9 @@ closure_destroy (GroupwiseBackendSearchClosure *closure)
 	g_free (closure);
 }
 
-static GroupwiseBackendSearchClosure*
-init_closure (EDataBookView *book_view, EBookBackendGroupwise *bg)
+static GroupwiseBackendSearchClosure *
+init_closure (EDataBookView *book_view,
+              EBookBackendGroupwise *bg)
 {
 	GroupwiseBackendSearchClosure *closure = g_new (GroupwiseBackendSearchClosure, 1);
 
@@ -2045,7 +2109,7 @@ init_closure (EDataBookView *book_view, EBookBackendGroupwise *bg)
 	return closure;
 }
 
-static GroupwiseBackendSearchClosure*
+static GroupwiseBackendSearchClosure *
 get_closure (EDataBookView *book_view)
 {
 	return g_object_get_data (G_OBJECT (book_view), "EBookBackendGroupwise.BookView::closure");
@@ -2053,10 +2117,10 @@ get_closure (EDataBookView *book_view)
 
 static void
 get_contacts_from_cache (EBookBackendGroupwise *ebgw,
-			 const gchar *query,
-			 GPtrArray *ids,
-			 EDataBookView *book_view,
-			 GroupwiseBackendSearchClosure *closure)
+                         const gchar *query,
+                         GPtrArray *ids,
+                         EDataBookView *book_view,
+                         GroupwiseBackendSearchClosure *closure)
 {
 	gint i;
 
@@ -2136,7 +2200,7 @@ book_view_thread (gpointer data)
 		temp_list = contacts;
 		for (; contacts != NULL; contacts = g_list_next (contacts)) {
 			if (!e_flag_is_set (closure->running)) {
-				for (;contacts != NULL; contacts = g_list_next (contacts))
+				for (; contacts != NULL; contacts = g_list_next (contacts))
 					g_object_unref (contacts->data);
 				break;
 			}
@@ -2220,10 +2284,10 @@ book_view_thread (gpointer data)
 			e_data_book_view_unref (book_view);
 			if (enable_debug) {
 				g_get_current_time (&end);
-				diff = end.tv_sec * 1000 + end.tv_usec/1000;
-				diff -= start.tv_sec * 1000 + start.tv_usec/1000;
+				diff = end.tv_sec * 1000 + end.tv_usec / 1000;
+				diff -= start.tv_sec * 1000 + start.tv_usec / 1000;
 				printf("reading contacts from cache took %ld.%03ld seconds\n",
-					diff/1000,diff%1000);
+					diff / 1000,diff % 1000);
 			}
 			if (filter)
 				g_object_unref (filter);
@@ -2252,7 +2316,7 @@ book_view_thread (gpointer data)
 			temp_list = contacts;
 			for (; contacts != NULL; contacts = g_list_next (contacts)) {
 				if (!e_flag_is_set (closure->running)) {
-					for (;contacts != NULL; contacts = g_list_next (contacts))
+					for (; contacts != NULL; contacts = g_list_next (contacts))
 						g_object_unref (contacts->data);
 					break;
 				}
@@ -2309,7 +2373,7 @@ book_view_thread (gpointer data)
 	for (; gw_items != NULL; gw_items = g_list_next (gw_items)) {
 
 		if (!e_flag_is_set (closure->running)) {
-			for (;gw_items != NULL; gw_items = g_list_next (gw_items))
+			for (; gw_items != NULL; gw_items = g_list_next (gw_items))
 				g_object_unref (gw_items->data);
 			break;
 		}
@@ -2337,18 +2401,18 @@ book_view_thread (gpointer data)
 
 	if (enable_debug) {
 		g_get_current_time (&end);
-		diff = end.tv_sec * 1000 + end.tv_usec/1000;
-		diff -= start.tv_sec * 1000 + start.tv_usec/1000;
+		diff = end.tv_sec * 1000 + end.tv_usec / 1000;
+		diff -= start.tv_sec * 1000 + start.tv_usec / 1000;
 		printf("reading %d contacts from server took %ld.%03ld seconds\n",
-			count, diff/1000,diff%1000);
+			count, diff / 1000,diff % 1000);
 	}
 
 	return NULL;
 }
 
 static void
-e_book_backend_groupwise_start_book_view (EBookBackend  *backend,
-				     EDataBookView *book_view)
+e_book_backend_groupwise_start_book_view (EBookBackend *backend,
+                                          EDataBookView *book_view)
 {
 	GroupwiseBackendSearchClosure *closure = init_closure (book_view, E_BOOK_BACKEND_GROUPWISE (backend));
 
@@ -2361,8 +2425,8 @@ e_book_backend_groupwise_start_book_view (EBookBackend  *backend,
 }
 
 static void
-e_book_backend_groupwise_stop_book_view (EBookBackend  *backend,
-					 EDataBookView *book_view)
+e_book_backend_groupwise_stop_book_view (EBookBackend *backend,
+                                         EDataBookView *book_view)
 {
 	GroupwiseBackendSearchClosure *closure = get_closure (book_view);
 
@@ -2372,7 +2436,8 @@ e_book_backend_groupwise_stop_book_view (EBookBackend  *backend,
 }
 
 static void
-book_view_notify_status (EDataBookView *view, const gchar *status)
+book_view_notify_status (EDataBookView *view,
+                         const gchar *status)
 {
 	if (!view)
 		return;
@@ -2380,7 +2445,8 @@ book_view_notify_status (EDataBookView *view, const gchar *status)
 }
 
 static gboolean
-pick_view_cb (EDataBookView *view, gpointer user_data)
+pick_view_cb (EDataBookView *view,
+              gpointer user_data)
 {
 	EDataBookView **pick = user_data;
 
@@ -2403,9 +2469,9 @@ find_book_view (EBookBackendGroupwise *ebgw)
 
 static void
 get_sequence_from_cache (DB *db,
-		gdouble *cache_first_sequence,
-		gdouble *cache_last_sequence,
-		gdouble *cache_last_po_rebuild_time)
+                         gdouble *cache_first_sequence,
+                         gdouble *cache_last_sequence,
+                         gdouble *cache_last_po_rebuild_time)
 {
 	DBT uid_dbt, vcard_dbt;
 	gint db_error;
@@ -2457,9 +2523,9 @@ get_sequence_from_cache (DB *db,
 }
 static void
 add_sequence_to_cache (DB *db,
-		       gdouble first_sequence,
-		       gdouble last_sequence,
-		       gdouble last_po_rebuild_time)
+                       gdouble first_sequence,
+                       gdouble last_sequence,
+                       gdouble last_po_rebuild_time)
 {
 		gchar *tmp;
 		DBT   uid_dbt, vcard_dbt;
@@ -2518,11 +2584,11 @@ build_cache (EBookBackendGroupwise *ebgw)
 	EDataBookView *book_view;
 	EBookBackendGroupwisePrivate *priv = ebgw->priv;
 	gchar *status_msg;
-
+ *
 	status = e_gw_connection_get_items (ebgw->priv->cnc, ebgw->priv->container_id, "name email default members", NULL, &gw_items);
 	if (status != E_GW_CONNECTION_STATUS_OK)
 		return NULL;
-
+ *
 	for (; gw_items != NULL; gw_items = g_list_next (gw_items)) {
 		contact_num++;
 		contact = e_contact_new ();
@@ -2536,14 +2602,14 @@ build_cache (EBookBackendGroupwise *ebgw)
 		}
 		g_object_unref (contact);
 		g_object_unref (gw_items->data);
-
+ *
 	}
-
+ *
 	e_book_backend_cache_set_populated (priv->cache);
-	priv->is_cache_ready=TRUE;
-
+	priv->is_cache_ready = TRUE;
+ *
 	g_list_free (gw_items);
-
+ *
 	return NULL;
 }*/
 
@@ -2600,8 +2666,8 @@ build_cache (EBookBackendGroupwise *ebgw)
 						      position, &gw_items);
 		if (enable_debug) {
 			g_get_current_time (&tend);
-			diff = tend.tv_sec * 1000 + tend.tv_usec/1000;
-			diff -= tstart.tv_sec * 1000 + tstart.tv_usec/1000;
+			diff = tend.tv_sec * 1000 + tend.tv_usec / 1000;
+			diff -= tstart.tv_sec * 1000 + tstart.tv_usec / 1000;
 			printf("e_gw_connection_read_cursor took %ld.%03ld seconds for %d contacts\n", diff / 1000, diff % 1000, CURSOR_ITEM_LIMIT);
 		}
 
@@ -2647,7 +2713,7 @@ build_cache (EBookBackendGroupwise *ebgw)
 		if (!gw_items) {
 			e_book_backend_db_cache_set_populated (ebgw->priv->file_db);
 			done = TRUE;
-			priv->is_cache_ready=TRUE;
+			priv->is_cache_ready = TRUE;
 			priv->is_summary_ready = TRUE;
 		}
 
@@ -2667,8 +2733,8 @@ build_cache (EBookBackendGroupwise *ebgw)
 
 	if (enable_debug) {
 		g_get_current_time (&end);
-		diff = end.tv_sec * 1000 + end.tv_usec/1000;
-		diff -= start.tv_sec * 1000 + start.tv_usec/1000;
+		diff = end.tv_sec * 1000 + end.tv_usec / 1000;
+		diff -= start.tv_sec * 1000 + start.tv_usec / 1000;
 		printf("completed building cache for %s in %ld.%03ld seconds for %d contacts\n",
 			priv->book_name, diff / 1000, diff % 1000, contact_num);
 	}
@@ -2707,8 +2773,8 @@ build_summary (EBookBackendGroupwise *ebgw)
 
 	if (enable_debug) {
 		g_get_current_time (&end);
-		diff = end.tv_sec * 1000 + end.tv_usec/1000;
-		diff -= start.tv_sec * 1000 + start.tv_usec/1000;
+		diff = end.tv_sec * 1000 + end.tv_usec / 1000;
+		diff -= start.tv_sec * 1000 + start.tv_usec / 1000;
 		printf("building summary for %s took %ld.%03ld seconds \n",
 			ebgw->priv->book_name, diff / 1000, diff % 1000);
 	}
@@ -2814,8 +2880,8 @@ update_cache (EBookBackendGroupwise *ebgw)
 
 	if (enable_debug) {
 		g_get_current_time (&end);
-		diff = end.tv_sec * 1000 + end.tv_usec/1000;
-		diff -= start.tv_sec * 1000 + start.tv_usec/1000;
+		diff = end.tv_sec * 1000 + end.tv_usec / 1000;
+		diff -= start.tv_sec * 1000 + start.tv_usec / 1000;
 		printf("updating the cache for %s complated in %ld.%03ld seconds for %d contacts\n",
 			ebgw->priv->book_name, diff / 1000, diff % 1000, contact_num);
 	}
@@ -3057,8 +3123,8 @@ update_address_book_deltas (EBookBackendGroupwise *ebgw)
 
 	if (enable_debug) {
 		g_get_current_time (&end);
-		diff = end.tv_sec * 1000 + end.tv_usec/1000;
-		diff -= start.tv_sec * 1000 + start.tv_usec/1000;
+		diff = end.tv_sec * 1000 + end.tv_usec / 1000;
+		diff -= start.tv_sec * 1000 + start.tv_usec / 1000;
 		printf("updating GroupWise system address book cache took %ld.%03ld seconds for %d changes\n",
 			diff / 1000, diff % 1000, contact_num);
 	}
@@ -3133,8 +3199,8 @@ update_address_book_cache (gpointer data)
 
 static void
 e_book_backend_groupwise_authenticate_user (EBookBackend *backend,
-					    GCancellable *cancellable,
-					    ECredentials *credentials)
+                                            GCancellable *cancellable,
+                                            ECredentials *credentials)
 {
 	EBookBackendGroupwise *ebgw;
 	EBookBackendGroupwisePrivate *priv;
@@ -3262,7 +3328,7 @@ e_book_backend_groupwise_authenticate_user (EBookBackend *backend,
 			if (cache_refresh_interval_set) {
 				cache_refresh_interval = g_ascii_strtod (cache_refresh_interval_set,
 									NULL); /* use this */
-				cache_refresh_interval *= (60*1000);
+				cache_refresh_interval *= (60 * 1000);
 			}
 
 			/* set the cache refresh time */
@@ -3301,20 +3367,23 @@ e_book_backend_groupwise_authenticate_user (EBookBackend *backend,
 
 static void
 #if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3
-file_errcall (const DB_ENV *env, const gchar *buf1, const gchar *buf2)
+file_errcall (const DB_ENV *env,
+              const gchar *buf1,
+              const gchar *buf2)
 #else
-file_errcall (const gchar *buf1, gchar *buf2)
+file_errcall (const gchar *buf1,
+              gchar *buf2)
 #endif
 {
 	g_warning ("libdb error: %s", buf2);
 }
 
 static void
-e_book_backend_groupwise_open (EBookBackend	*backend,
-			       EDataBook	*book,
-			       guint		 opid,
-			       GCancellable	*cancellable,
-			       gboolean		 only_if_exists)
+e_book_backend_groupwise_open (EBookBackend *backend,
+                               EDataBook *book,
+                               guint opid,
+                               GCancellable *cancellable,
+                               gboolean only_if_exists)
 {
 	EBookBackendGroupwise *ebgw;
 	EBookBackendGroupwisePrivate *priv;
@@ -3458,7 +3527,7 @@ e_book_backend_groupwise_open (EBookBackend	*backend,
 		gint rv;
 
 		/* the databade didn't exist, so we create the
-		   directory then the .db */
+		 * directory then the .db */
 		rv = g_mkdir_with_parents (dirname, 0700);
 		if (rv == -1 && errno != EEXIST) {
 			if (errno == EACCES || errno == EPERM)
@@ -3526,9 +3595,9 @@ e_book_backend_groupwise_open (EBookBackend	*backend,
 
 static void
 e_book_backend_groupwise_remove (EBookBackend *backend,
-				 EDataBook        *book,
-				 guint32           opid,
-				 GCancellable *cancellable)
+                                 EDataBook *book,
+                                 guint32 opid,
+                                 GCancellable *cancellable)
 {
 	EBookBackendGroupwise *ebgw;
 	gint status;
@@ -3553,7 +3622,11 @@ e_book_backend_groupwise_remove (EBookBackend *backend,
 }
 
 static void
-e_book_backend_groupwise_get_backend_property (EBookBackend *backend, EDataBook *book, guint32 opid, GCancellable *cancellable, const gchar *prop_name)
+e_book_backend_groupwise_get_backend_property (EBookBackend *backend,
+                                               EDataBook *book,
+                                               guint32 opid,
+                                               GCancellable *cancellable,
+                                               const gchar *prop_name)
 {
 	if (enable_debug)
 		printf ("\n%s (prop_name: %s)...\n", G_STRFUNC, prop_name ? prop_name : "NULL");
@@ -3602,7 +3675,8 @@ e_book_backend_groupwise_get_backend_property (EBookBackend *backend, EDataBook
 }
 
 static void
-e_book_backend_groupwise_set_online (EBookBackend *backend, gboolean is_online)
+e_book_backend_groupwise_set_online (EBookBackend *backend,
+                                     gboolean is_online)
 {
 	EBookBackendGroupwise *bg;
 
@@ -3616,7 +3690,7 @@ e_book_backend_groupwise_set_online (EBookBackend *backend, gboolean is_online)
 			e_book_backend_notify_online (backend, FALSE);
 			if (bg->priv->cnc) {
 				g_object_unref (bg->priv->cnc);
-				bg->priv->cnc=NULL;
+				bg->priv->cnc = NULL;
 			}
 		} else {
 			e_book_backend_notify_readonly (backend, bg->priv->is_readonly);
diff --git a/src/calendar/e-cal-backend-groupwise-factory.c b/src/calendar/e-cal-backend-groupwise-factory.c
index 49711a9..d750761 100644
--- a/src/calendar/e-cal-backend-groupwise-factory.c
+++ b/src/calendar/e-cal-backend-groupwise-factory.c
@@ -35,8 +35,9 @@ _get_protocol (ECalBackendFactory *factory)
 	return "groupwise";
 }
 
-static ECalBackend*
-_todos_new_backend (ECalBackendFactory *factory, ESource *source)
+static ECalBackend *
+_todos_new_backend (ECalBackendFactory *factory,
+                    ESource *source)
 {
 	return g_object_new (e_cal_backend_groupwise_get_type (),
 			     "source", source,
@@ -50,8 +51,9 @@ _todos_get_kind (ECalBackendFactory *factory)
 	return ICAL_VTODO_COMPONENT;
 }
 
-static ECalBackend*
-_journal_new_backend (ECalBackendFactory *factory, ESource *source)
+static ECalBackend *
+_journal_new_backend (ECalBackendFactory *factory,
+                      ESource *source)
 {
 	return g_object_new (e_cal_backend_groupwise_get_type (),
 			     "source", source,
@@ -65,8 +67,9 @@ _journal_get_kind (ECalBackendFactory *factory)
 	return ICAL_VJOURNAL_COMPONENT;
 }
 
-static ECalBackend*
-_events_new_backend (ECalBackendFactory *factory, ESource *source)
+static ECalBackend *
+_events_new_backend (ECalBackendFactory *factory,
+                     ESource *source)
 {
 	return g_object_new (e_cal_backend_groupwise_get_type (),
 			     "source", source,
@@ -191,12 +194,13 @@ eds_module_initialize (GTypeModule *module)
 }
 
 void
-eds_module_shutdown   (void)
+eds_module_shutdown (void)
 {
 }
 
 void
-eds_module_list_types (const GType **types, gint *num_types)
+eds_module_list_types (const GType **types,
+                       gint *num_types)
 {
 	*types = groupwise_types;
 	*num_types = 3;
diff --git a/src/calendar/e-cal-backend-groupwise-utils.c b/src/calendar/e-cal-backend-groupwise-utils.c
index 4e804f5..d671db5 100644
--- a/src/calendar/e-cal-backend-groupwise-utils.c
+++ b/src/calendar/e-cal-backend-groupwise-utils.c
@@ -47,7 +47,10 @@
 #include "libedataserver/e-source-list.h"
 
 static gboolean
-get_recur_instance (ECalComponent *comp, time_t instance_start, time_t instance_end, gpointer data)
+get_recur_instance (ECalComponent *comp,
+                    time_t instance_start,
+                    time_t instance_end,
+                    gpointer data)
 {
 	GSList **recur_dates = (GSList **) data;
 	gchar *rdate;
@@ -60,7 +63,10 @@ get_recur_instance (ECalComponent *comp, time_t instance_start, time_t instance_
 }
 
 static gboolean
-get_recur_count (ECalComponent *comp, time_t instance_start, time_t instance_end, gpointer data)
+get_recur_count (ECalComponent *comp,
+                 time_t instance_start,
+                 time_t instance_end,
+                 gpointer data)
 {
 	gint *count = (gint *) data;
 
@@ -70,7 +76,8 @@ get_recur_count (ECalComponent *comp, time_t instance_start, time_t instance_end
 }
 
 static icaltimezone *
-resolve_tzid_cb (const gchar *tzid, gpointer data)
+resolve_tzid_cb (const gchar *tzid,
+                 gpointer data)
 {
 	icaltimezone *zone = icaltimezone_get_builtin_timezone_from_tzid (tzid);
 
@@ -100,7 +107,9 @@ e_cal_component_get_gw_id (ECalComponent *comp)
 }
 
 static void
-set_categories_for_gw_item (EGwItem *item, GSList *category_names, ECalBackendGroupwise *cbgw)
+set_categories_for_gw_item (EGwItem *item,
+                            GSList *category_names,
+                            ECalBackendGroupwise *cbgw)
 {
 	GHashTable *categories_by_name, *categories_by_id;
 	EGwConnection *cnc;
@@ -146,7 +155,9 @@ set_categories_for_gw_item (EGwItem *item, GSList *category_names, ECalBackendGr
 }
 
 static void
-add_send_options_data_to_item (EGwItem *item, ECalComponent *comp, icaltimezone *default_zone)
+add_send_options_data_to_item (EGwItem *item,
+                               ECalComponent *comp,
+                               icaltimezone *default_zone)
 {
 	const gchar *x_val;
 	const gchar *x_name;
@@ -302,7 +313,7 @@ get_mime_type (const gchar *uri)
 
 static void
 e_cal_backend_groupwise_set_attachments_from_comp (ECalComponent *comp,
-		EGwItem *item)
+                                                   EGwItem *item)
 {
 	GSList *attach_list = NULL, *attach_file_list = NULL;
 	GSList *l;
@@ -359,7 +370,8 @@ e_cal_backend_groupwise_set_attachments_from_comp (ECalComponent *comp,
 
 /* Returns the icalproperty for the Attendee associted with email id */
 static icalproperty *
-get_attendee_prop (icalcomponent *icalcomp, const gchar *attendee)
+get_attendee_prop (icalcomponent *icalcomp,
+                   const gchar *attendee)
 {
 	icalproperty *prop;
 
@@ -379,7 +391,11 @@ get_attendee_prop (icalcomponent *icalcomp, const gchar *attendee)
 /* get_attendee_list from cal comp and convert into
  * egwitemrecipient and set it on recipient_list*/
 static void
-set_attendees_to_item (EGwItem *item, ECalComponent *comp, icaltimezone *default_zone, gboolean delegate, const gchar *user_email)
+set_attendees_to_item (EGwItem *item,
+                       ECalComponent *comp,
+                       icaltimezone *default_zone,
+                       gboolean delegate,
+                       const gchar *user_email)
 {
 	if (e_cal_component_get_vtype (comp) == E_CAL_COMPONENT_JOURNAL) {
 		if  (e_cal_component_has_organizer (comp)) {
@@ -485,7 +501,8 @@ set_attendees_to_item (EGwItem *item, ECalComponent *comp, icaltimezone *default
 }
 
 static gint
-get_actual_count (ECalComponent *comp, ECalBackendGroupwise *cbgw)
+get_actual_count (ECalComponent *comp,
+                  ECalBackendGroupwise *cbgw)
 {
 	gint count = 0;
 	icaltimezone *dzone, *utc;
@@ -502,7 +519,9 @@ get_actual_count (ECalComponent *comp, ECalBackendGroupwise *cbgw)
 }
 
 static void
-set_rrule_from_comp (ECalComponent *comp, EGwItem *item, ECalBackendGroupwise *cbgw)
+set_rrule_from_comp (ECalComponent *comp,
+                     EGwItem *item,
+                     ECalBackendGroupwise *cbgw)
 {
 
 	EGwItemRecurrenceRule *item_rrule;
@@ -583,7 +602,9 @@ set_rrule_from_comp (ECalComponent *comp, EGwItem *item, ECalBackendGroupwise *c
 }
 
 static EGwItem *
-set_properties_from_cal_component (EGwItem *item, ECalComponent *comp, ECalBackendGroupwise *cbgw)
+set_properties_from_cal_component (EGwItem *item,
+                                   ECalComponent *comp,
+                                   ECalBackendGroupwise *cbgw)
 {
 	const gchar *uid, *location;
 	gchar *value;
@@ -819,7 +840,9 @@ set_properties_from_cal_component (EGwItem *item, ECalComponent *comp, ECalBacke
 }
 
 EGwItem *
-e_gw_item_new_from_cal_component (const gchar *container, ECalBackendGroupwise *cbgw, ECalComponent *comp)
+e_gw_item_new_from_cal_component (const gchar *container,
+                                  ECalBackendGroupwise *cbgw,
+                                  ECalComponent *comp)
 {
 	EGwItem *item;
 
@@ -838,7 +861,8 @@ e_gw_item_new_from_cal_component (const gchar *container, ECalBackendGroupwise *
 
 /* Set the attendee list and send options to EGwItem */
 EGwItem *
-e_gw_item_new_for_delegate_from_cal (ECalBackendGroupwise *cbgw, ECalComponent *comp)
+e_gw_item_new_for_delegate_from_cal (ECalBackendGroupwise *cbgw,
+                                     ECalComponent *comp)
 {
 	EGwItem *item;
 	icaltimezone *default_zone;
@@ -862,7 +886,8 @@ e_gw_item_new_for_delegate_from_cal (ECalBackendGroupwise *cbgw, ECalComponent *
  * and populate the attach_data
  */
 static gboolean
-get_attach_data_from_server (EGwItemAttachment *attach_item, ECalBackendGroupwise *cbgw)
+get_attach_data_from_server (EGwItemAttachment *attach_item,
+                             ECalBackendGroupwise *cbgw)
 {
 	EGwConnection *cnc;
 	EGwConnectionStatus status;
@@ -885,7 +910,9 @@ get_attach_data_from_server (EGwItemAttachment *attach_item, ECalBackendGroupwis
 }
 
 static void
-set_attachments_to_cal_component (EGwItem *item, ECalComponent *comp, ECalBackendGroupwise *cbgw)
+set_attachments_to_cal_component (EGwItem *item,
+                                  ECalComponent *comp,
+                                  ECalBackendGroupwise *cbgw)
 {
 	GSList *fetch_list = NULL, *l;
 	GSList *comp_attachment_list = NULL;
@@ -926,7 +953,7 @@ set_attachments_to_cal_component (EGwItem *item, ECalComponent *comp, ECalBacken
 				g_free (filename);
 				return; /* Could not get the attachment from the server */
 			}
-			fd = g_open (filename, O_RDWR|O_CREAT|O_TRUNC|O_BINARY, 0600);
+			fd = g_open (filename, O_RDWR | O_CREAT | O_TRUNC | O_BINARY, 0600);
 			if (fd == -1) {
 				/* skip gracefully */
 				g_warning ("DEBUG: could not serialize attachments\n");
@@ -1033,7 +1060,9 @@ get_cn_from_display_name (gchar *display_name)
 }
 
 static void
-sanitize_component (ECalComponent *comp, const gchar *server_uid, const gchar *container_id)
+sanitize_component (ECalComponent *comp,
+                    const gchar *server_uid,
+                    const gchar *container_id)
 {
 	icalproperty *icalprop;
 	gint i;
@@ -1042,7 +1071,7 @@ sanitize_component (ECalComponent *comp, const gchar *server_uid, const gchar *c
 	if (server_uid) {
 
 		/* the ID returned by sendItemResponse includes the container ID of the
-		   inbox folder, so we need to replace that with our container ID */
+		 * inbox folder, so we need to replace that with our container ID */
 		for (i = 0; i < strlen (server_uid); i++) {
 			str = g_string_append_c (str, server_uid[i]);
 			if (server_uid[i] == ':') {
@@ -1061,7 +1090,8 @@ sanitize_component (ECalComponent *comp, const gchar *server_uid, const gchar *c
 }
 
 ECalComponent *
-e_gw_item_to_cal_component (EGwItem *item, ECalBackendGroupwise *cbgw)
+e_gw_item_to_cal_component (EGwItem *item,
+                            ECalBackendGroupwise *cbgw)
 {
 	ECalComponent *comp;
 	ECalComponentText text;
@@ -1126,7 +1156,7 @@ e_gw_item_to_cal_component (EGwItem *item, ECalBackendGroupwise *cbgw)
 
 			t = e_gw_connection_get_date_from_string (reply_within);
 			temp = ctime (&t);
-			temp[strlen (temp)-1] = '\0';
+			temp[strlen (temp) - 1] = '\0';
 			value = g_strconcat (N_("Reply Requested: by "), temp, "\n\n", mess ? mess : "", NULL);
 			e_gw_item_set_message (item, (const gchar *) value);
 			g_free (value);
@@ -1164,7 +1194,7 @@ e_gw_item_to_cal_component (EGwItem *item, ECalBackendGroupwise *cbgw)
 		itt_utc = icaltime_from_string (t);
 
 		/* RFC 2445 - CREATED/DTSTAMP/LAST-MODIFIED always in UTC */
-		icaltimezone_convert_time (&itt_utc, (icaltimezone*) icaltime_get_timezone (itt_utc), icaltimezone_get_utc_timezone ());
+		icaltimezone_convert_time (&itt_utc, (icaltimezone *) icaltime_get_timezone (itt_utc), icaltimezone_get_utc_timezone ());
 		icaltime_set_timezone (&itt_utc, icaltimezone_get_utc_timezone ());
 
 		e_cal_component_set_created (comp, &itt_utc);
@@ -1175,7 +1205,7 @@ e_gw_item_to_cal_component (EGwItem *item, ECalBackendGroupwise *cbgw)
 	if (t) {
 		itt_utc = icaltime_from_string (t);
 
-		icaltimezone_convert_time (&itt_utc, (icaltimezone*) icaltime_get_timezone (itt_utc), icaltimezone_get_utc_timezone ());
+		icaltimezone_convert_time (&itt_utc, (icaltimezone *) icaltime_get_timezone (itt_utc), icaltimezone_get_utc_timezone ());
 		icaltime_set_timezone (&itt_utc, icaltimezone_get_utc_timezone ());
 
 		e_cal_component_set_last_modified (comp, &itt_utc);
@@ -1443,8 +1473,8 @@ e_gw_item_to_cal_component (EGwItem *item, ECalBackendGroupwise *cbgw)
 					e_cal_component_set_completed (comp, &itt_utc);
 			} else {
 				/* We are setting the completion date as the current time due to
-				   the absence of completion element in the soap interface for posted
-				   tasks */
+				 * the absence of completion element in the soap interface for posted
+				 * tasks */
 				itt = icaltime_today ();
 				e_cal_component_set_completed (comp,&itt);
 			}
@@ -1467,7 +1497,13 @@ e_gw_item_to_cal_component (EGwItem *item, ECalBackendGroupwise *cbgw)
 }
 
 EGwConnectionStatus
-e_gw_connection_send_appointment (ECalBackendGroupwise *cbgw, const gchar *container, ECalComponent *comp, icalproperty_method method, gboolean all_instances, ECalComponent **created_comp, icalparameter_partstat *pstatus)
+e_gw_connection_send_appointment (ECalBackendGroupwise *cbgw,
+                                  const gchar *container,
+                                  ECalComponent *comp,
+                                  icalproperty_method method,
+                                  gboolean all_instances,
+                                  ECalComponent **created_comp,
+                                  icalparameter_partstat *pstatus)
 {
 	EGwConnection *cnc;
 	EGwConnectionStatus status;
@@ -1632,7 +1668,11 @@ e_gw_connection_send_appointment (ECalBackendGroupwise *cbgw, const gchar *conta
 }
 
 EGwConnectionStatus
-e_gw_connection_create_appointment (EGwConnection *cnc, const gchar *container, ECalBackendGroupwise *cbgw, ECalComponent *comp, GSList **id_list)
+e_gw_connection_create_appointment (EGwConnection *cnc,
+                                    const gchar *container,
+                                    ECalBackendGroupwise *cbgw,
+                                    ECalComponent *comp,
+                                    GSList **id_list)
 {
 	EGwItem *item;
 	EGwConnectionStatus status;
@@ -1674,8 +1714,11 @@ e_gw_connection_create_appointment (EGwConnection *cnc, const gchar *container,
 }
 
 static EGwConnectionStatus
-start_freebusy_session (EGwConnection *cnc, const GSList *users,
-               time_t start, time_t end, gchar **session)
+start_freebusy_session (EGwConnection *cnc,
+                        const GSList *users,
+                        time_t start,
+                        time_t end,
+                        gchar **session)
 {
 	SoupSoapMessage *msg;
 	SoupSoapResponse *response;
@@ -1751,7 +1794,8 @@ start_freebusy_session (EGwConnection *cnc, const GSList *users,
 }
 
 static EGwConnectionStatus
-close_freebusy_session (EGwConnection *cnc, const gchar *session)
+close_freebusy_session (EGwConnection *cnc,
+                        const gchar *session)
 {
 	SoupSoapMessage *msg;
 	SoupSoapResponse *response;
@@ -1779,7 +1823,11 @@ close_freebusy_session (EGwConnection *cnc, const gchar *session)
 }
 
 EGwConnectionStatus
-e_gw_connection_get_freebusy_info (ECalBackendGroupwise *cbgw, const GSList *users, time_t start, time_t end, GSList **freebusy)
+e_gw_connection_get_freebusy_info (ECalBackendGroupwise *cbgw,
+                                   const GSList *users,
+                                   time_t start,
+                                   time_t end,
+                                   GSList **freebusy)
 {
 	SoupSoapMessage *msg;
 	SoupSoapResponse *response;
@@ -2022,7 +2070,8 @@ e_gw_connection_get_freebusy_info (ECalBackendGroupwise *cbgw, const GSList *use
 	}G_STMT_END
 
 static void
-set_categories_changes (EGwItem *new_item, EGwItem *old_item)
+set_categories_changes (EGwItem *new_item,
+                        EGwItem *old_item)
 {
 	GList *old_category_list;
 	GList *new_category_list;
@@ -2063,7 +2112,8 @@ set_categories_changes (EGwItem *new_item, EGwItem *old_item)
 }
 
 void
-e_gw_item_set_changes (EGwItem *item, EGwItem *cache_item)
+e_gw_item_set_changes (EGwItem *item,
+                       EGwItem *cache_item)
 {
 	const gchar *subject, *cache_subject;
 	const gchar *message, *cache_message;
@@ -2115,7 +2165,9 @@ e_gw_item_set_changes (EGwItem *item, EGwItem *cache_item)
 }
 
 static void
-add_return_value (EGwSendOptionsReturnNotify track, ESource *source, const gchar *notify)
+add_return_value (EGwSendOptionsReturnNotify track,
+                  ESource *source,
+                  const gchar *notify)
 {
 	gchar *value;
 
@@ -2255,7 +2307,8 @@ e_cal_backend_groupwise_store_settings (GwSettings *hold)
 }
 
 gboolean
-e_cal_backend_groupwise_utils_check_delegate (ECalComponent *comp, const gchar *email)
+e_cal_backend_groupwise_utils_check_delegate (ECalComponent *comp,
+                                              const gchar *email)
 {
 	icalproperty *prop;
 	icalcomponent *icalcomp = e_cal_component_get_icalcomponent (comp);
diff --git a/src/calendar/e-cal-backend-groupwise.c b/src/calendar/e-cal-backend-groupwise.c
index d323048..473fb86 100644
--- a/src/calendar/e-cal-backend-groupwise.c
+++ b/src/calendar/e-cal-backend-groupwise.c
@@ -125,24 +125,24 @@ static ECalBackendClass *parent_class = NULL;
 static guint get_cache_refresh_interval (ECalBackendGroupwise *cbgw);
 
 EGwConnection *
-e_cal_backend_groupwise_get_connection (ECalBackendGroupwise *cbgw) {
-
+e_cal_backend_groupwise_get_connection (ECalBackendGroupwise *cbgw)
+{
 	g_return_val_if_fail (E_IS_CAL_BACKEND_GROUPWISE (cbgw), NULL);
 
 	return cbgw->priv->cnc;
 }
 
 GHashTable *
-e_cal_backend_groupwise_get_categories_by_id (ECalBackendGroupwise *cbgw) {
-
+e_cal_backend_groupwise_get_categories_by_id (ECalBackendGroupwise *cbgw)
+{
 	g_return_val_if_fail (E_IS_CAL_BACKEND_GROUPWISE (cbgw), NULL);
 
 	return cbgw->priv->categories_by_id;
 }
 
 GHashTable *
-e_cal_backend_groupwise_get_categories_by_name (ECalBackendGroupwise *cbgw) {
-
+e_cal_backend_groupwise_get_categories_by_name (ECalBackendGroupwise *cbgw)
+{
 	g_return_val_if_fail (E_IS_CAL_BACKEND_GROUPWISE (cbgw), NULL);
 
 	return cbgw->priv->categories_by_name;
@@ -185,7 +185,8 @@ get_element_type (icalcomponent_kind kind)
 
 /* TODO Do not replicate this in every backend */
 static icaltimezone *
-resolve_tzid (const gchar *tzid, gpointer user_data)
+resolve_tzid (const gchar *tzid,
+              gpointer user_data)
 {
 	icaltimezone *zone;
 
@@ -201,7 +202,7 @@ resolve_tzid (const gchar *tzid, gpointer user_data)
 
 static void
 put_component_to_store (ECalBackendGroupwise *cbgw,
-			ECalComponent *comp)
+                        ECalComponent *comp)
 {
 	time_t time_start, time_end;
 	ECalBackendGroupwisePrivate *priv;
@@ -222,7 +223,8 @@ struct progressData
 };
 
 static gboolean
-update_progress_cb (EDataCalView *view, gpointer user_data)
+update_progress_cb (EDataCalView *view,
+                    gpointer user_data)
 {
 	struct progressData *pd = user_data;
 
@@ -239,7 +241,9 @@ update_progress_cb (EDataCalView *view, gpointer user_data)
 }
 
 static void
-notify_view_progress (ECalBackend *backend, gint percent, const gchar *message)
+notify_view_progress (ECalBackend *backend,
+                      gint percent,
+                      const gchar *message)
 {
 	struct progressData pd;
 
@@ -266,7 +270,7 @@ populate_cache (ECalBackendGroupwise *cbgw)
 	const gchar *position = E_GW_CURSOR_POSITION_END;
 	icalcomponent_kind kind;
 	const gchar *type;
-	EGwFilter* filter[3];
+	EGwFilter * filter[3];
 	gchar l_str[26];
 	gchar h_str[26];
 	icaltimetype temp;
@@ -287,7 +291,7 @@ populate_cache (ECalBackendGroupwise *cbgw)
 	l_time = icaltime_as_timet_with_zone (temp, icaltimezone_get_utc_timezone ());
 	gmtime_r (&l_time, &tm);
 	strftime (l_str, 26, "%Y-%m-%dT%H:%M:%SZ", &tm);
-	temp.day += (2*i);
+	temp.day += (2 * i);
 	icaltime_normalize (temp);
 	h_time = icaltime_as_timet_with_zone (temp, icaltimezone_get_utc_timezone ());
 	gmtime_r (&h_time, &tm);
@@ -341,7 +345,7 @@ populate_cache (ECalBackendGroupwise *cbgw)
 
 				/* Show the progress information */
 				num++;
-				percent = ((gfloat) num/total) * 100;
+				percent = ((gfloat) num / total) * 100;
 
 				/* FIXME The total obtained from the server is wrong. Sometimes the num can
 				be greater than the total. The following makes sure that the percentage is not >= 100 */
@@ -391,7 +395,8 @@ typedef struct
 } CompareIdData;
 
 static gint
-compare_ids (gconstpointer a, gconstpointer b)
+compare_ids (gconstpointer a,
+             gconstpointer b)
 {
 	ECalComponentId *cache_id = (ECalComponentId *) a;
 	CompareIdData *data = (CompareIdData *) b;
@@ -554,7 +559,7 @@ get_deltas (gpointer handle)
 	e_cal_backend_store_thaw_changes (store);
 
 	/* Server utc time is the time when we lasted updated changes from server. local_utc_time is the system utc time. As
-	   there is no way to get the server time on demand, we use the store system utc time to calculate server's time */
+	 * there is no way to get the server time on demand, we use the store system utc time to calculate server's time */
 	local_utc_time = e_cal_backend_store_get_key_value (store, LOCAL_UTC_TIME);
 	current = icaltime_current_time_with_zone (icaltimezone_get_utc_timezone ());
 
@@ -762,7 +767,7 @@ get_cache_refresh_interval (ECalBackendGroupwise *cbgw)
 
 	if (time_interval_string) {
 		time_interval = g_ascii_strtod (time_interval_string, NULL);
-		time_interval *= (60*1000);
+		time_interval *= (60 * 1000);
 	}
 
 	g_free (temp);
@@ -910,7 +915,7 @@ cache_init (ECalBackendGroupwise *cbgw)
 		hold->opts = opts;
 
 		/* We now sync the sendoptions into e-source using the GLIB main loop. Doing this operation
-		    in a thread causes crashes. */
+		 *  in a thread causes crashes. */
 		priv->sendoptions_sync_timeout = g_idle_add ((GSourceFunc ) e_cal_backend_groupwise_store_settings, hold);
 	} else
 		g_warning (G_STRLOC ": Could not get the settings from the server");
@@ -957,7 +962,8 @@ cache_init (ECalBackendGroupwise *cbgw)
 }
 
 static gboolean
-set_container_id_with_count (ECalBackendGroupwise *cbgw, GError **perror)
+set_container_id_with_count (ECalBackendGroupwise *cbgw,
+                             GError **perror)
 {
 	ECalBackendGroupwisePrivate *priv;
 	GList *container_list = NULL, *l;
@@ -1013,7 +1019,8 @@ set_container_id_with_count (ECalBackendGroupwise *cbgw, GError **perror)
 }
 
 static void
-connect_to_server (ECalBackendGroupwise *cbgw, GError **perror)
+connect_to_server (ECalBackendGroupwise *cbgw,
+                   GError **perror)
 {
 	gchar *real_uri;
 	ECalBackendGroupwisePrivate *priv;
@@ -1247,7 +1254,12 @@ e_cal_backend_groupwise_finalize (GObject *object)
 /* Calendar backend methods */
 
 static gboolean
-e_cal_backend_groupwise_get_backend_property (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable, const gchar *prop_name, gchar **prop_value, GError **perror)
+e_cal_backend_groupwise_get_backend_property (ECalBackendSync *backend,
+                                              EDataCal *cal,
+                                              GCancellable *cancellable,
+                                              const gchar *prop_name,
+                                              gchar **prop_value,
+                                              GError **perror)
 {
 	gboolean processed = TRUE;
 
@@ -1318,7 +1330,8 @@ e_cal_backend_groupwise_get_backend_property (ECalBackendSync *backend, EDataCal
 }
 
 static void
-in_offline (ECalBackendGroupwise *cbgw) {
+in_offline (ECalBackendGroupwise *cbgw)
+{
 	ECalBackendGroupwisePrivate *priv;
 
 	priv= cbgw->priv;
@@ -1348,7 +1361,11 @@ in_offline (ECalBackendGroupwise *cbgw) {
 
 /* Open handler for the file backend */
 static void
-e_cal_backend_groupwise_open (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable, gboolean only_if_exists, GError **perror)
+e_cal_backend_groupwise_open (ECalBackendSync *backend,
+                              EDataCal *cal,
+                              GCancellable *cancellable,
+                              gboolean only_if_exists,
+                              GError **perror)
 {
 	ECalBackendGroupwise *cbgw;
 	ECalBackendGroupwisePrivate *priv;
@@ -1416,7 +1433,10 @@ e_cal_backend_groupwise_open (ECalBackendSync *backend, EDataCal *cal, GCancella
 }
 
 static void
-e_cal_backend_groupwise_authenticate_user (ECalBackendSync *backend, GCancellable *cancellable, ECredentials *credentials, GError **error)
+e_cal_backend_groupwise_authenticate_user (ECalBackendSync *backend,
+                                           GCancellable *cancellable,
+                                           ECredentials *credentials,
+                                           GError **error)
 {
 	ECalBackendGroupwise        *cbgw;
 	ECalBackendGroupwisePrivate *priv;
@@ -1443,7 +1463,10 @@ e_cal_backend_groupwise_authenticate_user (ECalBackendSync *backend, GCancellabl
 }
 
 static void
-e_cal_backend_groupwise_remove (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable, GError **perror)
+e_cal_backend_groupwise_remove (ECalBackendSync *backend,
+                                EDataCal *cal,
+                                GCancellable *cancellable,
+                                GError **perror)
 {
 	ECalBackendGroupwise *cbgw;
 	ECalBackendGroupwisePrivate *priv;
@@ -1462,7 +1485,8 @@ e_cal_backend_groupwise_remove (ECalBackendSync *backend, EDataCal *cal, GCancel
 
 /* Set_mode handler for the file backend */
 static void
-e_cal_backend_groupwise_set_online (ECalBackend *backend, gboolean is_online)
+e_cal_backend_groupwise_set_online (ECalBackend *backend,
+                                    gboolean is_online)
 {
 	ECalBackendGroupwise *cbgw;
 	ECalBackendGroupwisePrivate *priv;
@@ -1497,7 +1521,13 @@ e_cal_backend_groupwise_set_online (ECalBackend *backend, gboolean is_online)
 
 /* Get_object_component handler for the groupwise backend */
 static void
-e_cal_backend_groupwise_get_object (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable, const gchar *uid, const gchar *rid, gchar **object, GError **error)
+e_cal_backend_groupwise_get_object (ECalBackendSync *backend,
+                                    EDataCal *cal,
+                                    GCancellable *cancellable,
+                                    const gchar *uid,
+                                    const gchar *rid,
+                                    gchar **object,
+                                    GError **error)
 {
 	ECalComponent *comp;
 	ECalBackendGroupwisePrivate *priv;
@@ -1534,7 +1564,11 @@ e_cal_backend_groupwise_get_object (ECalBackendSync *backend, EDataCal *cal, GCa
 
 /* Add_timezone handler for the groupwise backend */
 static void
-e_cal_backend_groupwise_add_timezone (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable, const gchar *tzobj, GError **error)
+e_cal_backend_groupwise_add_timezone (ECalBackendSync *backend,
+                                      EDataCal *cal,
+                                      GCancellable *cancellable,
+                                      const gchar *tzobj,
+                                      GError **error)
 {
 	icalcomponent *tz_comp;
 	ECalBackendGroupwise *cbgw;
@@ -1569,14 +1603,25 @@ e_cal_backend_groupwise_add_timezone (ECalBackendSync *backend, EDataCal *cal, G
 
 /* Gets the list of attachments */
 static void
-e_cal_backend_groupwise_get_attachment_uris (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable, const gchar *uid, const gchar *rid, GSList **list, GError **perror)
+e_cal_backend_groupwise_get_attachment_uris (ECalBackendSync *backend,
+                                             EDataCal *cal,
+                                             GCancellable *cancellable,
+                                             const gchar *uid,
+                                             const gchar *rid,
+                                             GSList **list,
+                                             GError **perror)
 {
 	/* TODO implement the function */
 }
 
 /* Get_objects_in_range handler for the groupwise backend */
 static void
-e_cal_backend_groupwise_get_object_list (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable, const gchar *sexp, GSList **objects, GError **perror)
+e_cal_backend_groupwise_get_object_list (ECalBackendSync *backend,
+                                         EDataCal *cal,
+                                         GCancellable *cancellable,
+                                         const gchar *sexp,
+                                         GSList **objects,
+                                         GError **perror)
 {
 	ECalBackendGroupwise *cbgw;
 	ECalBackendGroupwisePrivate *priv;
@@ -1626,7 +1671,8 @@ e_cal_backend_groupwise_get_object_list (ECalBackendSync *backend, EDataCal *cal
 
 /* get_query handler for the groupwise backend */
 static void
-e_cal_backend_groupwise_start_view (ECalBackend *backend, EDataCalView *query)
+e_cal_backend_groupwise_start_view (ECalBackend *backend,
+                                    EDataCalView *query)
 {
 	GSList *objects = NULL;
 	GError *err = NULL;
@@ -1653,8 +1699,14 @@ e_cal_backend_groupwise_start_view (ECalBackend *backend, EDataCalView *query)
 
 /* Get_free_busy handler for the file backend */
 static void
-e_cal_backend_groupwise_get_free_busy (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable, const GSList *users,
-				       time_t start, time_t end, GSList **freebusy, GError **perror)
+e_cal_backend_groupwise_get_free_busy (ECalBackendSync *backend,
+                                       EDataCal *cal,
+                                       GCancellable *cancellable,
+                                       const GSList *users,
+                                       time_t start,
+                                       time_t end,
+                                       GSList **freebusy,
+                                       GError **perror)
 {
 	EGwConnectionStatus status;
 	ECalBackendGroupwise *cbgw;
@@ -1677,7 +1729,8 @@ e_cal_backend_groupwise_get_free_busy (ECalBackendSync *backend, EDataCal *cal,
 }
 
 static icaltimezone *
-e_cal_backend_groupwise_internal_get_timezone (ECalBackend *backend, const gchar *tzid)
+e_cal_backend_groupwise_internal_get_timezone (ECalBackend *backend,
+                                               const gchar *tzid)
 {
 	icaltimezone *zone = NULL;
 	ECalBackendGroupwise *cbgw;
@@ -1696,7 +1749,10 @@ e_cal_backend_groupwise_internal_get_timezone (ECalBackend *backend, const gchar
 }
 
 static EGwConnectionStatus
-update_from_server (ECalBackendGroupwise *cbgw, GSList *uid_list, gchar **calobj, ECalComponent *comp)
+update_from_server (ECalBackendGroupwise *cbgw,
+                    GSList *uid_list,
+                    gchar **calobj,
+                    ECalComponent *comp)
 {
 	EGwConnectionStatus stat;
 	ECalBackendGroupwisePrivate *priv;
@@ -1724,7 +1780,7 @@ update_from_server (ECalBackendGroupwise *cbgw, GSList *uid_list, gchar **calobj
 
 	comp = g_object_ref ( (ECalComponent *) list->data );
 	/* convert items into components and add them to the cache */
-	for (i=0, tmp = list; tmp; tmp = g_list_next (tmp), i++) {
+	for (i = 0, tmp = list; tmp; tmp = g_list_next (tmp), i++) {
 		ECalComponent *e_cal_comp;
 		EGwItem *item;
 
@@ -1752,7 +1808,13 @@ update_from_server (ECalBackendGroupwise *cbgw, GSList *uid_list, gchar **calobj
 }
 
 static void
-e_cal_backend_groupwise_create_object (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable, const gchar *in_calobj, gchar **uid, gchar **new_calobj, GError **error)
+e_cal_backend_groupwise_create_object (ECalBackendSync *backend,
+                                       EDataCal *cal,
+                                       GCancellable *cancellable,
+                                       const gchar *in_calobj,
+                                       gchar **uid,
+                                       gchar **new_calobj,
+                                       GError **error)
 {
 	ECalBackendGroupwise *cbgw;
 	ECalBackendGroupwisePrivate *priv;
@@ -1831,7 +1893,9 @@ e_cal_backend_groupwise_create_object (ECalBackendSync *backend, EDataCal *cal,
 }
 
 static void
-get_retract_data (ECalComponent *comp, const gchar **retract_comment, gboolean *all_instances)
+get_retract_data (ECalComponent *comp,
+                  const gchar **retract_comment,
+                  gboolean *all_instances)
 {
 	icalcomponent *icalcomp = NULL;
 	icalproperty *icalprop = NULL;
@@ -1869,8 +1933,14 @@ get_retract_data (ECalComponent *comp, const gchar **retract_comment, gboolean *
 }
 
 static void
-e_cal_backend_groupwise_modify_object (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable, const gchar *calobj,
-				       CalObjModType mod, gchar **old_object, gchar **new_object, GError **error)
+e_cal_backend_groupwise_modify_object (ECalBackendSync *backend,
+                                       EDataCal *cal,
+                                       GCancellable *cancellable,
+                                       const gchar *calobj,
+                                       CalObjModType mod,
+                                       gchar **old_object,
+                                       gchar **new_object,
+                                       GError **error)
 {
 	ECalBackendGroupwise *cbgw;
 	ECalBackendGroupwisePrivate *priv;
@@ -2029,10 +2099,15 @@ get_gw_item_id (icalcomponent *icalcomp)
 
 /* Remove_object handler for the file backend */
 static void
-e_cal_backend_groupwise_remove_object (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable,
-				       const gchar *uid, const gchar *rid,
-				       CalObjModType mod, gchar **old_object,
-				       gchar **object, GError **perror)
+e_cal_backend_groupwise_remove_object (ECalBackendSync *backend,
+                                       EDataCal *cal,
+                                       GCancellable *cancellable,
+                                       const gchar *uid,
+                                       const gchar *rid,
+                                       CalObjModType mod,
+                                       gchar **old_object,
+                                       gchar **object,
+                                       GError **perror)
 {
 	ECalBackendGroupwise *cbgw;
 	ECalBackendGroupwisePrivate *priv;
@@ -2163,7 +2238,8 @@ e_cal_backend_groupwise_remove_object (ECalBackendSync *backend, EDataCal *cal,
  * ../file/e-cal-backend-file.c
  */
 static void
-fetch_attachments (ECalBackendGroupwise *cbgw, ECalComponent *comp)
+fetch_attachments (ECalBackendGroupwise *cbgw,
+                   ECalComponent *comp)
 {
 	GSList *attach_list = NULL, *new_attach_list = NULL;
 	GSList *l;
@@ -2193,7 +2269,7 @@ fetch_attachments (ECalBackendGroupwise *cbgw, ECalComponent *comp)
 		g_free (filename);
 		dest_file = g_build_filename (cache_dir, new_filename, NULL);
 		g_free (new_filename);
-		fd = g_open (dest_file, O_RDWR|O_CREAT|O_TRUNC|O_BINARY, 0600);
+		fd = g_open (dest_file, O_RDWR | O_CREAT | O_TRUNC | O_BINARY, 0600);
 		if (fd == -1) {
 			/* TODO handle error conditions */
 		} else if (write (fd, g_mapped_file_get_contents (mapped_file),
@@ -2221,7 +2297,9 @@ fetch_attachments (ECalBackendGroupwise *cbgw, ECalComponent *comp)
 }
 
 static void
-change_status (ECalComponent *comp, icalparameter_partstat status, const gchar *email)
+change_status (ECalComponent *comp,
+               icalparameter_partstat status,
+               const gchar *email)
 {
 	icalproperty *prop;
 	icalparameter *param;
@@ -2268,7 +2346,10 @@ change_status (ECalComponent *comp, icalparameter_partstat status, const gchar *
 }
 
 static void
-receive_object (ECalBackendGroupwise *cbgw, EDataCal *cal, icalcomponent *icalcomp, GError **perror)
+receive_object (ECalBackendGroupwise *cbgw,
+                EDataCal *cal,
+                icalcomponent *icalcomp,
+                GError **perror)
 {
 	ECalComponent *comp, *modif_comp = NULL;
 	ECalBackendGroupwisePrivate *priv;
@@ -2397,7 +2478,11 @@ receive_object (ECalBackendGroupwise *cbgw, EDataCal *cal, icalcomponent *icalco
 
 /* Update_objects handler for the file backend. */
 static void
-e_cal_backend_groupwise_receive_objects (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable, const gchar *calobj, GError **perror)
+e_cal_backend_groupwise_receive_objects (ECalBackendSync *backend,
+                                         EDataCal *cal,
+                                         GCancellable *cancellable,
+                                         const gchar *calobj,
+                                         GError **perror)
 {
 	ECalBackendGroupwise *cbgw;
 	ECalBackendGroupwisePrivate *priv;
@@ -2444,7 +2529,11 @@ e_cal_backend_groupwise_receive_objects (ECalBackendSync *backend, EDataCal *cal
 }
 
 static void
-send_object (ECalBackendGroupwise *cbgw, EDataCal *cal, icalcomponent *icalcomp, icalproperty_method method, GError **perror)
+send_object (ECalBackendGroupwise *cbgw,
+             EDataCal *cal,
+             icalcomponent *icalcomp,
+             icalproperty_method method,
+             GError **perror)
 {
 	ECalComponent *comp, *found_comp = NULL;
 	ECalBackendGroupwisePrivate *priv;
@@ -2497,8 +2586,13 @@ send_object (ECalBackendGroupwise *cbgw, EDataCal *cal, icalcomponent *icalcomp,
 }
 
 static void
-e_cal_backend_groupwise_send_objects (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable, const gchar *calobj, GSList **users,
-				      gchar **modified_calobj, GError **perror)
+e_cal_backend_groupwise_send_objects (ECalBackendSync *backend,
+                                      EDataCal *cal,
+                                      GCancellable *cancellable,
+                                      const gchar *calobj,
+                                      GSList **users,
+                                      gchar **modified_calobj,
+                                      GError **perror)
 {
 	icalcomponent *icalcomp, *subcomp;
 	icalcomponent_kind kind;
@@ -2632,7 +2726,8 @@ e_cal_backend_groupwise_class_init (ECalBackendGroupwiseClass *class)
 }
 
 void
-e_cal_backend_groupwise_notify_error_code (ECalBackendGroupwise *cbgw, EGwConnectionStatus status)
+e_cal_backend_groupwise_notify_error_code (ECalBackendGroupwise *cbgw,
+                                           EGwConnectionStatus status)
 {
 	const gchar *msg;
 
diff --git a/src/calendar/e-cal-backend-groupwise.h b/src/calendar/e-cal-backend-groupwise.h
index 5d8463a..618e9c8 100644
--- a/src/calendar/e-cal-backend-groupwise.h
+++ b/src/calendar/e-cal-backend-groupwise.h
@@ -57,10 +57,10 @@ typedef struct {
 } GwSettings;
 
 GType   e_cal_backend_groupwise_get_type (void);
-EGwConnection* e_cal_backend_groupwise_get_connection (ECalBackendGroupwise *cbgw);
-GHashTable* e_cal_backend_groupwise_get_categories_by_id (ECalBackendGroupwise *cbgw);
-GHashTable* e_cal_backend_groupwise_get_categories_by_name (ECalBackendGroupwise *cbgw);
-icaltimezone* e_cal_backend_groupwise_get_default_zone (ECalBackendGroupwise *cbgw);
+EGwConnection * e_cal_backend_groupwise_get_connection (ECalBackendGroupwise *cbgw);
+GHashTable * e_cal_backend_groupwise_get_categories_by_id (ECalBackendGroupwise *cbgw);
+GHashTable * e_cal_backend_groupwise_get_categories_by_name (ECalBackendGroupwise *cbgw);
+icaltimezone * e_cal_backend_groupwise_get_default_zone (ECalBackendGroupwise *cbgw);
 void    e_cal_backend_groupwise_notify_error_code (ECalBackendGroupwise *cbgw, EGwConnectionStatus status);
 const gchar *e_cal_backend_groupwise_get_container_id (ECalBackendGroupwise *cbgw);
 void e_cal_backend_groupwise_priv_lock (ECalBackendGroupwise *cbgw);
diff --git a/src/camel/camel-groupwise-folder.c b/src/camel/camel-groupwise-folder.c
index 4d10f83..1d01009 100644
--- a/src/camel/camel-groupwise-folder.c
+++ b/src/camel/camel-groupwise-folder.c
@@ -26,10 +26,10 @@
  */
 
 /* This file is broken and suffers from multiple author syndrome.
-This needs to be rewritten with a lot of functions cleaned up.
-
-There are a lot of places where code is unneccesarily duplicated,
-which needs to be better organized via functions */
+ * This needs to be rewritten with a lot of functions cleaned up.
+ *
+ * There are a lot of places where code is unneccesarily duplicated,
+ * which needs to be better organized via functions */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -96,7 +96,9 @@ static const gchar * GET_ITEM_VIEW_WITHOUT_CACHE = "peek default recipient threa
 G_DEFINE_TYPE (CamelGroupwiseFolder, camel_groupwise_folder, CAMEL_TYPE_OFFLINE_FOLDER)
 
 static gchar *
-groupwise_get_filename (CamelFolder *folder, const gchar *uid, GError **error)
+groupwise_get_filename (CamelFolder *folder,
+                        const gchar *uid,
+                        GError **error)
 {
 	CamelGroupwiseFolder *gw_folder = CAMEL_GROUPWISE_FOLDER (folder);
 
@@ -105,7 +107,8 @@ groupwise_get_filename (CamelFolder *folder, const gchar *uid, GError **error)
 
 /* create a mime message out of an gwitem */
 static void
-groupwise_set_mail_message_dates (CamelMimeMessage *msg, EGwItem *item)
+groupwise_set_mail_message_dates (CamelMimeMessage *msg,
+                                  EGwItem *item)
 {
 	gchar *dtstring = NULL;
 
@@ -127,7 +130,8 @@ groupwise_set_mail_message_dates (CamelMimeMessage *msg, EGwItem *item)
 }
 
 static void
-groupwise_set_mail_mi_dates (CamelGroupwiseMessageInfo *mi, EGwItem *item)
+groupwise_set_mail_mi_dates (CamelGroupwiseMessageInfo *mi,
+                             EGwItem *item)
 {
 	gchar *sent_date = NULL, *received_date = NULL;
 	time_t actual_time = (time_t) 0;
@@ -151,7 +155,8 @@ groupwise_set_mail_mi_dates (CamelGroupwiseMessageInfo *mi, EGwItem *item)
 }
 
 static void
-groupwise_populate_details_from_item (CamelMimeMessage *msg, EGwItem *item)
+groupwise_populate_details_from_item (CamelMimeMessage *msg,
+                                      EGwItem *item)
 {
 	EGwItemType type;
 	gchar *dtstring = NULL;
@@ -176,7 +181,10 @@ groupwise_populate_details_from_item (CamelMimeMessage *msg, EGwItem *item)
 
 /* convert an item to a msg body. set content type etc. */
 static void
-groupwise_populate_msg_body_from_item (EGwConnection *cnc, CamelMultipart *multipart, EGwItem *item, gchar *body)
+groupwise_populate_msg_body_from_item (EGwConnection *cnc,
+                                       CamelMultipart *multipart,
+                                       EGwItem *item,
+                                       gchar *body)
 {
 	CamelMimePart *part;
 	EGwItemType type;
@@ -192,11 +200,11 @@ groupwise_populate_msg_body_from_item (EGwConnection *cnc, CamelMultipart *multi
 			EGwConnectionStatus status;
 			status = e_gw_connection_get_attachment (cnc,
 					e_gw_item_get_msg_body_id (item), 0, -1,
-					(const gchar **)&temp_body, &len);
+					(const gchar **) &temp_body, &len);
 			if (status == E_GW_CONNECTION_STATUS_INVALID_CONNECTION)
 				status = e_gw_connection_get_attachment (cnc,
 					e_gw_item_get_msg_body_id (item), 0, -1,
-					(const gchar **)&temp_body, &len);
+					(const gchar **) &temp_body, &len);
 			if (status != E_GW_CONNECTION_STATUS_OK) {
 				g_warning ("Could not get Messagebody\n");
 			}
@@ -212,7 +220,7 @@ groupwise_populate_msg_body_from_item (EGwConnection *cnc, CamelMultipart *multi
 			{
 				gchar *cal_buffer = NULL;
 				gint len = 0;
-				if (type==E_GW_ITEM_TYPE_APPOINTMENT)
+				if (type == E_GW_ITEM_TYPE_APPOINTMENT)
 					convert_to_calendar (item, &cal_buffer, &len);
 				else if (type == E_GW_ITEM_TYPE_TASK)
 					convert_to_task (item, &cal_buffer, &len);
@@ -245,13 +253,14 @@ groupwise_populate_msg_body_from_item (EGwConnection *cnc, CamelMultipart *multi
 
 /* Set the recipients list in the message from the item */
 static void
-groupwise_msg_set_recipient_list (CamelMimeMessage *msg, EGwItem *item)
+groupwise_msg_set_recipient_list (CamelMimeMessage *msg,
+                                  EGwItem *item)
 {
 	GSList *recipient_list;
 	EGwItemOrganizer *org;
 	struct _camel_header_address *ha;
 	gchar *subs_email;
-	struct _camel_header_address *to_list = NULL, *cc_list = NULL, *bcc_list=NULL;
+	struct _camel_header_address *to_list = NULL, *cc_list = NULL, *bcc_list = NULL;
 
 	org = e_gw_item_get_organizer (item);
 	recipient_list = e_gw_item_get_recipient_list (item);
@@ -266,9 +275,9 @@ groupwise_msg_set_recipient_list (CamelMimeMessage *msg, EGwItem *item)
 			enabled = recp->status_enabled;
 
 			if (!recp->email) {
-				ha=camel_header_address_new_group (recp->display_name);
+				ha = camel_header_address_new_group (recp->display_name);
 			} else {
-				ha=camel_header_address_new_name (recp->display_name,recp->email);
+				ha = camel_header_address_new_name (recp->display_name,recp->email);
 			}
 
 			if (recp->type == E_GW_ITEM_RECIPIENT_TO) {
@@ -311,21 +320,21 @@ groupwise_msg_set_recipient_list (CamelMimeMessage *msg, EGwItem *item)
 	}
 
 	if (to_list) {
-		subs_email=camel_header_address_list_encode (to_list);
+		subs_email = camel_header_address_list_encode (to_list);
 		camel_medium_set_header( CAMEL_MEDIUM(msg), "To", subs_email);
 		g_free (subs_email);
 		camel_header_address_list_clear (&to_list);
 	}
 
 	if (cc_list) {
-		subs_email=camel_header_address_list_encode (cc_list);
+		subs_email = camel_header_address_list_encode (cc_list);
 		camel_medium_set_header( CAMEL_MEDIUM(msg), "Cc", subs_email);
 		g_free (subs_email);
 		camel_header_address_list_clear (&cc_list);
 	}
 
 	if (bcc_list) {
-		subs_email=camel_header_address_list_encode (bcc_list);
+		subs_email = camel_header_address_list_encode (bcc_list);
 		camel_medium_set_header( CAMEL_MEDIUM(msg), "Bcc", subs_email);
 		g_free (subs_email);
 		camel_header_address_list_clear (&bcc_list);
@@ -334,11 +343,11 @@ groupwise_msg_set_recipient_list (CamelMimeMessage *msg, EGwItem *item)
 	if (org) {
 		if (org->display_name && org->display_name[0] && org->email != NULL && org->email[0] != '\0') {
 			org->display_name = g_strdelimit (org->display_name, "<>", ' ');
-			ha=camel_header_address_new_name (org->display_name, org->email);
+			ha = camel_header_address_new_name (org->display_name, org->email);
 		} else if (org->email)
-			ha=camel_header_address_new_name (org->email, org->email);
+			ha = camel_header_address_new_name (org->email, org->email);
 		else if (org->display_name)
-			ha=camel_header_address_new_group (org->display_name);
+			ha = camel_header_address_new_group (org->display_name);
 		else
 			ha = NULL;
 		if (ha) {
@@ -352,7 +361,8 @@ groupwise_msg_set_recipient_list (CamelMimeMessage *msg, EGwItem *item)
 
 /* code to rename a folder. all the "meta nonsense" code should simply go away */
 static void
-groupwise_folder_rename (CamelFolder *folder, const gchar *new)
+groupwise_folder_rename (CamelFolder *folder,
+                         const gchar *new)
 {
 	CamelGroupwiseFolder *gw_folder;
 	CamelStore *parent_store;
@@ -390,7 +400,9 @@ groupwise_folder_rename (CamelFolder *folder, const gchar *new)
 }
 
 static GPtrArray *
-groupwise_folder_search_by_expression (CamelFolder *folder, const gchar *expression, GError **error)
+groupwise_folder_search_by_expression (CamelFolder *folder,
+                                       const gchar *expression,
+                                       GError **error)
 {
 	CamelGroupwiseFolder *gw_folder = CAMEL_GROUPWISE_FOLDER (folder);
 	GPtrArray *matches;
@@ -404,7 +416,9 @@ groupwise_folder_search_by_expression (CamelFolder *folder, const gchar *express
 }
 
 static guint32
-groupwise_folder_count_by_expression (CamelFolder *folder, const gchar *expression, GError **error)
+groupwise_folder_count_by_expression (CamelFolder *folder,
+                                      const gchar *expression,
+                                      GError **error)
 {
 	CamelGroupwiseFolder *gw_folder = CAMEL_GROUPWISE_FOLDER (folder);
 	guint32 matches;
@@ -418,7 +432,10 @@ groupwise_folder_count_by_expression (CamelFolder *folder, const gchar *expressi
 }
 
 static GPtrArray *
-groupwise_folder_search_by_uids (CamelFolder *folder, const gchar *expression, GPtrArray *uids, GError **error)
+groupwise_folder_search_by_uids (CamelFolder *folder,
+                                 const gchar *expression,
+                                 GPtrArray *uids,
+                                 GError **error)
 {
 	CamelGroupwiseFolder *gw_folder = CAMEL_GROUPWISE_FOLDER (folder);
 	GPtrArray *matches;
@@ -437,7 +454,8 @@ groupwise_folder_search_by_uids (CamelFolder *folder, const gchar *expression, G
 }
 
 static void
-groupwise_folder_search_free (CamelFolder *folder, GPtrArray *uids)
+groupwise_folder_search_free (CamelFolder *folder,
+                              GPtrArray *uids)
 {
 	CamelGroupwiseFolder *gw_folder = CAMEL_GROUPWISE_FOLDER (folder);
 
@@ -468,7 +486,9 @@ free_node (EGwJunkEntry *entry)
 /* This is a point of contention. We behave like the GW client and update our junk list
 in the same way as the GroupWise client. Add senders to junk list */
 static void
-update_junk_list (CamelStore *store, CamelMessageInfo *info, gint flag)
+update_junk_list (CamelStore *store,
+                  CamelMessageInfo *info,
+                  gint flag)
 {
 	gchar **email = NULL, *from = NULL;
 	gint index = 0;
@@ -590,7 +610,8 @@ move_to_junk (CamelFolder *folder,
 /********************* back to folder functions*************************/
 
 static gboolean
-groupwise_sync_summary (CamelFolder *folder, GError **error)
+groupwise_sync_summary (CamelFolder *folder,
+                        GError **error)
 {
 	CamelStoreInfo *si;
 	CamelStore *parent_store;
@@ -619,7 +640,8 @@ groupwise_sync_summary (CamelFolder *folder, GError **error)
 }
 
 static void
-sync_flags (CamelFolder *folder, GList *uids)
+sync_flags (CamelFolder *folder,
+            GList *uids)
 {
 	GList *l;
 	CamelMessageInfo *info = NULL;
@@ -723,7 +745,7 @@ groupwise_sync (CamelFolder *folder,
 	camel_folder_summary_prepare_fetch_all (folder->summary, error);
 	count = camel_folder_summary_count (folder->summary);
 	CAMEL_GROUPWISE_FOLDER_REC_LOCK (folder, cache_lock);
-	for (i=0; i < count; i++) {
+	for (i = 0; i < count; i++) {
 		guint32 flags = 0;
 
 		if (update_single != NULL) {
@@ -1030,7 +1052,7 @@ update_update (CamelSession *session,
 	CamelStore *parent_store;
 	CamelService *service;
 	CamelServiceConnectionStatus conn_status;
-	GList *item_list, *items_full_list = NULL, *last_element=NULL;
+	GList *item_list, *items_full_list = NULL, *last_element = NULL;
 	gint cursor = 0;
 	const gchar *position = E_GW_CURSOR_POSITION_END;
 	gboolean done;
@@ -1041,8 +1063,8 @@ update_update (CamelSession *session,
 	service = CAMEL_SERVICE (gw_store);
 
 	/* Hold the connect_lock.
-	   In case if user went offline, don't do anything.
-	   data->cnc would have become invalid, as the store disconnect unrefs it.
+	 * In case if user went offline, don't do anything.
+	 * data->cnc would have become invalid, as the store disconnect unrefs it.
 	 */
 	camel_service_lock (service, CAMEL_SERVICE_REC_CONNECT_LOCK);
 
@@ -1090,9 +1112,9 @@ update_update (CamelSession *session,
 		else {
 
 			/* item_list is prepended to items_full_list and not the other way
-			   because when we have a large number of items say 50000,
-			   for each iteration there will be more elements in items_full_list
-			   and less elements in item_list */
+			 * because when we have a large number of items say 50000,
+			 * for each iteration there will be more elements in items_full_list
+			 * and less elements in item_list */
 
 			last_element = g_list_last (item_list);
 			if (items_full_list) {
@@ -1107,22 +1129,22 @@ update_update (CamelSession *session,
 
 	camel_service_unlock (service, CAMEL_SERVICE_REC_CONNECT_LOCK);
 	/* Take out only the first part in the list until the @ since it is guaranteed
-	   to be unique only until that symbol */
+	 * to be unique only until that symbol */
 
 	/*if (items_full_list) {
 	  gint i;
 	  item_list = items_full_list;
-
+ *
 	  while (item_list->next) {
 	  i = 0;
 	  while (((const gchar *) item_list->data)[i++]!='@');
-	  ((gchar *) item_list->data)[i-1] = '\0';
+	  ((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';
+	  ((gchar *) item_list->data)[i - 1] = '\0';
 	  }*/
 
 	g_print ("\nNumber of items in the folder: %d \n", g_list_length(items_full_list));
@@ -1141,7 +1163,8 @@ update_update (CamelSession *session,
 }
 
 static gint
-check_for_new_mails_count (CamelGroupwiseSummary *gw_summary, GSList *ids)
+check_for_new_mails_count (CamelGroupwiseSummary *gw_summary,
+                           GSList *ids)
 {
 	CamelFolderSummary *summary = (CamelFolderSummary *) gw_summary;
 	GSList *l = NULL;
@@ -1162,7 +1185,9 @@ check_for_new_mails_count (CamelGroupwiseSummary *gw_summary, GSList *ids)
 }
 
 static gint
-compare_ids (gpointer a, gpointer b, gpointer data)
+compare_ids (gpointer a,
+             gpointer b,
+             gpointer data)
 {
 	EGwItem *item1 = (EGwItem *) a;
 	EGwItem *item2 = (EGwItem *) b;
@@ -1175,7 +1200,10 @@ compare_ids (gpointer a, gpointer b, gpointer data)
 }
 
 static gint
-get_merge_lists_new_count (CamelGroupwiseSummary *summary, GSList *new, GSList *modified, GSList **merged)
+get_merge_lists_new_count (CamelGroupwiseSummary *summary,
+                           GSList *new,
+                           GSList *modified,
+                           GSList **merged)
 {
 	GSList *l, *element;
 	gint count = 0;
@@ -1211,7 +1239,8 @@ get_merge_lists_new_count (CamelGroupwiseSummary *summary, GSList *new, GSList *
 }
 
 static void
-update_summary_string (CamelFolder *folder, const gchar *time_string)
+update_summary_string (CamelFolder *folder,
+                       const gchar *time_string)
 {
 	CamelGroupwiseSummary *summary = (CamelGroupwiseSummary *) folder->summary;
 
@@ -1430,7 +1459,8 @@ get_md5_digest (const guchar *str)
 }
 
 static void
-groupwise_folder_set_threading_data (CamelGroupwiseMessageInfo *mi, EGwItem *item)
+groupwise_folder_set_threading_data (CamelGroupwiseMessageInfo *mi,
+                                     EGwItem *item)
 {
 	const gchar *parent_threads;
 	gint count = 0;
@@ -1456,7 +1486,7 @@ groupwise_folder_set_threading_data (CamelGroupwiseMessageInfo *mi, EGwItem *ite
 
 	refs = camel_header_references_decode (parent_threads);
 	count = camel_header_references_list_size (&refs);
-	mi->info.references = g_malloc (sizeof (*mi->info.references) + ((count-1) * sizeof (mi->info.references->references[0])));
+	mi->info.references = g_malloc (sizeof (*mi->info.references) + ((count - 1) * sizeof (mi->info.references->references[0])));
 	scan = refs;
 	count = 0;
 
@@ -1498,7 +1528,7 @@ gw_update_cache (CamelFolder *folder,
 	gboolean is_junk = FALSE;
 	EGwConnectionStatus status;
 	GList *item_list = list;
-	gint total_items = g_list_length (item_list), i=0;
+	gint total_items = g_list_length (item_list), i = 0;
 	gboolean is_proxy;
 	const gchar *full_name;
 
@@ -1946,9 +1976,9 @@ gw_update_summary (CamelFolder *folder,
 }
 
 static CamelMimeMessage *
-groupwise_folder_item_to_msg ( CamelFolder *folder,
-		EGwItem *item,
-		GError **error )
+groupwise_folder_item_to_msg (CamelFolder *folder,
+                              EGwItem *item,
+                              GError **error)
 {
 	CamelMimeMessage *msg = NULL;
 	CamelGroupwiseStore *gw_store;
@@ -1978,7 +2008,7 @@ groupwise_folder_item_to_msg ( CamelFolder *folder,
 	container_id = camel_groupwise_store_container_id_lookup (gw_store, full_name);
 
 	/* The item is already in calendar. We need to ignore the mime 822 since it would not have the item id of the appointmnet
-	   in calendar */
+	 * in calendar */
 	if (e_gw_item_get_item_type (item) == E_GW_ITEM_TYPE_APPOINTMENT && e_gw_item_is_from_internet (item))
 		ignore_mime_822 = TRUE;
 
@@ -1995,7 +2025,7 @@ groupwise_folder_item_to_msg ( CamelFolder *folder,
 
 			status = e_gw_connection_get_attachment (cnc,
 					attach->id, 0, -1,
-					(const gchar **)&attachment, &len);
+					(const gchar **) &attachment, &len);
 			if (status != E_GW_CONNECTION_STATUS_OK) {
 				g_warning ("Could not get attachment\n");
 				g_set_error (
@@ -2025,7 +2055,7 @@ groupwise_folder_item_to_msg ( CamelFolder *folder,
 						do {
 							status = e_gw_connection_get_attachment_base64 (cnc,
 									attach->id, t_offset, MAX_ATTACHMENT_SIZE,
-									(const gchar **)&t_attach, &t_len, &offset);
+									(const gchar **) &t_attach, &t_len, &offset);
 							if (status == E_GW_CONNECTION_STATUS_OK) {
 
 								if (t_len) {
@@ -2048,7 +2078,7 @@ groupwise_folder_item_to_msg ( CamelFolder *folder,
 					} else {
 						status = e_gw_connection_get_attachment (cnc,
 								attach->id, 0, -1,
-								(const gchar **)&attachment, &len);
+								(const gchar **) &attachment, &len);
 						if (status != E_GW_CONNECTION_STATUS_OK) {
 							g_warning ("Could not get attachment\n");
 							g_set_error (
@@ -2114,7 +2144,7 @@ groupwise_folder_item_to_msg ( CamelFolder *folder,
 
 			t = e_gw_connection_get_date_from_string (reply_within);
 			temp = ctime (&t);
-			temp[strlen (temp)-1] = '\0';
+			temp[strlen (temp) - 1] = '\0';
 			value = g_strconcat (N_("Reply Requested: by "), temp, "\n\n", mess ? mess : "", NULL);
 			e_gw_item_set_message (item, (const gchar *) value);
 			g_free (value);
@@ -2179,7 +2209,7 @@ groupwise_folder_item_to_msg ( CamelFolder *folder,
 				g_object_unref (temp_item);
 			} else {
 				if (attach->size > MAX_ATTACHMENT_SIZE) {
-					gint t_len=0, offset=0, t_offset=0;
+					gint t_len = 0, offset = 0, t_offset = 0;
 					gchar *t_attach = NULL;
 					GString *gstr = g_string_new (NULL);
 
@@ -2187,7 +2217,7 @@ groupwise_folder_item_to_msg ( CamelFolder *folder,
 					do {
 						status = e_gw_connection_get_attachment_base64 (cnc,
 								attach->id, t_offset, MAX_ATTACHMENT_SIZE,
-								(const gchar **)&t_attach, &t_len, &offset);
+								(const gchar **) &t_attach, &t_len, &offset);
 						if (status == E_GW_CONNECTION_STATUS_OK) {
 
 							if (t_len) {
@@ -2211,7 +2241,7 @@ groupwise_folder_item_to_msg ( CamelFolder *folder,
 				} else {
 					status = e_gw_connection_get_attachment (cnc,
 							attach->id, 0, -1,
-							(const gchar **)&attachment, &len);
+							(const gchar **) &attachment, &len);
 				}
 				if (status != E_GW_CONNECTION_STATUS_OK) {
 					g_warning ("Could not get attachment\n");
@@ -2259,7 +2289,7 @@ groupwise_folder_item_to_msg ( CamelFolder *folder,
 					g_free (attachment);
 				} /* if attachment */
 			}
-		} /* end of for*/
+		} /* end of for */
 
 	}/* if attach_list */
 	/********************/
@@ -2343,7 +2373,8 @@ gw_update_all_items (CamelFolder *folder,
 /* A function to compare uids, inspired by strcmp .
 This code was used in some other provider also , imap4rev1 iirc */
 static gint
-uid_compar (gconstpointer va, gconstpointer vb)
+uid_compar (gconstpointer va,
+            gconstpointer vb)
 {
 	const gchar **sa = (const gchar **) va, **sb = (const gchar **) vb;
 	gulong a, b;
@@ -2359,7 +2390,9 @@ uid_compar (gconstpointer va, gconstpointer vb)
 }
 
 static gint
-groupwise_cmp_uids (CamelFolder *folder, const gchar *uid1, const gchar *uid2)
+groupwise_cmp_uids (CamelFolder *folder,
+                    const gchar *uid1,
+                    const gchar *uid2)
 {
 	g_return_val_if_fail (uid1 != NULL, 0);
 	g_return_val_if_fail (uid2 != NULL, 0);
@@ -2954,10 +2987,10 @@ groupwise_transfer_messages_to_sync (CamelFolder *source,
 				if (diff.bits & CAMEL_MESSAGE_SEEN) {
 
 					/*
-					wrapper is a list wrapper bcos e_gw_connection_mark_read
-					is designed for passing multiple uids. Also, there are is not much
-					need/use for a e_gw_connection_mark_ITEM_[un]read
-					*/
+					 * wrapper is a list wrapper bcos e_gw_connection_mark_read
+					 * is designed for passing multiple uids. Also, there are is not much
+					 * need/use for a e_gw_connection_mark_ITEM_[un]read
+					 */
 
 					wrapper = g_list_prepend (wrapper, (gchar *) uid);
 					camel_service_lock (CAMEL_SERVICE (source_parent_store), CAMEL_SERVICE_REC_CONNECT_LOCK);
@@ -2968,11 +3001,11 @@ groupwise_transfer_messages_to_sync (CamelFolder *source,
 				}
 
 				/* A User may mark a message as Unread and then immediately move it to
-				some other folder. The following piece of code take care of such scenario.
-
-				However, Remember that When a mail is deleted after being marked as unread,
-				I am not syncing the read-status.
-				*/
+				 * some other folder. The following piece of code take care of such scenario.
+				 *
+				 * However, Remember that When a mail is deleted after being marked as unread,
+				 * I am not syncing the read-status.
+				 */
 
 				if (unset_flags.bits & CAMEL_MESSAGE_SEEN) {
 					wrapper = g_list_prepend (wrapper, (gchar *) uid);
@@ -3092,7 +3125,9 @@ camel_groupwise_folder_init (CamelGroupwiseFolder *gw_folder)
 }
 
 void
-convert_to_calendar (EGwItem *item, gchar **str, gint *len)
+convert_to_calendar (EGwItem *item,
+                     gchar **str,
+                     gint *len)
 {
 	EGwItemOrganizer *org = NULL;
 	GSList *recp_list = NULL;
@@ -3197,7 +3232,9 @@ convert_to_calendar (EGwItem *item, gchar **str, gint *len)
 }
 
 static void
-convert_to_task (EGwItem *item, gchar **str, gint *len)
+convert_to_task (EGwItem *item,
+                 gchar **str,
+                 gint *len)
 {
 	EGwItemOrganizer *org = NULL;
 	GSList *recp_list = NULL;
@@ -3283,7 +3320,9 @@ convert_to_task (EGwItem *item, gchar **str, gint *len)
 }
 
 static void
-convert_to_note (EGwItem *item, gchar **str, gint *len)
+convert_to_note (EGwItem *item,
+                 gchar **str,
+                 gint *len)
 {
 	EGwItemOrganizer *org = NULL;
 	GString *gstr = g_string_new (NULL);
diff --git a/src/camel/camel-groupwise-folder.h b/src/camel/camel-groupwise-folder.h
index c8e8b85..2f81278 100644
--- a/src/camel/camel-groupwise-folder.h
+++ b/src/camel/camel-groupwise-folder.h
@@ -65,9 +65,9 @@ struct _CamelGroupwiseFolder {
 	CamelOfflineJournal *journal;
 	CamelDataCache *cache;
 
-	guint need_rescan:1;
-	guint need_refresh:1;
-	guint read_only:1;
+	guint need_rescan : 1;
+	guint need_refresh : 1;
+	guint read_only : 1;
 
 };
 
diff --git a/src/camel/camel-groupwise-journal.c b/src/camel/camel-groupwise-journal.c
index aa688f6..7c89f25 100644
--- a/src/camel/camel-groupwise-journal.c
+++ b/src/camel/camel-groupwise-journal.c
@@ -66,7 +66,8 @@ camel_groupwise_journal_init (CamelGroupwiseJournal *groupwise_journal)
 }
 
 static void
-groupwise_entry_free (CamelOfflineJournal *journal, CamelDListNode *entry)
+groupwise_entry_free (CamelOfflineJournal *journal,
+                      CamelDListNode *entry)
 {
 	CamelGroupwiseJournalEntry *groupwise_entry = (CamelGroupwiseJournalEntry *) entry;
 
@@ -77,7 +78,8 @@ groupwise_entry_free (CamelOfflineJournal *journal, CamelDListNode *entry)
 }
 
 static CamelDListNode *
-groupwise_entry_load (CamelOfflineJournal *journal, FILE *in)
+groupwise_entry_load (CamelOfflineJournal *journal,
+                      FILE *in)
 {
 	CamelGroupwiseJournalEntry *entry;
 
@@ -117,7 +119,9 @@ groupwise_entry_load (CamelOfflineJournal *journal, FILE *in)
 }
 
 static gint
-groupwise_entry_write (CamelOfflineJournal *journal, CamelDListNode *entry, FILE *out)
+groupwise_entry_write (CamelOfflineJournal *journal,
+                       CamelDListNode *entry,
+                       FILE *out)
 {
 	CamelGroupwiseJournalEntry *groupwise_entry = (CamelGroupwiseJournalEntry *) entry;
 
@@ -145,7 +149,8 @@ groupwise_entry_write (CamelOfflineJournal *journal, CamelDListNode *entry, FILE
 }
 
 static void
-gw_message_info_dup_to (CamelMessageInfoBase *dest, CamelMessageInfoBase *src)
+gw_message_info_dup_to (CamelMessageInfoBase *dest,
+                        CamelMessageInfoBase *src)
 {
 	camel_flag_list_copy (&dest->user_flags, &src->user_flags);
 	camel_tag_list_copy (&dest->user_tags, &src->user_tags);
@@ -284,7 +289,8 @@ groupwise_entry_play (CamelOfflineJournal *journal,
 }
 
 CamelOfflineJournal *
-camel_groupwise_journal_new (CamelGroupwiseFolder *folder, const gchar *filename)
+camel_groupwise_journal_new (CamelGroupwiseFolder *folder,
+                             const gchar *filename)
 {
 	CamelOfflineJournal *journal;
 
diff --git a/src/camel/camel-groupwise-private.h b/src/camel/camel-groupwise-private.h
index ebc9bfe..3c78cef 100644
--- a/src/camel/camel-groupwise-private.h
+++ b/src/camel/camel-groupwise-private.h
@@ -23,7 +23,7 @@
 #define CAMEL_GROUPWISE_PRIVATE_H
 
 /* need a way to configure and save this data, if this header is to
-   be installed.  For now, dont install it */
+ * be installed.  For now, dont install it */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/src/camel/camel-groupwise-provider.c b/src/camel/camel-groupwise-provider.c
index 9a46fd5..b159c5c 100644
--- a/src/camel/camel-groupwise-provider.c
+++ b/src/camel/camel-groupwise-provider.c
@@ -112,8 +112,9 @@ CamelServiceAuthType camel_groupwise_password_authtype = {
 };
 
 static gint
-groupwise_auto_detect_cb (CamelURL *url, GHashTable **auto_detected,
-			 GError **error)
+groupwise_auto_detect_cb (CamelURL *url,
+                          GHashTable **auto_detected,
+                          GError **error)
 {
 	*auto_detected = g_hash_table_new (g_str_hash, g_str_equal);
 
@@ -149,7 +150,8 @@ camel_provider_module_init (void)
 }
 
 static void
-add_hash (guint *hash, gchar *s)
+add_hash (guint *hash,
+          gchar *s)
 {
 	if (s)
 		*hash ^= g_str_hash(s);
@@ -169,7 +171,8 @@ groupwise_url_hash (gconstpointer key)
 }
 
 static gint
-check_equal (gchar *s1, gchar *s2)
+check_equal (gchar *s1,
+             gchar *s2)
 {
 	if (s1 == NULL) {
 		if (s2 == NULL)
@@ -185,7 +188,8 @@ check_equal (gchar *s1, gchar *s2)
 }
 
 static gint
-groupwise_url_equal (gconstpointer a, gconstpointer b)
+groupwise_url_equal (gconstpointer a,
+                     gconstpointer b)
 {
 	const CamelURL *u1 = a, *u2 = b;
 
diff --git a/src/camel/camel-groupwise-store-summary.c b/src/camel/camel-groupwise-store-summary.c
index 38dede2..dadad1c 100644
--- a/src/camel/camel-groupwise-store-summary.c
+++ b/src/camel/camel-groupwise-store-summary.c
@@ -83,13 +83,14 @@ camel_groupwise_store_summary_new (void)
 }
 
 CamelGroupwiseStoreInfo *
-camel_groupwise_store_summary_full_name (CamelGroupwiseStoreSummary *s, const gchar *full_name)
+camel_groupwise_store_summary_full_name (CamelGroupwiseStoreSummary *s,
+                                         const gchar *full_name)
 {
 	gint count, i;
 	CamelGroupwiseStoreInfo *info;
 
 	count = camel_store_summary_count ((CamelStoreSummary *) s);
-	for (i=0;i<count;i++) {
+	for (i = 0; i < count; i++) {
 		info = (CamelGroupwiseStoreInfo *) camel_store_summary_index ((CamelStoreSummary *) s, i);
 		if (info) {
 			if (strcmp (info->full_name, full_name) == 0)
@@ -102,14 +103,16 @@ camel_groupwise_store_summary_full_name (CamelGroupwiseStoreSummary *s, const gc
 }
 
 gchar *
-camel_groupwise_store_summary_full_to_path (CamelGroupwiseStoreSummary *s, const gchar *full_name, gchar dir_sep)
+camel_groupwise_store_summary_full_to_path (CamelGroupwiseStoreSummary *s,
+                                            const gchar *full_name,
+                                            gchar dir_sep)
 {
 	gchar *path, *p;
 	gint c;
 	const gchar *f;
 
 	if (dir_sep != '/') {
-		p = path = alloca (strlen (full_name)*3+1);
+		p = path = alloca (strlen (full_name) * 3 + 1);
 		f = full_name;
 		while ((c = *f++ & 0xff)) {
 			if (c == dir_sep)
@@ -128,15 +131,17 @@ camel_groupwise_store_summary_full_to_path (CamelGroupwiseStoreSummary *s, const
 static guint32 hexnib (guint32 c)
 {
 	if (c >= '0' && c <= '9')
-		return c-'0';
-	else if (c>='A' && c <= 'Z')
-		return c-'A'+10;
+		return c - '0';
+	else if (c >= 'A' && c <= 'Z')
+		return c - 'A' + 10;
 	else
 		return 0;
 }
 
 static gint
-namespace_save (CamelStoreSummary *s, FILE *in, CamelGroupwiseStoreNamespace *ns)
+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
@@ -147,7 +152,8 @@ namespace_save (CamelStoreSummary *s, FILE *in, CamelGroupwiseStoreNamespace *ns
 }
 
 static void
-namespace_free (CamelStoreSummary *s, CamelGroupwiseStoreNamespace *ns)
+namespace_free (CamelStoreSummary *s,
+                CamelGroupwiseStoreNamespace *ns)
 {
 	g_free (ns->path);
 	g_free (ns->full_name);
@@ -165,7 +171,8 @@ namespace_clear (CamelStoreSummary *s)
 }
 
 static CamelGroupwiseStoreNamespace *
-namespace_load (CamelStoreSummary *s, FILE *in)
+namespace_load (CamelStoreSummary *s,
+                FILE *in)
 {
 	CamelGroupwiseStoreNamespace *ns;
 	guint32 sep = '/';
@@ -184,18 +191,20 @@ namespace_load (CamelStoreSummary *s, FILE *in)
 }
 
 gchar *
-camel_groupwise_store_summary_path_to_full (CamelGroupwiseStoreSummary *s, const gchar *path, gchar dir_sep)
+camel_groupwise_store_summary_path_to_full (CamelGroupwiseStoreSummary *s,
+                                            const gchar *path,
+                                            gchar dir_sep)
 {
 	gchar *full, *f;
 	guint32 c, v = 0;
 	const gchar *p;
-	gint state=0;
+	gint state = 0;
 	gchar *subpath, *last = NULL;
 	CamelStoreInfo *si;
 	CamelGroupwiseStoreNamespace *ns;
 
 	/* check to see if we have a subpath of path already defined */
-	subpath = alloca (strlen (path)+1);
+	subpath = alloca (strlen (path) + 1);
 	strcpy (subpath, path);
 	do {
 		si = camel_store_summary_path ((CamelStoreSummary *) s, subpath);
@@ -215,7 +224,7 @@ camel_groupwise_store_summary_path_to_full (CamelGroupwiseStoreSummary *s, const
 
 	ns = camel_groupwise_store_summary_namespace_find_path (s, path);
 
-	f = full = alloca (strlen (path)*2+1);
+	f = full = alloca (strlen (path) * 2 + 1);
 	if (si)
 		p = path + strlen (subpath);
 	else if (ns)
@@ -223,7 +232,7 @@ camel_groupwise_store_summary_path_to_full (CamelGroupwiseStoreSummary *s, const
 	else
 		p = path;
 
-	while ((c = camel_utf8_getc ((const guchar **)&p))) {
+	while ((c = camel_utf8_getc ((const guchar **) &p))) {
 		switch (state) {
 			case 0:
 				if (c == '%')
@@ -263,7 +272,8 @@ camel_groupwise_store_summary_path_to_full (CamelGroupwiseStoreSummary *s, const
 }
 
 CamelGroupwiseStoreNamespace *
-camel_groupwise_store_summary_namespace_find_full (CamelGroupwiseStoreSummary *s, const gchar *full)
+camel_groupwise_store_summary_namespace_find_full (CamelGroupwiseStoreSummary *s,
+                                                   const gchar *full)
 {
 	gint len;
 	CamelGroupwiseStoreNamespace *ns;
@@ -285,7 +295,9 @@ camel_groupwise_store_summary_namespace_find_full (CamelGroupwiseStoreSummary *s
 }
 
 CamelGroupwiseStoreInfo *
-camel_groupwise_store_summary_add_from_full (CamelGroupwiseStoreSummary *s, const gchar *full, gchar dir_sep)
+camel_groupwise_store_summary_add_from_full (CamelGroupwiseStoreSummary *s,
+                                             const gchar *full,
+                                             gchar dir_sep)
 {
 	CamelGroupwiseStoreInfo *info;
 	gchar *pathu8, *prefix;
@@ -296,10 +308,10 @@ camel_groupwise_store_summary_add_from_full (CamelGroupwiseStoreSummary *s, cons
 	d(printf("adding full name '%s' '%c'\n", full, dir_sep));
 
 	len = strlen (full);
-	full_name = alloca (len+1);
+	full_name = alloca (len + 1);
 	strcpy (full_name, full);
-	if (full_name[len-1] == dir_sep)
-		full_name[len-1] = 0;
+	if (full_name[len - 1] == dir_sep)
+		full_name[len - 1] = 0;
 
 	info = camel_groupwise_store_summary_full_name (s, full_name);
 	if (info) {
@@ -318,7 +330,7 @@ camel_groupwise_store_summary_add_from_full (CamelGroupwiseStoreSummary *s, cons
 			if (full_name[len] == ns->sep)
 				len++;
 
-			prefix = camel_groupwise_store_summary_full_to_path (s, full_name+len, ns->sep);
+			prefix = camel_groupwise_store_summary_full_to_path (s, full_name + len, ns->sep);
 			if (*ns->path) {
 				pathu8 = g_strdup_printf ("%s/%s", ns->path, prefix);
 				g_free (prefix);
@@ -344,7 +356,8 @@ camel_groupwise_store_summary_add_from_full (CamelGroupwiseStoreSummary *s, cons
 }
 
 gchar *
-camel_groupwise_store_summary_full_from_path (CamelGroupwiseStoreSummary *s, const gchar *path)
+camel_groupwise_store_summary_full_from_path (CamelGroupwiseStoreSummary *s,
+                                              const gchar *path)
 {
 	CamelGroupwiseStoreNamespace *ns;
 	gchar *name = NULL;
@@ -359,7 +372,9 @@ camel_groupwise_store_summary_full_from_path (CamelGroupwiseStoreSummary *s, con
 }
 
 CamelGroupwiseStoreNamespace *
-camel_groupwise_store_summary_namespace_new (CamelGroupwiseStoreSummary *s, const gchar *full_name, gchar dir_sep)
+camel_groupwise_store_summary_namespace_new (CamelGroupwiseStoreSummary *s,
+                                             const gchar *full_name,
+                                             gchar dir_sep)
 {
 	CamelGroupwiseStoreNamespace *ns;
 	gchar *p, *o, c;
@@ -367,7 +382,7 @@ camel_groupwise_store_summary_namespace_new (CamelGroupwiseStoreSummary *s, cons
 
 	ns = g_malloc0 (sizeof (*ns));
 	ns->full_name = g_strdup (full_name);
-	len = strlen (ns->full_name)-1;
+	len = strlen (ns->full_name) - 1;
 	if (len >= 0 && ns->full_name[len] == dir_sep)
 		ns->full_name[len] = 0;
 	ns->sep = dir_sep;
@@ -386,7 +401,8 @@ camel_groupwise_store_summary_namespace_new (CamelGroupwiseStoreSummary *s, cons
 }
 
 void
-camel_groupwise_store_summary_namespace_set (CamelGroupwiseStoreSummary *s, CamelGroupwiseStoreNamespace *ns)
+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);
@@ -395,7 +411,8 @@ camel_groupwise_store_summary_namespace_set (CamelGroupwiseStoreSummary *s, Came
 }
 
 CamelGroupwiseStoreNamespace *
-camel_groupwise_store_summary_namespace_find_path (CamelGroupwiseStoreSummary *s, const gchar *path)
+camel_groupwise_store_summary_namespace_find_path (CamelGroupwiseStoreSummary *s,
+                                                   const gchar *path)
 {
 	gint len;
 	CamelGroupwiseStoreNamespace *ns;
@@ -416,7 +433,8 @@ camel_groupwise_store_summary_namespace_find_path (CamelGroupwiseStoreSummary *s
 }
 
 static gint
-summary_header_load (CamelStoreSummary *s, FILE *in)
+summary_header_load (CamelStoreSummary *s,
+                     FILE *in)
 {
 	CamelGroupwiseStoreSummary *summary = (CamelGroupwiseStoreSummary *) s;
 	 gint32 version, capabilities, count;
@@ -443,12 +461,13 @@ summary_header_load (CamelStoreSummary *s, FILE *in)
 }
 
 static gint
-summary_header_save (CamelStoreSummary *s, FILE *out)
+summary_header_save (CamelStoreSummary *s,
+                     FILE *out)
 {
 	CamelGroupwiseStoreSummary *summary = (CamelGroupwiseStoreSummary *) s;
 	guint32 count;
 
-	count = summary->namespace?1:0;
+	count = summary->namespace ? 1 : 0;
 	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
@@ -462,7 +481,8 @@ summary_header_save (CamelStoreSummary *s, FILE *out)
 }
 
 static CamelStoreInfo *
-store_info_load (CamelStoreSummary *s, FILE *in)
+store_info_load (CamelStoreSummary *s,
+                 FILE *in)
 {
 	CamelGroupwiseStoreInfo *si;
 
@@ -478,7 +498,9 @@ store_info_load (CamelStoreSummary *s, FILE *in)
 }
 
 static gint
-store_info_save (CamelStoreSummary *s, FILE *out, CamelStoreInfo *mi)
+store_info_save (CamelStoreSummary *s,
+                 FILE *out,
+                 CamelStoreInfo *mi)
 {
 	CamelGroupwiseStoreInfo *summary = (CamelGroupwiseStoreInfo *) mi;
 
@@ -490,7 +512,8 @@ store_info_save (CamelStoreSummary *s, FILE *out, CamelStoreInfo *mi)
 }
 
 static void
-store_info_free (CamelStoreSummary *s, CamelStoreInfo *mi)
+store_info_free (CamelStoreSummary *s,
+                 CamelStoreInfo *mi)
 {
 	CamelGroupwiseStoreInfo *si = (CamelGroupwiseStoreInfo *) mi;
 
@@ -499,7 +522,9 @@ store_info_free (CamelStoreSummary *s, CamelStoreInfo *mi)
 }
 
 static const gchar *
-store_info_string (CamelStoreSummary *s, const CamelStoreInfo *mi, gint type)
+store_info_string (CamelStoreSummary *s,
+                   const CamelStoreInfo *mi,
+                   gint type)
 {
 	CamelGroupwiseStoreInfo *isi = (CamelGroupwiseStoreInfo *) mi;
 
@@ -516,7 +541,10 @@ 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)
+store_info_set_string (CamelStoreSummary *s,
+                       CamelStoreInfo *mi,
+                       gint type,
+                       const gchar *str)
 {
 	CamelGroupwiseStoreInfo *isi = (CamelGroupwiseStoreInfo *) mi;
 
diff --git a/src/camel/camel-groupwise-store.c b/src/camel/camel-groupwise-store.c
index 07062b3..c4aec51 100644
--- a/src/camel/camel-groupwise-store.c
+++ b/src/camel/camel-groupwise-store.c
@@ -63,13 +63,13 @@ struct _CamelGroupwiseStorePrivate {
 
 	gchar *base_url;
 
-	GHashTable *id_hash; /*get names from ids*/
-	GHashTable *name_hash;/*get ids from names*/
+	GHashTable *id_hash; /*get names from ids */
+	GHashTable *name_hash;/*get ids from names */
 	GHashTable *parent_hash;
 	EGwConnection *cnc;
 };
 
-extern CamelServiceAuthType camel_groupwise_password_authtype; /*for the query_auth_types function*/
+extern CamelServiceAuthType camel_groupwise_password_authtype; /*for the query_auth_types function */
 
 static GInitableIface *parent_initable_interface;
 
@@ -90,7 +90,8 @@ groupwise_hash_folder_name (gconstpointer key)
 }
 
 static gint
-groupwise_compare_folder_name (gconstpointer a, gconstpointer b)
+groupwise_compare_folder_name (gconstpointer a,
+                               gconstpointer b)
 {
 	gconstpointer aname = a, bname = b;
 
@@ -228,7 +229,8 @@ check_for_connection (CamelService *service,
 
 /* resets the current folder. To just free current folder, pass NULL for folder */
 void
-groupwise_store_set_current_folder (CamelGroupwiseStore *groupwise_store, CamelFolder *folder)
+groupwise_store_set_current_folder (CamelGroupwiseStore *groupwise_store,
+                                    CamelFolder *folder)
 {
 
 	camel_service_lock (CAMEL_SERVICE (groupwise_store), CAMEL_SERVICE_REC_CONNECT_LOCK);
@@ -310,7 +312,9 @@ groupwise_connect_sync (CamelService *service,
 }
 #if 0
 static void
-groupwise_disconnect_cleanup (CamelService *service, gboolean clean, GError **error)
+groupwise_disconnect_cleanup (CamelService *service,
+                              gboolean clean,
+                              GError **error)
 {
 	CamelGroupwiseStore *groupwise_store = CAMEL_GROUPWISE_STORE (service);
 	CamelGroupwiseStorePrivate *priv = groupwise_store->priv;
@@ -384,7 +388,7 @@ groupwise_disconnect_sync (CamelService *service,
 	return TRUE;
 }
 
-static  GList*
+static  GList *
 groupwise_store_query_auth_types_sync (CamelService *service,
                                        GCancellable *cancellable,
                                        GError **error)
@@ -412,7 +416,9 @@ groupwise_is_system_folder (const gchar *folder_name)
 
 /*Build/populate CamelFolderInfo structure based on the imap_build_folder_info function*/
 static CamelFolderInfo *
-groupwise_build_folder_info (CamelGroupwiseStore *gw_store, const gchar *parent_name, const gchar *folder_name)
+groupwise_build_folder_info (CamelGroupwiseStore *gw_store,
+                             const gchar *parent_name,
+                             const gchar *folder_name)
 {
 	const gchar *name;
 	CamelFolderInfo *fi;
@@ -452,7 +458,9 @@ groupwise_build_folder_info (CamelGroupwiseStore *gw_store, const gchar *parent_
 }
 
 static void
-groupwise_forget_folder (CamelGroupwiseStore *gw_store, const gchar *folder_name, GError **error)
+groupwise_forget_folder (CamelGroupwiseStore *gw_store,
+                         const gchar *folder_name,
+                         GError **error)
 {
 	CamelService *service;
 	const gchar *user_data_dir;
@@ -648,7 +656,7 @@ groupwise_store_get_folder_sync (CamelStore *store,
 						count = total;
 
 					camel_operation_progress (
-						cancellable, (100*count)/total);
+						cancellable, (100 * count) / total);
 				}
 
 				gw_update_summary (folder, list, cancellable, error);
@@ -716,7 +724,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;
 		}
@@ -775,7 +783,7 @@ gw_store_reload_folder (CamelGroupwiseStore *gw_store,
 							return FALSE;
 					}
 					/* This full block is repeated in the get_folder code as well. We need
-					   better modularity */
+					 * better modularity */
 					count += CURSOR_ITEM_LIMIT;
 
 					if (total > 0) {
@@ -791,8 +799,8 @@ gw_store_reload_folder (CamelGroupwiseStore *gw_store,
 					gw_update_summary (folder, list, cancellable, error);
 
 					/* For shared-folders created by the user, we don't get the total number of messages,
-					   in the getFolderList call. So, we need to wait until an empty list is returned in the
-					   read cursor call. Hence, we need the !list checking in the code below */
+					 * in the getFolderList call. So, we need to wait until an empty list is returned in the
+					 * read cursor call. Hence, we need the !list checking in the code below */
 					if (count == total || !list)
 							done = TRUE;
 
@@ -859,9 +867,9 @@ convert_to_folder_info (CamelGroupwiseStore *store,
 		(type == E_GW_CONTAINER_TYPE_TRASH) )
 		fi->flags |= CAMEL_FOLDER_SYSTEM;
 	/*
-	   parent_hash contains the "parent id <-> container id" combination. So we form
-	   the path for the full name in camelfolder info by looking up the hash table until
-	   NULL is found
+	 * parent_hash contains the "parent id <-> container id" combination. So we form
+	 * the path for the full name in camelfolder info by looking up the hash table until
+	 * NULL is found
 	 */
 
 	parent = e_gw_container_get_parent_id (container);
@@ -922,7 +930,9 @@ convert_to_folder_info (CamelGroupwiseStore *store,
 }
 
 static void
-get_folders_free (gpointer k, gpointer v, gpointer d)
+get_folders_free (gpointer k,
+                  gpointer v,
+                  gpointer d)
 {
 	CamelFolderInfo *fi = v;
 	camel_folder_info_free (fi);
@@ -953,7 +963,7 @@ groupwise_folders_sync (CamelGroupwiseStore *store,
 	list = folder_list;
 
 	/*populate the hash table for finding the mapping from container id <-> folder name*/
-	for (;temp_list != NULL; temp_list = g_list_next (temp_list) ) {
+	for (; temp_list != NULL; temp_list = g_list_next (temp_list) ) {
 		const gchar *name, *id, *parent;
 		name = e_gw_container_get_name (E_GW_CONTAINER (temp_list->data));
 		id = e_gw_container_get_id (E_GW_CONTAINER (temp_list->data));
@@ -974,7 +984,7 @@ groupwise_folders_sync (CamelGroupwiseStore *store,
 
 	present = g_hash_table_new (g_str_hash, g_str_equal);
 
-	for (;folder_list != NULL; folder_list = g_list_next (folder_list)) {
+	for (; folder_list != NULL; folder_list = g_list_next (folder_list)) {
 		EGwContainerType type;
 		EGwContainer *container = E_GW_CONTAINER (folder_list->data);
 
@@ -1001,7 +1011,7 @@ groupwise_folders_sync (CamelGroupwiseStore *store,
 	count = camel_store_summary_count ((CamelStoreSummary *) store->summary);
 
 	count = camel_store_summary_count ((CamelStoreSummary *) store->summary);
-	for (i=0;i<count;i++) {
+	for (i = 0; i < count; i++) {
 		si = camel_store_summary_index ((CamelStoreSummary *) store->summary, i);
 		if (si == NULL)
 			continue;
@@ -1024,8 +1034,10 @@ groupwise_folders_sync (CamelGroupwiseStore *store,
 }
 
 static CamelFolderInfo *
-groupwise_get_folder_info_offline (CamelStore *store, const gchar *top,
-			 guint32 flags, GError **error)
+groupwise_get_folder_info_offline (CamelStore *store,
+                                   const gchar *top,
+                                   guint32 flags,
+                                   GError **error)
 {
 	CamelGroupwiseStore *groupwise_store = CAMEL_GROUPWISE_STORE (store);
 	CamelFolderInfo *fi;
@@ -1049,7 +1061,7 @@ 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++) {
+	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)
@@ -1084,7 +1096,7 @@ groupwise_store_get_folder_info_sync (CamelStore *store,
 	CamelFolderInfo *info = NULL;
 
 	/* 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 */
+	 * 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)))
 		goto offline;
@@ -1143,7 +1155,7 @@ create_junk_folder (CamelStore *store)
 	return root;
 }
 
-static CamelFolderInfo*
+static CamelFolderInfo *
 groupwise_store_create_folder_sync (CamelStore *store,
                                     const gchar *parent_name,
                                     const gchar *folder_name,
@@ -1325,7 +1337,8 @@ groupwise_store_rename_folder_sync (CamelStore *store,
 }
 
 gchar *
-groupwise_get_name (CamelService *service, gboolean brief)
+groupwise_get_name (CamelService *service,
+                    gboolean brief)
 {
 	CamelURL *url;
 
@@ -1341,7 +1354,8 @@ groupwise_get_name (CamelService *service, gboolean brief)
 }
 
 const gchar *
-camel_groupwise_store_container_id_lookup (CamelGroupwiseStore *gw_store, const gchar *folder_name)
+camel_groupwise_store_container_id_lookup (CamelGroupwiseStore *gw_store,
+                                           const gchar *folder_name)
 {
 	CamelGroupwiseStorePrivate *priv = gw_store->priv;
 
@@ -1349,7 +1363,8 @@ camel_groupwise_store_container_id_lookup (CamelGroupwiseStore *gw_store, const
 }
 
 const gchar *
-camel_groupwise_store_folder_lookup (CamelGroupwiseStore *gw_store, const gchar *container_id)
+camel_groupwise_store_folder_lookup (CamelGroupwiseStore *gw_store,
+                                     const gchar *container_id)
 {
 	CamelGroupwiseStorePrivate *priv = gw_store->priv;
 
@@ -1441,7 +1456,8 @@ camel_groupwise_store_connected (CamelGroupwiseStore *store,
 }
 
 static gint
-match_path (const gchar *path, const gchar *name)
+match_path (const gchar *path,
+            const gchar *name)
 {
 	gchar p, n;
 
diff --git a/src/camel/camel-groupwise-summary.c b/src/camel/camel-groupwise-summary.c
index f647dbe..6c3a539 100644
--- a/src/camel/camel-groupwise-summary.c
+++ b/src/camel/camel-groupwise-summary.c
@@ -61,7 +61,8 @@ static CamelMessageContentInfo * content_info_from_db (CamelFolderSummary *s, Ca
 G_DEFINE_TYPE (CamelGroupwiseSummary, camel_groupwise_summary, CAMEL_TYPE_FOLDER_SUMMARY)
 
 static CamelMessageInfo *
-gw_message_info_clone (CamelFolderSummary *s, const CamelMessageInfo *mi)
+gw_message_info_clone (CamelFolderSummary *s,
+                       const CamelMessageInfo *mi)
 {
 	CamelGroupwiseMessageInfo *to;
 	const CamelGroupwiseMessageInfo *from = (const CamelGroupwiseMessageInfo *) mi;
@@ -116,7 +117,8 @@ camel_groupwise_summary_init (CamelGroupwiseSummary *gw_summary)
  * Returns: A new CamelGroupwiseSummary object.
  **/
 CamelFolderSummary *
-camel_groupwise_summary_new (struct _CamelFolder *folder, const gchar *filename)
+camel_groupwise_summary_new (struct _CamelFolder *folder,
+                             const gchar *filename)
 {
 	CamelFolderSummary *summary;
 
@@ -131,7 +133,8 @@ camel_groupwise_summary_new (struct _CamelFolder *folder, const gchar *filename)
 }
 
 static gint
-summary_header_from_db (CamelFolderSummary *s, CamelFIRecord *mir)
+summary_header_from_db (CamelFolderSummary *s,
+                        CamelFIRecord *mir)
 {
 	CamelGroupwiseSummary *gms = CAMEL_GROUPWISE_SUMMARY (s);
 	gchar *part;
@@ -152,7 +155,8 @@ summary_header_from_db (CamelFolderSummary *s, CamelFIRecord *mir)
 }
 
 static gint
-gw_summary_header_load (CamelFolderSummary *s, FILE *in)
+gw_summary_header_load (CamelFolderSummary *s,
+                        FILE *in)
 {
 	CamelGroupwiseSummary *gms = CAMEL_GROUPWISE_SUMMARY (s);
 
@@ -169,7 +173,8 @@ gw_summary_header_load (CamelFolderSummary *s, FILE *in)
 }
 
 static CamelFIRecord *
-summary_header_to_db (CamelFolderSummary *s, GError **error)
+summary_header_to_db (CamelFolderSummary *s,
+                      GError **error)
 {
 	CamelGroupwiseSummary *ims = CAMEL_GROUPWISE_SUMMARY (s);
 	struct _CamelFIRecord *fir;
@@ -185,7 +190,8 @@ summary_header_to_db (CamelFolderSummary *s, GError **error)
 }
 
 static gint
-gw_summary_header_save (CamelFolderSummary *s, FILE *out)
+gw_summary_header_save (CamelFolderSummary *s,
+                        FILE *out)
 {
 	CamelGroupwiseSummary *gms = CAMEL_GROUPWISE_SUMMARY (s);
 
@@ -198,7 +204,8 @@ gw_summary_header_save (CamelFolderSummary *s, FILE *out)
 }
 
 static CamelMessageInfo *
-message_info_from_db (CamelFolderSummary *s, CamelMIRecord *mir)
+message_info_from_db (CamelFolderSummary *s,
+                      CamelMIRecord *mir)
 {
 	CamelMessageInfo *info;
 	CamelGroupwiseMessageInfo *iinfo;
@@ -213,14 +220,15 @@ message_info_from_db (CamelFolderSummary *s, CamelMIRecord *mir)
 	return info;}
 
 static CamelMessageInfo *
-gw_message_info_migrate (CamelFolderSummary *s, FILE *in)
+gw_message_info_migrate (CamelFolderSummary *s,
+			 FILE *in)
 {
 	CamelMessageInfo *info;
 	CamelGroupwiseMessageInfo *gw_info;
 
 	info = CAMEL_FOLDER_SUMMARY_CLASS (camel_groupwise_summary_parent_class)->message_info_migrate (s,in);
 	if (info) {
-		gw_info = (CamelGroupwiseMessageInfo*) info;
+		gw_info = (CamelGroupwiseMessageInfo *) info;
 		if (camel_file_util_decode_uint32 (in, &gw_info->server_flags) == -1)
 			goto error;
 	}
@@ -232,7 +240,8 @@ error:
 }
 
 static CamelMIRecord *
-message_info_to_db (CamelFolderSummary *s, CamelMessageInfo *info)
+message_info_to_db (CamelFolderSummary *s,
+                    CamelMessageInfo *info)
 {
 	CamelGroupwiseMessageInfo *iinfo = (CamelGroupwiseMessageInfo *) info;
 	struct _CamelMIRecord *mir;
@@ -245,10 +254,11 @@ message_info_to_db (CamelFolderSummary *s, CamelMessageInfo *info)
 }
 
 static CamelMessageContentInfo *
-content_info_from_db (CamelFolderSummary *s, CamelMIRecord *mir)
+content_info_from_db (CamelFolderSummary *s,
+                      CamelMIRecord *mir)
 {
 	gchar *part = mir->cinfo;
-	guint32 type=0;
+	guint32 type = 0;
 
 	if (part) {
 		if (*part == ' ')
@@ -265,7 +275,8 @@ content_info_from_db (CamelFolderSummary *s, CamelMIRecord *mir)
 }
 
 static CamelMessageContentInfo *
-gw_content_info_migrate (CamelFolderSummary *s, FILE *in)
+gw_content_info_migrate (CamelFolderSummary *s,
+                         FILE *in)
 {
 	if (fgetc (in))
 		return CAMEL_FOLDER_SUMMARY_CLASS (camel_groupwise_summary_parent_class)->content_info_migrate (s, in);
@@ -274,7 +285,9 @@ gw_content_info_migrate (CamelFolderSummary *s, FILE *in)
 }
 
 static gint
-content_info_to_db (CamelFolderSummary *s, CamelMessageContentInfo *info, CamelMIRecord *mir)
+content_info_to_db (CamelFolderSummary *s,
+                    CamelMessageContentInfo *info,
+                    CamelMIRecord *mir)
 {
 
 	if (info->type) {
@@ -330,10 +343,10 @@ gw_info_set_flags (CamelMessageInfo *info,
 
 		if (junk_learn_flag && !junk_flag  && (old & CAMEL_GW_MESSAGE_JUNK)) {
 				/*
-				   This has ugly side-effects. Evo will never learn unjunk.
-				   We need to create one CAMEL_MESSAGE_HIDDEN flag which must be
-				   used for all hiding operations. We must also get rid of the seperate file
-				   that is maintained somewhere in evolution/mail/em-folder-browser.c for hidden messages
+				 * This has ugly side-effects. Evo will never learn unjunk.
+				 * We need to create one CAMEL_MESSAGE_HIDDEN flag which must be
+				 * used for all hiding operations. We must also get rid of the seperate file
+				 * that is maintained somewhere in evolution/mail/em-folder-browser.c for hidden messages
 				 */
 				mi->flags |= CAMEL_GW_MESSAGE_NOJUNK | CAMEL_MESSAGE_JUNK | CAMEL_MESSAGE_JUNK_LEARN;
 		} else if (junk_learn_flag && junk_flag && !(old & CAMEL_GW_MESSAGE_JUNK)) {
@@ -399,7 +412,8 @@ camel_gw_summary_add_offline_uncached (CamelFolderSummary *summary,
 }
 
 void
-groupwise_summary_clear (CamelFolderSummary *summary, gboolean uncache)
+groupwise_summary_clear (CamelFolderSummary *summary,
+                         gboolean uncache)
 {
 	CamelFolderChangeInfo *changes;
 	CamelMessageInfo *info;
diff --git a/src/camel/camel-groupwise-transport.c b/src/camel/camel-groupwise-transport.c
index ac12935..84b9a1e 100644
--- a/src/camel/camel-groupwise-transport.c
+++ b/src/camel/camel-groupwise-transport.c
@@ -98,7 +98,7 @@ groupwise_send_to_sync (CamelTransport *transport,
                         GError **error)
 {
 	CamelGroupwiseTransportPrivate *priv;
-	EGwItem *item ,*temp_item=NULL;
+	EGwItem *item ,*temp_item = NULL;
 	EGwConnection *cnc = NULL;
 	EGwConnectionStatus status = 0;
 	GSList *sent_item_list = NULL;
diff --git a/src/camel/camel-groupwise-utils.c b/src/camel/camel-groupwise-utils.c
index eeaacf0..a6b9928 100644
--- a/src/camel/camel-groupwise-utils.c
+++ b/src/camel/camel-groupwise-utils.c
@@ -52,7 +52,8 @@ static void do_multipart (EGwConnection *cnc, EGwItem *item, CamelMultipart *mp,
  * Returns: the expanded path
  **/
 gchar *
-e_path_to_physical (const gchar *prefix, const gchar *vpath)
+e_path_to_physical (const gchar *prefix,
+                    const gchar *vpath)
 {
 	const gchar *p, *newp;
 	gchar *dp;
@@ -127,8 +128,10 @@ e_path_to_physical (const gchar *prefix, const gchar *vpath)
 }
 
 static gboolean
-find_folders_recursive (const gchar *physical_path, const gchar *path,
-			EPathFindFoldersCallback callback, gpointer data)
+find_folders_recursive (const gchar *physical_path,
+                        const gchar *path,
+                        EPathFindFoldersCallback callback,
+                        gpointer data)
 {
 	GDir *dir;
 	gchar *subfolder_directory_path;
@@ -200,8 +203,8 @@ find_folders_recursive (const gchar *physical_path, const gchar *path,
  **/
 gboolean
 e_path_find_folders (const gchar *prefix,
-		     EPathFindFoldersCallback callback,
-		     gpointer data)
+                     EPathFindFoldersCallback callback,
+                     gpointer data)
 {
 	return find_folders_recursive (prefix, "", callback, data);
 }
@@ -220,7 +223,8 @@ e_path_find_folders (const gchar *prefix,
  * the parent directory.
  **/
 gint
-e_path_rmdir (const gchar *prefix, const gchar *vpath)
+e_path_rmdir (const gchar *prefix,
+              const gchar *vpath)
 {
 	gchar *physical_path, *p;
 
@@ -253,13 +257,15 @@ e_path_rmdir (const gchar *prefix, const gchar *vpath)
 }
 
 static GSList *
-add_recipients (GSList *recipient_list, CamelAddress *recipients, gint recipient_type)
+add_recipients (GSList *recipient_list,
+                CamelAddress *recipients,
+                gint recipient_type)
 {
 	gint total_add,i;
 	EGwItemRecipient *recipient;
 
 	total_add = camel_address_length (recipients);
-	for (i=0; i<total_add; i++) {
+	for (i = 0; i < total_add; i++) {
 		const gchar *name = NULL, *addr = NULL;
 		if (camel_internet_address_get ((CamelInternetAddress *) recipients, i , &name, &addr )) {
 
@@ -276,7 +282,14 @@ add_recipients (GSList *recipient_list, CamelAddress *recipients, gint recipient
 }
 
 static void
-send_as_attachment (EGwConnection *cnc, EGwItem *item, CamelStream *content, CamelContentType *type, CamelDataWrapper *dw, const gchar *filename, const gchar *cid, GSList **attach_list)
+send_as_attachment (EGwConnection *cnc,
+                    EGwItem *item,
+                    CamelStream *content,
+                    CamelContentType *type,
+                    CamelDataWrapper *dw,
+                    const gchar *filename,
+                    const gchar *cid,
+                    GSList **attach_list)
 {
 	EGwItemLinkInfo *info = NULL;
 	EGwConnectionStatus status;
@@ -375,7 +388,9 @@ send_as_attachment (EGwConnection *cnc, EGwItem *item, CamelStream *content, Cam
 }
 
 static GSList *
-populate_recipients (CamelMimeMessage *message, EGwItem *item, gboolean redirect)
+populate_recipients (CamelMimeMessage *message,
+                     EGwItem *item,
+                     gboolean redirect)
 {
 	GSList *recipient_list = NULL;
 	CamelAddress *recipients;
@@ -384,26 +399,28 @@ populate_recipients (CamelMimeMessage *message, EGwItem *item, gboolean redirect
 		recipients = CAMEL_ADDRESS (camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_RESENT_TO));
 	else
 		recipients = CAMEL_ADDRESS (camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_TO));
-	recipient_list=add_recipients (recipient_list,recipients,E_GW_ITEM_RECIPIENT_TO);
+	recipient_list = add_recipients (recipient_list,recipients,E_GW_ITEM_RECIPIENT_TO);
 
 	if (redirect)
 		recipients = CAMEL_ADDRESS (camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_RESENT_CC));
 	else
 		recipients = CAMEL_ADDRESS (camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_CC));
-	recipient_list=add_recipients (recipient_list,recipients,E_GW_ITEM_RECIPIENT_CC);
+	recipient_list = add_recipients (recipient_list,recipients,E_GW_ITEM_RECIPIENT_CC);
 
 	if (redirect)
 		recipients = CAMEL_ADDRESS (camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_RESENT_BCC));
 	else
 		recipients = CAMEL_ADDRESS (camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_BCC));
-	recipient_list=add_recipients (recipient_list,recipients,E_GW_ITEM_RECIPIENT_BC);
+	recipient_list = add_recipients (recipient_list,recipients,E_GW_ITEM_RECIPIENT_BC);
 	recipient_list = g_slist_reverse (recipient_list);
 
 	return recipient_list;
 }
 
 EGwItem *
-camel_groupwise_util_item_from_message (EGwConnection *cnc, CamelMimeMessage *message, CamelAddress *from)
+camel_groupwise_util_item_from_message (EGwConnection *cnc,
+                                        CamelMimeMessage *message,
+                                        CamelAddress *from)
 {
 	EGwItem *item;
 	EGwItemOrganizer *org = g_new0 (EGwItemOrganizer, 1);
@@ -582,14 +599,17 @@ camel_groupwise_util_item_from_message (EGwConnection *cnc, CamelMimeMessage *me
 }
 
 void
-do_flags_diff (flags_diff_t *diff, guint32 old, guint32 _new)
+do_flags_diff (flags_diff_t *diff,
+               guint32 old,
+               guint32 _new)
 {
 	diff->changed = old ^ _new;
 	diff->bits = _new & diff->changed;
 }
 
 gchar *
-gw_concat ( const gchar *prefix, const gchar *suffix)
+gw_concat (const gchar *prefix,
+           const gchar *suffix)
 {
 	gsize len;
 
@@ -601,7 +621,9 @@ gw_concat ( const gchar *prefix, const gchar *suffix)
 }
 
 void
-strip_lt_gt (gchar **string, gint s_offset, gint e_offset)
+strip_lt_gt (gchar **string,
+             gint s_offset,
+             gint e_offset)
 {
 	gchar *temp = NULL;
 	gint len;
@@ -615,14 +637,17 @@ strip_lt_gt (gchar **string, gint s_offset, gint e_offset)
 }
 
 static void
-do_multipart (EGwConnection *cnc, EGwItem *item, CamelMultipart *mp, GSList **attach_list)
+do_multipart (EGwConnection *cnc,
+              EGwItem *item,
+              CamelMultipart *mp,
+              GSList **attach_list)
 {
 	/*contains multiple parts*/
 	guint part_count;
 	gint i;
 
 	part_count = camel_multipart_get_number (mp);
-	for ( i=0; i<part_count; i++) {
+	for ( i = 0; i < part_count; i++) {
 		CamelContentType *type;
 		CamelMimePart *part;
 		CamelStream *content;
@@ -711,5 +736,5 @@ do_multipart (EGwConnection *cnc, EGwItem *item, CamelMultipart *mp, GSList **at
 		}
 
 		g_object_unref (content);
-	} /*end of for*/
+	} /*end of for */
 }
diff --git a/src/camel/camel-groupwise-utils.h b/src/camel/camel-groupwise-utils.h
index f6f30fc..228bf8e 100644
--- a/src/camel/camel-groupwise-utils.h
+++ b/src/camel/camel-groupwise-utils.h
@@ -56,7 +56,7 @@ typedef struct {
 } flags_diff_t;
 
 /* FIXME: deprecated
-   This is used exclusively for the legacy imap cache code.  DO NOT use this in any new code */
+ * This is used exclusively for the legacy imap cache code.  DO NOT use this in any new code */
 
 typedef gboolean (*EPathFindFoldersCallback) (const gchar *physical_path,
 					      const gchar *path,
diff --git a/src/plugins/addressbook-groupwise.c b/src/plugins/addressbook-groupwise.c
index 8dda4dc..d396c6e 100644
--- a/src/plugins/addressbook-groupwise.c
+++ b/src/plugins/addressbook-groupwise.c
@@ -31,7 +31,8 @@ void commit_groupwise_addressbook (EPlugin *epl, EConfigTarget *target);
 GtkWidget *e_book_groupwise_dummy (EPlugin *epl, EConfigHookItemFactoryData *data);
 
 void
-commit_groupwise_addressbook (EPlugin *epl, EConfigTarget *target)
+commit_groupwise_addressbook (EPlugin *epl,
+                              EConfigTarget *target)
 {
 	EABConfigTargetSource *t = (EABConfigTargetSource *) target;
 	ESource *source = t->source;
@@ -62,7 +63,8 @@ commit_groupwise_addressbook (EPlugin *epl, EConfigTarget *target)
 }
 
 GtkWidget *
-e_book_groupwise_dummy (EPlugin *epl, EConfigHookItemFactoryData *data)
+e_book_groupwise_dummy (EPlugin *epl,
+                        EConfigHookItemFactoryData *data)
 {
 
 	return NULL;
diff --git a/src/plugins/camel-gw-listener.c b/src/plugins/camel-gw-listener.c
index d081180..39b18da 100644
--- a/src/plugins/camel-gw-listener.c
+++ b/src/plugins/camel-gw-listener.c
@@ -81,7 +81,8 @@ camel_gw_listener_class_init (CamelGwListenerClass *class)
 }
 
 static void
-camel_gw_listener_init (CamelGwListener *config_listener,  CamelGwListenerClass *class)
+camel_gw_listener_init (CamelGwListener *config_listener,
+                        CamelGwListenerClass *class)
 {
 	config_listener->priv = g_new0 (CamelGwListenerPrivate, 1);
 }
@@ -140,7 +141,7 @@ is_groupwise_account (EAccount *account)
 
 /* looks up for an existing groupwise account info in the groupwise_accounts list based on uid */
 
-static GwAccountInfo*
+static GwAccountInfo *
 lookup_account_info (const gchar *key)
 {
 	GList *list;
@@ -182,7 +183,7 @@ add_esource (const gchar *conf_key,
 	ESourceList *source_list;
 	ESourceGroup *group;
 	ESource *source;
-	GConfClient* client;
+	GConfClient * client;
 	GSList *ids, *temp;
 	CamelNetworkSecurityMethod security_method;
 	const gchar *source_selection_key;
@@ -297,12 +298,15 @@ add_esource (const gchar *conf_key,
 }
 
 static void
-remove_esource (const gchar *conf_key, const gchar *group_name, gchar * source_name, const gchar * relative_uri)
+remove_esource (const gchar *conf_key,
+                const gchar *group_name,
+                gchar *source_name,
+                const gchar *relative_uri)
 {
 	ESourceList *list;
 	GSList *groups;
 	gboolean found_group;
-	GConfClient* client;
+	GConfClient * client;
 	GSList *ids;
 	GSList *node_tobe_deleted;
 	const gchar *source_selection_key;
@@ -371,14 +375,17 @@ remove_esource (const gchar *conf_key, const gchar *group_name, gchar * source_n
 /* looks up for e-source with having same info as old_account_info and changes its values passed in new values */
 
 static void
-modify_esource (const gchar * conf_key, GwAccountInfo *old_account_info, EAccount *a, CamelURL *new_url)
+modify_esource (const gchar *conf_key,
+                GwAccountInfo *old_account_info,
+                EAccount *a,
+                CamelURL *new_url)
 {
 	ESourceList *list;
 	GSList *groups;
 	gchar *old_relative_uri;
 	CamelURL *url;
 	gboolean found_group;
-	GConfClient* client;
+	GConfClient * client;
 	CamelSettings *settings;
 	CamelNetworkSecurityMethod security_method;
 	const gchar *poa_address;
@@ -484,7 +491,7 @@ modify_esource (const gchar * conf_key, GwAccountInfo *old_account_info, EAccoun
 
 }
 /* add sources for calendar and tasks if the account added is groupwise account
-   adds the new account info to  groupwise_accounts list */
+ * adds the new account info to  groupwise_accounts list */
 
 static void
 add_calendar_tasks_sources (GwAccountInfo *info)
@@ -501,7 +508,7 @@ add_calendar_tasks_sources (GwAccountInfo *info)
 }
 
 /* removes calendar and tasks sources if the account removed is groupwise account
-   removes the the account info from groupwise_account list */
+ * removes the the account info from groupwise_account list */
 
 static void
 remove_calendar_tasks_sources (GwAccountInfo *info)
@@ -526,7 +533,7 @@ remove_calendar_tasks_sources (GwAccountInfo *info)
 
 }
 
-static GList*
+static GList *
 get_addressbook_names_from_server (gchar *source_url)
 {
 	CamelSettings *settings;
@@ -542,7 +549,7 @@ get_addressbook_names_from_server (gchar *source_url)
 	gchar *password_prompt;
 	gchar *uri;
 	const gchar *poa_address;
-	guint32 flags = E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET;
+	guint32 flags = E_PASSWORDS_REMEMBER_FOREVER | E_PASSWORDS_SECRET;
 	CamelNetworkSecurityMethod security_method;
 	const gchar *scheme;
 	guint16 soap_port;
@@ -630,7 +637,8 @@ get_addressbook_names_from_server (gchar *source_url)
 }
 
 static void
-add_proxy_sources (GwAccountInfo *info, const gchar *parent_name)
+add_proxy_sources (GwAccountInfo *info,
+                   const gchar *parent_name)
 {
 	CamelURL *url;
 	gchar *color;
@@ -661,7 +669,7 @@ add_addressbook_sources (EAccount *account)
 	ESource *source;
 	gchar *base_uri;
 	GList *books_list, *temp_list;
-	GConfClient* client;
+	GConfClient * client;
 	const gchar *use_ssl;
 	const gchar *poa_address;
 	gboolean is_frequent_contacts = FALSE, is_writable = FALSE;
@@ -778,7 +786,7 @@ add_addressbook_sources (EAccount *account)
 
 static void
 modify_addressbook_sources (EAccount *account,
-                            GwAccountInfo *existing_account_info )
+                            GwAccountInfo *existing_account_info)
 {
 	CamelSettings *settings;
 	CamelURL *url;
@@ -933,7 +941,8 @@ remove_addressbook_sources (GwAccountInfo *existing_account_info)
 }
 
 static void
-account_added (EAccountList *account_listener, EAccount *account)
+account_added (EAccountList *account_listener,
+               EAccount *account)
 {
 
 	GwAccountInfo *info;
@@ -968,7 +977,8 @@ account_added (EAccountList *account_listener, EAccount *account)
 }
 
 static void
-account_removed (EAccountList *account_listener, EAccount *account)
+account_removed (EAccountList *account_listener,
+                 EAccount *account)
 {
 	GwAccountInfo *info;
 
@@ -989,7 +999,8 @@ account_removed (EAccountList *account_listener, EAccount *account)
 }
 
 static void
-account_changed (EAccountList *account_listener, EAccount *account)
+account_changed (EAccountList *account_listener,
+                 EAccount *account)
 {
 	gboolean is_gw_account;
 	CamelURL *old_url, *new_url;
@@ -1093,8 +1104,8 @@ account_changed (EAccountList *account_listener, EAccount *account)
 }
 
 static void
-prune_proxies (void) {
-
+prune_proxies (void)
+{
 	EAccountList *account_list;
 	ESourceList *sources;
 	ESourceGroup *group;
@@ -1111,7 +1122,7 @@ prune_proxies (void) {
 	account_list = e_get_account_list ();
 	e_account_list_prune_proxies (account_list);
 
-	for (i=0; i<3; i++) {
+	for (i = 0; i < 3; i++) {
 	if (e_cal_client_get_sources (&sources, types[i], &err)) {
 		/* peek groupwise id and prune for proxies. */
 		groups = e_source_list_peek_groups (sources);
@@ -1134,8 +1145,8 @@ prune_proxies (void) {
 		e_source_list_sync (sources, NULL);
 	}
 	}
-
 }
+
 static void
 camel_gw_listener_construct (CamelGwListener *config_listener)
 {
@@ -1190,7 +1201,7 @@ camel_gw_listener_get_type (void)
 	return camel_gw_listener_type;
 }
 
-CamelGwListener*
+CamelGwListener *
 camel_gw_listener_new (void)
 {
 	CamelGwListener *config_listener;
diff --git a/src/plugins/groupwise-account-setup.c b/src/plugins/groupwise-account-setup.c
index da9ff06..7fa8bd9 100644
--- a/src/plugins/groupwise-account-setup.c
+++ b/src/plugins/groupwise-account-setup.c
@@ -34,7 +34,7 @@
 static CamelGwListener *config_listener = NULL;
 
 gint e_plugin_lib_enable (EPlugin *ep, gint enable);
-GtkWidget* org_gnome_gw_account_setup (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data);
+GtkWidget * org_gnome_gw_account_setup (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data);
 void ensure_mandatory_esource_properties (EPlugin *ep, ESEventTargetUpgrade *target);
 
 static gboolean
@@ -48,7 +48,10 @@ is_groupwise_account (EAccount *account)
 }
 
 static void
-set_esource_props (const gchar *path, EAccount *a, GConfClient *client, const gchar *name)
+set_esource_props (const gchar *path,
+                   EAccount *a,
+                   GConfClient *client,
+                   const gchar *name)
 {
 	ESourceList *list;
 	GSList *groups;
@@ -83,9 +86,10 @@ set_esource_props (const gchar *path, EAccount *a, GConfClient *client, const gc
 }
 
 void
-ensure_mandatory_esource_properties (EPlugin *ep, ESEventTargetUpgrade *target)
+ensure_mandatory_esource_properties (EPlugin *ep,
+                                     ESEventTargetUpgrade *target)
 {
-	GConfClient* client;
+	GConfClient * client;
 	EAccountList *al;
 	EIterator *it;
 
@@ -108,13 +112,14 @@ ensure_mandatory_esource_properties (EPlugin *ep, ESEventTargetUpgrade *target)
 }
 
 static void
-free_groupwise_listener ( void )
+free_groupwise_listener (void)
 {
 	g_object_unref (config_listener);
 }
 
 gint
-e_plugin_lib_enable (EPlugin *ep, gint enable)
+e_plugin_lib_enable (EPlugin *ep,
+                     gint enable)
 {
 	if (!config_listener) {
 		config_listener = camel_gw_listener_new ();
@@ -127,7 +132,8 @@ e_plugin_lib_enable (EPlugin *ep, gint enable)
 GtkWidget * org_gnome_groupwise_account_setup (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data);
 
 GtkWidget *
-org_gnome_groupwise_account_setup (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data)
+org_gnome_groupwise_account_setup (struct _EPlugin *epl,
+                                   struct _EConfigHookItemFactoryData *data)
 {
 	if (data->old)
 		return data->old;
diff --git a/src/plugins/gw-ui.c b/src/plugins/gw-ui.c
index 8dd7527..e2cb9be 100644
--- a/src/plugins/gw-ui.c
+++ b/src/plugins/gw-ui.c
@@ -42,7 +42,9 @@ gboolean gw_ui_mail_message_popup (GtkUIManager *ui_manager, EShellView *shell_v
 gboolean gw_ui_calendar_event_popup (GtkUIManager *ui_manager, EShellView *shell_view);
 
 static gboolean
-is_in_gw_account (EShellView *shell_view, gboolean *is_on_store, gchar **folder_full_name)
+is_in_gw_account (EShellView *shell_view,
+                  gboolean *is_on_store,
+                  gchar **folder_full_name)
 {
 	EShellSidebar *shell_sidebar;
 	EMFolderTree *folder_tree = NULL;
@@ -93,7 +95,10 @@ is_in_gw_account (EShellView *shell_view, gboolean *is_on_store, gchar **folder_
 }
 
 static void
-visible_actions (GtkActionGroup *action_group, gboolean visible, const GtkActionEntry *entries, guint n_entries)
+visible_actions (GtkActionGroup *action_group,
+                 gboolean visible,
+                 const GtkActionEntry *entries,
+                 guint n_entries)
 {
 	gint i;
 
@@ -126,7 +131,8 @@ static GtkActionEntry mfp_entries[] = {
 };
 
 static void
-update_mfp_entries_cb (EShellView *shell_view, gpointer user_data)
+update_mfp_entries_cb (EShellView *shell_view,
+                       gpointer user_data)
 {
 	GtkActionGroup *action_group;
 	EShellWindow *shell_window;
@@ -150,7 +156,8 @@ update_mfp_entries_cb (EShellView *shell_view, gpointer user_data)
 }
 
 gboolean
-gw_ui_mail_folder_popup (GtkUIManager *ui_manager, EShellView *shell_view)
+gw_ui_mail_folder_popup (GtkUIManager *ui_manager,
+                         EShellView *shell_view)
 {
 	EShellWindow *shell_window;
 	GtkActionGroup *action_group;
@@ -190,7 +197,8 @@ static GtkActionEntry mmp_entries[] = {
 };
 
 static void
-update_mmp_entries_cb (EShellView *shell_view, gpointer user_data)
+update_mmp_entries_cb (EShellView *shell_view,
+                       gpointer user_data)
 {
 	EShellWindow *shell_window;
 	GtkActionGroup *action_group;
@@ -242,7 +250,8 @@ update_mmp_entries_cb (EShellView *shell_view, gpointer user_data)
 }
 
 gboolean
-gw_ui_mail_message_popup (GtkUIManager *ui_manager, EShellView *shell_view)
+gw_ui_mail_message_popup (GtkUIManager *ui_manager,
+                          EShellView *shell_view)
 {
 	EShellWindow *shell_window;
 	GtkActionGroup *action_group;
@@ -260,7 +269,8 @@ gw_ui_mail_message_popup (GtkUIManager *ui_manager, EShellView *shell_view)
 }
 
 static icalproperty *
-get_attendee_prop (icalcomponent *icalcomp, const gchar *address)
+get_attendee_prop (icalcomponent *icalcomp,
+                   const gchar *address)
 {
 	icalproperty *prop;
 
@@ -281,7 +291,8 @@ get_attendee_prop (icalcomponent *icalcomp, const gchar *address)
 }
 
 static gboolean
-needs_to_accept (icalcomponent *icalcomp, const gchar *user_email)
+needs_to_accept (icalcomponent *icalcomp,
+                 const gchar *user_email)
 {
 	icalproperty *prop;
 	icalparameter *param;
@@ -303,7 +314,8 @@ needs_to_accept (icalcomponent *icalcomp, const gchar *user_email)
 }
 
 static gboolean
-is_meeting_owner (ECalComponent *comp, ECalClient *client)
+is_meeting_owner (ECalComponent *comp,
+                  ECalClient *client)
 {
 	ECalComponentOrganizer org;
 	gchar *email = NULL;
@@ -359,7 +371,8 @@ static GtkActionEntry cal_entries[] = {
 };
 
 static void
-update_cal_entries_cb (EShellView *shell_view, gpointer user_data)
+update_cal_entries_cb (EShellView *shell_view,
+                       gpointer user_data)
 {
 	EShellWindow *shell_window;
 	GtkActionGroup *action_group;
@@ -444,7 +457,8 @@ update_cal_entries_cb (EShellView *shell_view, gpointer user_data)
 }
 
 gboolean
-gw_ui_calendar_event_popup (GtkUIManager *ui_manager, EShellView *shell_view)
+gw_ui_calendar_event_popup (GtkUIManager *ui_manager,
+                            EShellView *shell_view)
 {
 	EShellWindow *shell_window;
 	GtkActionGroup *action_group;
diff --git a/src/plugins/install-shared.c b/src/plugins/install-shared.c
index c1bbe45..de3db40 100644
--- a/src/plugins/install-shared.c
+++ b/src/plugins/install-shared.c
@@ -50,7 +50,9 @@ struct AcceptData {
 void org_gnome_popup_wizard (EPlugin *ep, EMEventTargetMessage *target);
 
 static void
-install_folder_response (EMFolderSelector *emfs, gint response, gpointer *data)
+install_folder_response (EMFolderSelector *emfs,
+                         gint response,
+                         gpointer *data)
 {
 	struct AcceptData *accept_data = (struct AcceptData *) data;
 	EMFolderTreeModel *model;
@@ -159,7 +161,8 @@ accept_free (gpointer data)
 }
 
 static void
-apply_clicked (GtkAssistant *assistant, CamelMimeMessage *msg)
+apply_clicked (GtkAssistant *assistant,
+               CamelMimeMessage *msg)
 {
 	EShell *shell;
 	EShellBackend *shell_backend;
@@ -196,7 +199,8 @@ apply_clicked (GtkAssistant *assistant, CamelMimeMessage *msg)
 }
 
 void
-org_gnome_popup_wizard (EPlugin *ep, EMEventTargetMessage *target)
+org_gnome_popup_wizard (EPlugin *ep,
+                        EMEventTargetMessage *target)
 {
 	CamelInternetAddress *from_addr = NULL;
 	const gchar *name;
diff --git a/src/plugins/junk-mail-settings.c b/src/plugins/junk-mail-settings.c
index 4a8fa7a..75bdf20 100644
--- a/src/plugins/junk-mail-settings.c
+++ b/src/plugins/junk-mail-settings.c
@@ -45,7 +45,9 @@ abort_changes (JunkSettings *js)
 }
 
 static void
-junk_dialog_response (GtkWidget *dialog, gint response, JunkSettings *js)
+junk_dialog_response (GtkWidget *dialog,
+                      gint response,
+                      JunkSettings *js)
 {
 	if (response == GTK_RESPONSE_ACCEPT) {
 		commit_changes (js);
@@ -59,7 +61,8 @@ junk_dialog_response (GtkWidget *dialog, gint response, JunkSettings *js)
 }
 
 void
-gw_junk_mail_settings_cb (GtkAction *action, EShellView *shell_view)
+gw_junk_mail_settings_cb (GtkAction *action,
+                          EShellView *shell_view)
 {
 	GtkWidget *dialog ,*w, *notebook, *box;
 	GtkWidget *content_area;
diff --git a/src/plugins/junk-settings.c b/src/plugins/junk-settings.c
index 547d601..a4136fb 100644
--- a/src/plugins/junk-settings.c
+++ b/src/plugins/junk-settings.c
@@ -136,7 +136,8 @@ free_node (JunkEntry *nentry)
 }
 
 static JunkEntry *
-find_node (GList *list, gchar *match)
+find_node (GList *list,
+           gchar *match)
 {
 	JunkEntry *one_entry = NULL;
 	EGwJunkEntry *ent = NULL;
@@ -145,7 +146,7 @@ find_node (GList *list, gchar *match)
 
 	if (list) {
 		tmp = g_list_first (list);
-		for (i=0; tmp; i++)
+		for (i = 0; tmp; i++)
 		{
 			one_entry = tmp->data;
 			ent = one_entry->entry;
@@ -239,7 +240,7 @@ commit_changes (JunkSettings *js)
 	}
 
 	if (E_IS_GW_CONNECTION (js->cnc)) {
-		if (js->flag_for_ok == 2 && js->enabled){  /* just turn off the bits*/
+		if (js->flag_for_ok == 2 && js->enabled){  /* just turn off the bits */
 			use_junk = use_pab = use_block = persistence = 0;
 			if (e_gw_connection_modify_junk_settings (js->cnc, use_junk, use_pab, use_block, persistence) == E_GW_CONNECTION_STATUS_OK) {
 				;
@@ -249,7 +250,7 @@ commit_changes (JunkSettings *js)
 		if (js->flag_for_ok == 0 && !js->enabled) {
 			use_block = use_pab =0;
 			use_junk = 1;
-			persistence = 14; /* We are setting the default persistence*/
+			persistence = 14; /* We are setting the default persistence */
 			if (e_gw_connection_modify_junk_settings (js->cnc, use_junk, use_pab, use_block, persistence) == E_GW_CONNECTION_STATUS_OK) {
 				;
 			}
@@ -284,21 +285,24 @@ commit_changes (JunkSettings *js)
 }
 
 static void
-enable_clicked (GtkRadioButton *button, JunkSettings *js)
+enable_clicked (GtkRadioButton *button,
+                JunkSettings *js)
 {
 	js->flag_for_ok = 0;
 	gtk_widget_set_sensitive (GTK_WIDGET (js->table) ,TRUE);
 }
 
 static void
-disable_clicked (GtkRadioButton *button, JunkSettings *js)
+disable_clicked (GtkRadioButton *button,
+                 JunkSettings *js)
 {
 	js->flag_for_ok = 2;
 	gtk_widget_set_sensitive (GTK_WIDGET (js->table), FALSE);
 }
 
 static void
-add_clicked (GtkButton *button, JunkSettings *js)
+add_clicked (GtkButton *button,
+             JunkSettings *js)
 {
 	const gchar *email = NULL;
 	const gchar *self_email = NULL;
@@ -336,7 +340,8 @@ add_clicked (GtkButton *button, JunkSettings *js)
 }
 
 static void
-remove_clicked (GtkButton *button, JunkSettings *js)
+remove_clicked (GtkButton *button,
+                JunkSettings *js)
 {
 	JunkEntry *entry = NULL;
 	gchar *email;
@@ -355,7 +360,8 @@ remove_clicked (GtkButton *button, JunkSettings *js)
 }
 
 static void
-user_selected (GtkTreeSelection *selection, JunkSettings *js)
+user_selected (GtkTreeSelection *selection,
+               JunkSettings *js)
 {
 	GtkTreeModel *model;
 
diff --git a/src/plugins/mail-retract.c b/src/plugins/mail-retract.c
index 1213311..b160e41 100644
--- a/src/plugins/mail-retract.c
+++ b/src/plugins/mail-retract.c
@@ -37,7 +37,9 @@
 #include "share-folder.h"
 
 static gboolean
-get_selected_info (EShellView *shell_view, CamelFolder **folder, gchar **selected_uid)
+get_selected_info (EShellView *shell_view,
+                   CamelFolder **folder,
+                   gchar **selected_uid)
 {
 	EShellContent *shell_content;
 	EMailReader *reader;
@@ -59,7 +61,8 @@ get_selected_info (EShellView *shell_view, CamelFolder **folder, gchar **selecte
 }
 
 void
-gw_retract_mail_cb (GtkAction *action, EShellView *shell_view)
+gw_retract_mail_cb (GtkAction *action,
+                    EShellView *shell_view)
 {
 	EGwConnection *cnc;
 	CamelFolder *folder;
diff --git a/src/plugins/mail-send-options.c b/src/plugins/mail-send-options.c
index efb1612..24e9f4c 100644
--- a/src/plugins/mail-send-options.c
+++ b/src/plugins/mail-send-options.c
@@ -47,7 +47,8 @@ gboolean gw_ui_composer_actions (GtkUIManager *manager, EMsgComposer *composer);
 void org_gnome_composer_message_reply (EPlugin *ep, EMEventTargetMessage *t);
 
 static time_t
-add_day_to_time (time_t time, gint days)
+add_day_to_time (time_t time,
+                 gint days)
 {
 	struct tm *tm;
 
@@ -59,7 +60,9 @@ add_day_to_time (time_t time, gint days)
 }
 
 static void
-feed_input_data (ESendOptionsDialog * dialog, gint state, gpointer data)
+feed_input_data (ESendOptionsDialog *dialog,
+                 gint state,
+                 gpointer data)
 {
 	EMsgComposer *comp;
 	gchar value[100];
@@ -128,7 +131,8 @@ feed_input_data (ESendOptionsDialog * dialog, gint state, gpointer data)
 }
 
 static void
-send_options_commit (EMsgComposer *comp, gpointer user_data)
+send_options_commit (EMsgComposer *comp,
+                     gpointer user_data)
 {
 	if (!user_data && !E_IS_SENDOPTIONS_DIALOG (user_data))
 		return;
@@ -152,7 +156,8 @@ account_is_groupwise (EAccount *account)
 }
 
 static void
-from_changed_cb (EComposerFromHeader *header, EMsgComposer *composer)
+from_changed_cb (EComposerFromHeader *header,
+                 EMsgComposer *composer)
 {
 	GtkActionGroup *group;
 	GtkAction *action;
@@ -172,7 +177,8 @@ from_changed_cb (EComposerFromHeader *header, EMsgComposer *composer)
 }
 
 static void
-action_send_options_cb (GtkAction *action, EMsgComposer *composer)
+action_send_options_cb (GtkAction *action,
+                        EMsgComposer *composer)
 {
 	g_return_if_fail (action != NULL);
 	g_return_if_fail (composer != NULL);
@@ -192,7 +198,8 @@ action_send_options_cb (GtkAction *action, EMsgComposer *composer)
 }
 
 gboolean
-gw_ui_composer_actions (GtkUIManager *manager, EMsgComposer *composer)
+gw_ui_composer_actions (GtkUIManager *manager,
+                        EMsgComposer *composer)
 {
 	static GtkActionEntry entries[] = {
 		{ "gw-send-options",
@@ -226,7 +233,8 @@ gw_ui_composer_actions (GtkUIManager *manager, EMsgComposer *composer)
 }
 
 void
-org_gnome_composer_message_reply (EPlugin *ep, EMEventTargetMessage *t)
+org_gnome_composer_message_reply (EPlugin *ep,
+                                  EMEventTargetMessage *t)
 {
 	EMsgComposer *comp = (struct _EMsgComposer *) t->composer;
 	EComposerHeaderTable *table;
diff --git a/src/plugins/process-meeting.c b/src/plugins/process-meeting.c
index b8e5aa1..a4b0ce2 100644
--- a/src/plugins/process-meeting.c
+++ b/src/plugins/process-meeting.c
@@ -78,7 +78,8 @@ receive_objects (gpointer data)
 }
 
 static icalproperty *
-find_attendee (icalcomponent *ical_comp, const gchar *address)
+find_attendee (icalcomponent *ical_comp,
+               const gchar *address)
 {
 	icalproperty *prop;
 
@@ -110,7 +111,9 @@ find_attendee (icalcomponent *ical_comp, const gchar *address)
 	return prop;
 }
 static void
-change_status (icalcomponent *ical_comp, const gchar *address, icalparameter_partstat status)
+change_status (icalcomponent *ical_comp,
+               const gchar *address,
+               icalparameter_partstat status)
 {
 	icalproperty *prop;
 
@@ -136,7 +139,8 @@ change_status (icalcomponent *ical_comp, const gchar *address, icalparameter_par
 }
 
 static void
-process_meeting (ECalendarView *cal_view, icalparameter_partstat status)
+process_meeting (ECalendarView *cal_view,
+                 icalparameter_partstat status)
 {
 	GList *selected;
 	icalcomponent *clone;
@@ -229,7 +233,8 @@ get_calendar_view (EShellView *shell_view)
 }
 
 void
-gw_meeting_accept_cb (GtkAction *action, EShellView *shell_view)
+gw_meeting_accept_cb (GtkAction *action,
+                      EShellView *shell_view)
 {
 	ECalendarView *cal_view = get_calendar_view (shell_view);
 	g_return_if_fail (cal_view != NULL);
@@ -238,7 +243,8 @@ gw_meeting_accept_cb (GtkAction *action, EShellView *shell_view)
 }
 
 void
-gw_meeting_accept_tentative_cb (GtkAction *action, EShellView *shell_view)
+gw_meeting_accept_tentative_cb (GtkAction *action,
+                                EShellView *shell_view)
 {
 	ECalendarView *cal_view = get_calendar_view (shell_view);
 	g_return_if_fail (cal_view != NULL);
@@ -247,7 +253,8 @@ gw_meeting_accept_tentative_cb (GtkAction *action, EShellView *shell_view)
 }
 
 void
-gw_meeting_decline_cb (GtkAction *action, EShellView *shell_view)
+gw_meeting_decline_cb (GtkAction *action,
+                       EShellView *shell_view)
 {
 	ECalendarView *cal_view = get_calendar_view (shell_view);
 	g_return_if_fail (cal_view != NULL);
@@ -262,7 +269,9 @@ typedef struct {
 } ThreadData;
 
 static void
-add_retract_data (ECalComponent *comp, const gchar *retract_comment, CalObjModType mod)
+add_retract_data (ECalComponent *comp,
+                  const gchar *retract_comment,
+                  CalObjModType mod)
 {
 	icalcomponent *icalcomp = NULL;
 	icalproperty *icalprop = NULL;
@@ -340,7 +349,8 @@ retract_object (gpointer val)
 }
 
 static void
-object_created_cb (CompEditor *ce, gpointer data)
+object_created_cb (CompEditor *ce,
+                   gpointer data)
 {
 	GThread *thread = NULL;
 	gint response;
@@ -364,7 +374,8 @@ object_created_cb (CompEditor *ce, gpointer data)
 }
 
 void
-gw_resend_meeting_cb (GtkAction *action, EShellView *shell_view)
+gw_resend_meeting_cb (GtkAction *action,
+                      EShellView *shell_view)
 {
 	GList *selected;
 	ECalendarView *cal_view = get_calendar_view (shell_view);
diff --git a/src/plugins/proxy-login.c b/src/plugins/proxy-login.c
index 3e18c65..048bce1 100644
--- a/src/plugins/proxy-login.c
+++ b/src/plugins/proxy-login.c
@@ -282,7 +282,7 @@ proxy_login_get_cnc (EAccount *account,
 
 	if (!password)
 		password = e_passwords_ask_password (prompt, NULL, key, prompt,
-				E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET, &remember, password_dlg_parrent);
+				E_PASSWORDS_REMEMBER_FOREVER | E_PASSWORDS_SECRET, &remember, password_dlg_parrent);
 
 	g_free (prompt);
 	cnc = e_gw_connection_new (uri, url->user, password);
@@ -296,7 +296,9 @@ proxy_login_get_cnc (EAccount *account,
 }
 
 static void
-proxy_login_cb (GtkDialog *dialog, gint state, GtkWindow *parent)
+proxy_login_cb (GtkDialog *dialog,
+                gint state,
+                GtkWindow *parent)
 {
 	GtkWidget *account_name_tbox;
 	proxyLoginPrivate *priv;
@@ -324,7 +326,8 @@ proxy_login_cb (GtkDialog *dialog, gint state, GtkWindow *parent)
 }
 
 static void
-proxy_soap_login (gchar *email, GtkWindow *error_parent)
+proxy_soap_login (gchar *email,
+                  GtkWindow *error_parent)
 {
 	EAccountList *accounts = e_get_account_list ();
 	EAccount *srcAccount;
@@ -344,7 +347,7 @@ proxy_soap_login (gchar *email, GtkWindow *error_parent)
 	shell_backend = e_shell_get_backend_by_name (shell, "mail");
 	session = e_mail_backend_get_session (E_MAIL_BACKEND (shell_backend));
 
-	for (i=0; email[i]!='\0' && email[i]!='@' ; i++);
+	for (i = 0; email[i]!='\0' && email[i]!='@' ; i++);
 	if (email[i]=='@')
 		name = g_strndup (email, i);
 	else {
@@ -355,7 +358,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,
@@ -441,7 +444,7 @@ static void
 proxy_login_tree_view_changed_cb (GtkDialog *dialog)
 {
 	proxyLoginPrivate *priv = pld->priv;
-	GtkTreeSelection* account_select;
+	GtkTreeSelection * account_select;
 	GtkTreeIter iter;
 	GtkWidget *account_name_tbox;
 	GtkTreeModel *model;
@@ -455,7 +458,7 @@ proxy_login_tree_view_changed_cb (GtkDialog *dialog)
 	gtk_tree_model_get (model, &iter, ACCOUNT_NAME, &account_mailid, -1);
 	account_mailid = g_strrstr (account_mailid, "\n") + 1;
 	account_name_tbox = e_builder_get_widget (priv->builder, "account_name");
-	gtk_entry_set_text ((GtkEntry*) account_name_tbox,account_mailid);
+	gtk_entry_set_text ((GtkEntry *) account_name_tbox,account_mailid);
 }
 
 static void
@@ -503,9 +506,9 @@ proxy_login_update_tree (void)
 	gtk_tree_store_clear (priv->store);
 	if (proxy_list != NULL) {
 		n = g_list_length (proxy_list);
-		for (i=0;i<n;i=i+2) {
+		for (i = 0; i < n; i = i + 2) {
 			proxy_name = g_list_nth_data (proxy_list,i);
-			proxy_email = g_list_nth_data (proxy_list,i+1);
+			proxy_email = g_list_nth_data (proxy_list,i + 1);
 			gtk_tree_store_append (priv->store, &iter, NULL);
 			gtk_tree_store_set (priv->store, &iter, 0, broken_image, 1, g_strconcat(proxy_name, "\n", proxy_email, NULL), -1);
 		}
@@ -521,7 +524,8 @@ proxy_login_update_tree (void)
 }
 
 void
-gw_proxy_login_cb (GtkAction *action, EShellView *shell_view)
+gw_proxy_login_cb (GtkAction *action,
+                   EShellView *shell_view)
 {
 	EShellSidebar *shell_sidebar;
 	EMFolderTree *folder_tree = NULL;
diff --git a/src/plugins/proxy-login.h b/src/plugins/proxy-login.h
index 496e0cb..dfdc29b 100644
--- a/src/plugins/proxy-login.h
+++ b/src/plugins/proxy-login.h
@@ -54,7 +54,7 @@ GType proxy_login_get_type (void);
 proxyLogin * proxy_login_new (void);
 static void proxy_login_add_new_store (CamelStore *store, EAccount *account);
 static void proxy_login_setup_tree_view (void);
-proxyLogin* proxy_dialog_new (void);
+proxyLogin * proxy_dialog_new (void);
 static void proxy_soap_login (gchar *email, GtkWindow *error_parent);
 gchar *parse_email_for_name (gchar *email);
 static void proxy_login_update_tree (void);
diff --git a/src/plugins/proxy.c b/src/plugins/proxy.c
index 81286c8..33c3f06 100644
--- a/src/plugins/proxy.c
+++ b/src/plugins/proxy.c
@@ -301,10 +301,12 @@ proxy_get_permissions_from_dialog (EAccount *account)
 }
 
 static gint
-proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog, GtkWindow *parent)
+proxy_dialog_store_widgets_data (EAccount *account,
+                                 gint32 dialog,
+                                 GtkWindow *parent)
 {
 	GtkTreeIter iter;
-	GtkTreeSelection* account_select;
+	GtkTreeSelection * account_select;
 	GtkTreeModel *model;
 	proxyHandler *new_proxy = NULL;
 	proxyDialogPrivate *priv;
@@ -359,7 +361,7 @@ proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog, GtkWindow *pa
 					/*check whether already exists*/
 					existing_list = priv->proxy_list;
 
-					for (;existing_list; existing_list = g_list_next (existing_list)) {
+					for (; existing_list; existing_list = g_list_next (existing_list)) {
 						new_proxy = (proxyHandler *) existing_list->data;
 						if (!g_ascii_strcasecmp (new_proxy->proxy_email, email)) {
 							if (new_proxy->flags & E_GW_PROXY_DELETED) {
@@ -461,7 +463,8 @@ proxy_dialog_initialize_widgets (EAccount *account)
 }
 
 static EGwConnection *
-proxy_get_cnc (EAccount *account, GtkWindow *parent_window)
+proxy_get_cnc (EAccount *account,
+               GtkWindow *parent_window)
 {
 	CamelSettings *settings;
 	EGwConnection *cnc;
@@ -510,7 +513,7 @@ proxy_get_cnc (EAccount *account, GtkWindow *parent_window)
 	password = e_passwords_get_password (NULL, key);
 	if (!password)
 		password = e_passwords_ask_password (prompt, NULL, key, prompt,
-				E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET, &remember, parent_window);
+				E_PASSWORDS_REMEMBER_FOREVER | E_PASSWORDS_SECRET, &remember, parent_window);
 	g_free (prompt);
 
 	cnc = e_gw_connection_new (uri, url->user, password);
@@ -521,7 +524,8 @@ proxy_get_cnc (EAccount *account, GtkWindow *parent_window)
 }
 
 void
-proxy_abort (GtkWidget *button, EConfigHookItemFactoryData *data)
+proxy_abort (GtkWidget *button,
+             EConfigHookItemFactoryData *data)
 {
 	EMConfigTargetAccount *target_account;
 	EAccount *account;
@@ -539,7 +543,8 @@ proxy_abort (GtkWidget *button, EConfigHookItemFactoryData *data)
 }
 
 void
-proxy_commit (GtkWidget *button, EConfigHookItemFactoryData *data)
+proxy_commit (GtkWidget *button,
+              EConfigHookItemFactoryData *data)
 {
 	EAccount *account;
 	EMConfigTargetAccount *target_account;
@@ -558,13 +563,13 @@ proxy_commit (GtkWidget *button, EConfigHookItemFactoryData *data)
 
 	priv = prd->priv;
 	list_iter = priv->proxy_list;
-	for (;list_iter; list_iter = g_list_next (list_iter)) {
+	for (; list_iter; list_iter = g_list_next (list_iter)) {
 		aclInstance = (proxyHandler *) list_iter->data;
 
 		/* Handle case where the structure is new and deleted*/
 		if ( !((aclInstance->flags & E_GW_PROXY_NEW) && (aclInstance->flags & E_GW_PROXY_DELETED))) {
 
-			if ( !E_IS_GW_CONNECTION (prd->cnc))	/* Add check in case the connection request fails*/
+			if ( !E_IS_GW_CONNECTION (prd->cnc))	/* Add check in case the connection request fails */
 				prd->cnc = proxy_get_cnc (account, GTK_WINDOW (gtk_widget_get_toplevel (button)));
 
 			if (aclInstance->flags & E_GW_PROXY_NEW )
@@ -626,7 +631,7 @@ proxy_update_tree_view (EAccount *account)
 	gtk_tree_store_clear (priv->store);
 	list_iter = priv->proxy_list;
 
-	for (;list_iter; list_iter = g_list_next (list_iter)) {
+	for (; list_iter; list_iter = g_list_next (list_iter)) {
 		aclInstance = (proxyHandler *) list_iter->data;
 
 		if (!(aclInstance->flags & E_GW_PROXY_DELETED )) {
@@ -643,8 +648,9 @@ proxy_update_tree_view (EAccount *account)
 	gtk_tree_view_set_model (GTK_TREE_VIEW (priv->tree), GTK_TREE_MODEL (priv->store));
 }
 
-GtkWidget*
-org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data)
+GtkWidget *
+org_gnome_proxy (EPlugin *epl,
+                 EConfigHookItemFactoryData *data)
 {
 	EMConfigTargetAccount *target_account;
 	EShell *shell;
@@ -735,7 +741,10 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data)
 }
 
 static gboolean
-proxy_page_changed_cb (GtkNotebook *notebook, GtkWidget *page, gint num, EAccount *account)
+proxy_page_changed_cb (GtkNotebook *notebook,
+                       GtkWidget *page,
+                       gint num,
+                       EAccount *account)
 {
 	proxyDialog *prd;
 	proxyDialogPrivate *priv;
@@ -768,7 +777,7 @@ proxy_page_changed_cb (GtkNotebook *notebook, GtkWidget *page, gint num, EAccoun
 
 			list_iter = priv->proxy_list;
 
-			for (;list_iter; list_iter = g_list_next (list_iter)) {
+			for (; list_iter; list_iter = g_list_next (list_iter)) {
 				aclInstance = (proxyHandler *) list_iter->data;
 
 				/* NOTE: All User Access is not supported */
@@ -787,7 +796,8 @@ proxy_page_changed_cb (GtkNotebook *notebook, GtkWidget *page, gint num, EAccoun
 }
 
 static void
-proxy_cancel (GtkWidget *button, EAccount *account)
+proxy_cancel (GtkWidget *button,
+              EAccount *account)
 {
 	proxyDialog *prd = NULL;
 	proxyDialogPrivate *priv;
@@ -799,7 +809,8 @@ proxy_cancel (GtkWidget *button, EAccount *account)
 }
 
 static void
-proxy_add_ok (GtkWidget *button, EAccount *account)
+proxy_add_ok (GtkWidget *button,
+              EAccount *account)
 {
 	proxyDialog *prd = NULL;
 	proxyDialogPrivate *priv;
@@ -816,7 +827,8 @@ proxy_add_ok (GtkWidget *button, EAccount *account)
 }
 
 static void
-proxy_edit_ok (GtkWidget *button, EAccount *account)
+proxy_edit_ok (GtkWidget *button,
+               EAccount *account)
 {
 	proxyDialog *prd = NULL;
 	proxyDialogPrivate *priv;
@@ -833,7 +845,8 @@ proxy_edit_ok (GtkWidget *button, EAccount *account)
 }
 
 static proxyHandler *
-proxy_get_item_from_list (EAccount *account, gchar *account_name)
+proxy_get_item_from_list (EAccount *account,
+                          gchar *account_name)
 {
 	proxyDialogPrivate *priv;
 	proxyDialog *prd = NULL;
@@ -844,7 +857,7 @@ proxy_get_item_from_list (EAccount *account, gchar *account_name)
 	priv = prd->priv;
 	list_iter = priv->proxy_list;
 
-	for (;list_iter; list_iter = g_list_next (list_iter)) {
+	for (; list_iter; list_iter = g_list_next (list_iter)) {
 		iter = (proxyHandler *) list_iter->data;
 
 		if ( g_str_equal (iter->proxy_email,account_name))
@@ -855,13 +868,14 @@ proxy_get_item_from_list (EAccount *account, gchar *account_name)
 }
 
 static void
-proxy_remove_account (GtkWidget *button, EAccount *account)
+proxy_remove_account (GtkWidget *button,
+                      EAccount *account)
 {
 	GtkTreeIter iter;
 	GtkTreeModel *model;
 	proxyDialogPrivate *priv;
 	proxyHandler *deleted;
-	GtkTreeSelection* account_select;
+	GtkTreeSelection * account_select;
 	gchar *account_mailid;
 	proxyDialog *prd = NULL;
 
@@ -882,18 +896,22 @@ proxy_remove_account (GtkWidget *button, EAccount *account)
 }
 
 static void
-addressbook_dialog_response (ENameSelectorDialog *name_selector_dialog, gint response, gpointer user_data)
+addressbook_dialog_response (ENameSelectorDialog *name_selector_dialog,
+                             gint response,
+                             gpointer user_data)
 {
 	gtk_widget_hide (GTK_WIDGET (name_selector_dialog));
 }
 
 static void
-addressbook_entry_changed (GtkWidget *entry, gpointer user_data)
+addressbook_entry_changed (GtkWidget *entry,
+                           gpointer user_data)
 {
 }
 
 static void
-address_button_clicked (GtkButton *button, EAccount *account)
+address_button_clicked (GtkButton *button,
+                        EAccount *account)
 {
 	proxyDialog *prd;
 	proxyDialogPrivate *priv;
@@ -904,7 +922,8 @@ address_button_clicked (GtkButton *button, EAccount *account)
 }
 
 static void
-proxy_add_account (GtkWidget *button, EAccount *account)
+proxy_add_account (GtkWidget *button,
+                   EAccount *account)
 {
 	GtkButton *contacts, *cancel;
 	proxyDialogPrivate *priv;
@@ -952,7 +971,8 @@ proxy_add_account (GtkWidget *button, EAccount *account)
 }
 
 static void
-proxy_load_edit_dialog (EAccount *account, proxyHandler *edited)
+proxy_load_edit_dialog (EAccount *account,
+                        proxyHandler *edited)
 {
 	proxyDialogPrivate *priv;
 	proxyDialog *prd = NULL;
@@ -1000,12 +1020,13 @@ proxy_load_edit_dialog (EAccount *account, proxyHandler *edited)
 }
 
 static void
-proxy_edit_account (GtkWidget *button, EAccount *account)
+proxy_edit_account (GtkWidget *button,
+                    EAccount *account)
 {
 	GtkTreeIter iter;
 	GtkTreeModel *model;
 	proxyDialogPrivate *priv;
-	GtkTreeSelection* account_select;
+	GtkTreeSelection * account_select;
 	proxyHandler *edited;
 	GtkButton *okButton, *proxyCancel;
 	gchar *account_mailid;
diff --git a/src/plugins/send-options.c b/src/plugins/send-options.c
index c66243d..fdb263f 100644
--- a/src/plugins/send-options.c
+++ b/src/plugins/send-options.c
@@ -45,7 +45,7 @@ EGwSendOptions *opts = NULL;
 gboolean changed = FALSE;
 EAccount *account;
 
-GtkWidget* org_gnome_send_options (EPlugin *epl, EConfigHookItemFactoryData *data);
+GtkWidget * org_gnome_send_options (EPlugin *epl, EConfigHookItemFactoryData *data);
 void send_options_commit (EPlugin *epl, EConfigHookItemFactoryData *data);
 void send_options_changed (EPlugin *epl, EConfigHookItemFactoryData *data);
 void send_options_abort (EPlugin *epl, EConfigHookItemFactoryData *data);
@@ -100,7 +100,7 @@ get_cnc (GtkWindow *parent_window)
 	password = e_passwords_get_password (NULL, key);
 	if (!password)
 		password = e_passwords_ask_password (prompt, NULL, key, prompt,
-				E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET, &remember, parent_window);
+				E_PASSWORDS_REMEMBER_FOREVER | E_PASSWORDS_SECRET, &remember, parent_window);
 	g_free (prompt);
 
 	cnc = e_gw_connection_new (uri, url->user, password);
@@ -152,7 +152,8 @@ e_send_options_load_status_options (ESendOptionsStatusTracking *sopts,
 }
 
 static void
-e_send_options_load_default_data (EGwSendOptions *opts, ESendOptionsDialog *sod)
+e_send_options_load_default_data (EGwSendOptions *opts,
+                                  ESendOptionsDialog *sod)
 {
 	EGwSendOptionsGeneral *ggopts;
 	EGwSendOptionsStatusTracking *gmopts;
@@ -171,7 +172,8 @@ e_send_options_load_default_data (EGwSendOptions *opts, ESendOptionsDialog *sod)
 }
 
 static void
-e_send_options_clicked_cb (GtkWidget *button, gpointer data)
+e_send_options_clicked_cb (GtkWidget *button,
+                           gpointer data)
 {
 	EGwConnectionStatus status;
 	account = (EAccount *) data;
@@ -203,7 +205,8 @@ e_send_options_clicked_cb (GtkWidget *button, gpointer data)
 }
 
 GtkWidget *
-org_gnome_send_options (EPlugin *epl, EConfigHookItemFactoryData *data)
+org_gnome_send_options (EPlugin *epl,
+                        EConfigHookItemFactoryData *data)
 {
 	EMConfigTargetAccount *target_account;
 	GtkWidget *frame, *button, *label, *vbox;
@@ -538,7 +541,8 @@ add_send_options_to_source (EGwSendOptions *n_opts)
 }
 
 void
-send_options_commit (EPlugin *epl, EConfigHookItemFactoryData *data)
+send_options_commit (EPlugin *epl,
+                     EConfigHookItemFactoryData *data)
 {
 	EGwSendOptions *n_opts;
 	EGwConnectionStatus status = E_GW_CONNECTION_STATUS_OK;
@@ -564,12 +568,14 @@ send_options_commit (EPlugin *epl, EConfigHookItemFactoryData *data)
 }
 
 void
-send_options_changed (EPlugin *epl, EConfigHookItemFactoryData *data)
+send_options_changed (EPlugin *epl,
+                      EConfigHookItemFactoryData *data)
 {
 }
 
 void
-send_options_abort (EPlugin *epl, EConfigHookItemFactoryData *data)
+send_options_abort (EPlugin *epl,
+                    EConfigHookItemFactoryData *data)
 {
 	send_options_finalize ();
 }
diff --git a/src/plugins/share-folder-common.c b/src/plugins/share-folder-common.c
index 0038d7f..9344922 100644
--- a/src/plugins/share-folder-common.c
+++ b/src/plugins/share-folder-common.c
@@ -66,7 +66,8 @@ void shared_folder_abort (EPlugin *ep, EConfigTarget *target);
 static void refresh_folder_tree (EMFolderTreeModel *model, CamelStore *store);
 
 static void
-refresh_folder_tree (EMFolderTreeModel *model, CamelStore *store)
+refresh_folder_tree (EMFolderTreeModel *model,
+                     CamelStore *store)
 {
 	EAccount *account;
 	const gchar *uid;
@@ -83,7 +84,8 @@ refresh_folder_tree (EMFolderTreeModel *model, CamelStore *store)
 }
 
 void
-shared_folder_commit (EPlugin *ep, EConfigTarget *tget)
+shared_folder_commit (EPlugin *ep,
+                      EConfigTarget *tget)
 {
 	EMConfigTargetFolder *target =  (EMConfigTargetFolder *) tget->config->target;
 	CamelStore *parent_store;
@@ -100,7 +102,8 @@ shared_folder_commit (EPlugin *ep, EConfigTarget *tget)
 }
 
 void
-shared_folder_abort (EPlugin *ep, EConfigTarget *target)
+shared_folder_abort (EPlugin *ep,
+                     EConfigTarget *target)
 {
 	if (common) {
 		g_object_run_dispose ((GObject *) common);
@@ -187,7 +190,8 @@ static MailMsgInfo create_folder_info = {
 };
 
 static void
-new_folder_created_cb (struct _EMCreateFolder *m, gpointer user_data)
+new_folder_created_cb (struct _EMCreateFolder *m,
+                       gpointer user_data)
 {
 	struct ShareInfo *ssi = (struct ShareInfo *) user_data;
 	EMFolderSelector *emfs = ssi->emfs;
@@ -201,7 +205,11 @@ new_folder_created_cb (struct _EMCreateFolder *m, gpointer user_data)
 }
 
 static gint
-create_folder (CamelStore *store, const gchar *full_name, void (* done) (struct _EMCreateFolder *m, gpointer user_data), gpointer user_data)
+create_folder (CamelStore *store,
+               const gchar *full_name,
+               void (* done) (struct _EMCreateFolder *m,
+               gpointer user_data),
+               gpointer user_data)
 {
 	gchar *name, *namebuf = NULL;
 	struct _EMCreateFolder *m;
@@ -233,7 +241,9 @@ create_folder (CamelStore *store, const gchar *full_name, void (* done) (struct
 }
 
 static void
-users_dialog_response (GtkWidget *dialog, gint response, struct ShareInfo *ssi)
+users_dialog_response (GtkWidget *dialog,
+                       gint response,
+                       struct ShareInfo *ssi)
 {
 	struct _EMFolderTreeModelStoreInfo *si;
 	EMFolderSelector *emfs = ssi->emfs;
@@ -279,7 +289,9 @@ users_dialog_response (GtkWidget *dialog, gint response, struct ShareInfo *ssi)
 }
 
 static void
-new_folder_response (EMFolderSelector *emfs, gint response, EMFolderTreeModel *model)
+new_folder_response (EMFolderSelector *emfs,
+                     gint response,
+                     EMFolderTreeModel *model)
 {
 	GtkWidget *users_dialog;
 	GtkWidget *content_area;
@@ -321,14 +333,15 @@ new_folder_response (EMFolderSelector *emfs, gint response, EMFolderTreeModel *m
 	ssi->model = model;
 	ssi->emfs = emfs;
 	gtk_widget_reparent (GTK_WIDGET ((ssi->sf)->table), content_area);
-	gtk_widget_hide ((GtkWidget*) emfs);
+	gtk_widget_hide ((GtkWidget *) emfs);
 	gtk_window_resize (GTK_WINDOW (users_dialog), 350, 300);
 	gtk_widget_show (users_dialog);
 	g_signal_connect (users_dialog, "response", G_CALLBACK (users_dialog_response), ssi);
 }
 
 void
-gw_new_shared_folder_cb (GtkAction *action, EShellView *shell_view)
+gw_new_shared_folder_cb (GtkAction *action,
+                         EShellView *shell_view)
 {
 	EMFolderSelector *selector;
 	EMFolderTree *folder_tree;
@@ -356,7 +369,8 @@ gw_new_shared_folder_cb (GtkAction *action, EShellView *shell_view)
 }
 
 GtkWidget *
-org_gnome_shared_folder_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data)
+org_gnome_shared_folder_factory (EPlugin *ep,
+                                 EConfigHookItemFactoryData *hook_data)
 {
 	gchar *id = NULL;
 	const gchar *folder_name;
@@ -449,7 +463,8 @@ get_cnc (CamelStore *store)
 }
 
 gchar *
-get_container_id (EGwConnection *cnc, const gchar *fname)
+get_container_id (EGwConnection *cnc,
+                  const gchar *fname)
 {
 	GList *container_list = NULL;
 	gchar *id = NULL;
diff --git a/src/plugins/share-folder.c b/src/plugins/share-folder.c
index cd0a22b..6d8d7df 100644
--- a/src/plugins/share-folder.c
+++ b/src/plugins/share-folder.c
@@ -150,7 +150,8 @@ free_node (SharedUser *usr)
 }
 
 static SharedUser *
-find_node (GList *list, gchar *email)
+find_node (GList *list,
+           gchar *email)
 {
 	SharedUser *user = NULL;
 	EShUsers *usr = NULL;
@@ -159,12 +160,12 @@ find_node (GList *list, gchar *email)
 
 	if (list) {
 		tmp = g_list_first (list);
-		for (i=0; tmp; i++)
+		for (i = 0; tmp; i++)
 		{
 			user = tmp->data;
 			usr = user->user_node;
 			if (!g_ascii_strcasecmp (usr->email, email)) {
-				return user; /*if found, it returns that user*/
+				return user; /*if found, it returns that user */
 			}
 			tmp= g_list_next (tmp);
 		}
@@ -299,7 +300,8 @@ get_container_list (ShareFolder *sf)
 }
 
 static void
-shared_clicked (GtkRadioButton *button, ShareFolder *sf)
+shared_clicked (GtkRadioButton *button,
+                ShareFolder *sf)
 {
 
 	gtk_widget_set_sensitive (GTK_WIDGET (sf->table) ,TRUE);
@@ -307,7 +309,8 @@ shared_clicked (GtkRadioButton *button, ShareFolder *sf)
 }
 
 static void
-not_shared_clicked (GtkRadioButton *button, ShareFolder *sf)
+not_shared_clicked (GtkRadioButton *button,
+                    ShareFolder *sf)
 {
 	if (!sf->is_shared) {
 		sf->flag_for_ok = 0;
@@ -319,7 +322,8 @@ not_shared_clicked (GtkRadioButton *button, ShareFolder *sf)
 }
 
 static void
-add_clicked (GtkButton *button, ShareFolder *sf)
+add_clicked (GtkButton *button,
+             ShareFolder *sf)
 {
 	const gchar *email = NULL;
 	const gchar *self_email = NULL;
@@ -380,7 +384,8 @@ add_clicked (GtkButton *button, ShareFolder *sf)
 }
 
 static void
-remove_clicked (GtkButton *button, ShareFolder *sf)
+remove_clicked (GtkButton *button,
+                ShareFolder *sf)
 {
 
 	SharedUser *usr = NULL;
@@ -424,7 +429,7 @@ share_folder (ShareFolder *sf)
 	}
 
 	if (E_IS_GW_CONNECTION (sf->cnc)) {
-		if (sf->flag_for_ok == 2){  /* you have to remove all the users*/
+		if (sf->flag_for_ok == 2){  /* you have to remove all the users */
 		GList *list = NULL;
 
 			if (new_list) {
@@ -476,7 +481,8 @@ share_folder (ShareFolder *sf)
 }
 
 static void
-not_ok_clicked (GtkButton *button, ShareFolder *sf)
+not_ok_clicked (GtkButton *button,
+                ShareFolder *sf)
 {
 
 	gchar *subj = NULL;
@@ -500,13 +506,15 @@ not_ok_clicked (GtkButton *button, ShareFolder *sf)
 }
 
 static void
-not_cancel_clicked (GtkButton *button, GtkWidget *window)
+not_cancel_clicked (GtkButton *button,
+                    GtkWidget *window)
 {
 	gtk_widget_destroy (window);
 }
 
 static void
-notification_clicked (GtkButton *button, ShareFolder *sf)
+notification_clicked (GtkButton *button,
+                      ShareFolder *sf)
 {
 	static  GtkBuilder *builder;
 	GtkButton *not_ok;
@@ -538,19 +546,22 @@ notification_clicked (GtkButton *button, ShareFolder *sf)
 }
 
 static void
-addressbook_entry_changed (GtkWidget *entry, gpointer   user_data)
+addressbook_entry_changed (GtkWidget *entry,
+                           gpointer user_data)
 {
 
 }
 
 static void
-address_button_clicked_cb (GtkButton *button, ShareFolder *sf)
+address_button_clicked_cb (GtkButton *button,
+                           ShareFolder *sf)
 {
 	e_name_selector_show_dialog (sf->name_selector, sf->window);
 }
 
 static void
-user_selected (GtkTreeSelection *selection, ShareFolder *sf)
+user_selected (GtkTreeSelection *selection,
+               ShareFolder *sf)
 {
 	GtkTreeModel *model;
 
@@ -560,7 +571,9 @@ user_selected (GtkTreeSelection *selection, ShareFolder *sf)
 }
 
 static void
-add_right_clicked (GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf )
+add_right_clicked (GtkCellRenderer *renderer,
+                   gchar *arg1,
+                   ShareFolder *sf)
 {
 	gboolean right = FALSE;
 	SharedUser *usr = NULL;
@@ -579,7 +592,7 @@ add_right_clicked (GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf )
 		gtk_tree_path_free (path);
 		return;
 	}
-	if (!usr->flag)  /* if user was already existing one change the flag to update*/
+	if (!usr->flag)  /* if user was already existing one change the flag to update */
 		usr->flag = usr->flag | 0x2;
 	user = usr->user_node;
 	if (!right) {
@@ -593,7 +606,9 @@ add_right_clicked (GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf )
 }
 
 static void
-edit_right_clicked (GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf )
+edit_right_clicked (GtkCellRenderer *renderer,
+                    gchar *arg1,
+                    ShareFolder *sf)
 {
 	gboolean right = FALSE;
 	SharedUser *usr = NULL;
@@ -612,7 +627,7 @@ edit_right_clicked (GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf )
 		gtk_tree_path_free (path);
 		return;
 	}
-	if (!usr->flag)  /* if user was already existing one change the flag to update*/
+	if (!usr->flag)  /* if user was already existing one change the flag to update */
 		usr->flag = usr->flag | 0x2;
 	user = usr->user_node;
 
@@ -627,7 +642,9 @@ edit_right_clicked (GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf )
 }
 
 static void
-delete_right_clicked (GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf )
+delete_right_clicked (GtkCellRenderer *renderer,
+                      gchar *arg1,
+                      ShareFolder *sf)
 {
 	gboolean right = FALSE;
 	SharedUser *usr = NULL;
@@ -646,7 +663,7 @@ delete_right_clicked (GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf )
 		gtk_tree_path_free (path);
 		return;
 	}
-	if (!usr->flag)  /* if user was already existing one change the flag to update*/
+	if (!usr->flag)  /* if user was already existing one change the flag to update */
 		usr->flag = usr->flag | 0x2;
 	user = usr->user_node;
 	if (!right) {
@@ -751,7 +768,8 @@ share_folder_construct (ShareFolder *sf)
 }
 
 ShareFolder *
-share_folder_new (EGwConnection *ccnc, gchar *id)
+share_folder_new (EGwConnection *ccnc,
+                  gchar *id)
 {
 	ShareFolder *new;
 	new = (ShareFolder *) g_object_new (share_folder_get_type (), NULL);
diff --git a/src/plugins/status-track.c b/src/plugins/status-track.c
index 26bcb90..702c551 100644
--- a/src/plugins/status-track.c
+++ b/src/plugins/status-track.c
@@ -42,7 +42,7 @@
 #include "share-folder.h"
 
 static gchar *
-format_date (const gchar * value)
+format_date (const gchar *value)
 {
 	time_t time;
 	gchar *str;
@@ -50,7 +50,7 @@ format_date (const gchar * value)
 	time = e_gw_connection_get_date_from_string (value);
 	str = ctime (&time);
 
-	str[strlen (str)-1] = '\0';
+	str[strlen (str) - 1] = '\0';
 	return str;
 }
 
@@ -164,7 +164,7 @@ gw_track_message_status_cb (GtkAction *action,
 	/* creation date */
 	time = camel_mime_message_get_date (msg, NULL);
 	time_str = ctime (&time);
-	time_str[strlen (time_str)-1] = '\0' ;
+	time_str[strlen (time_str) - 1] = '\0' ;
 	boldmsg = g_strdup_printf ("<b>%s</b>", _("Creation date:"));
 	widget = gtk_label_new (boldmsg);
 	g_free (boldmsg);
@@ -194,7 +194,7 @@ gw_track_message_status_cb (GtkAction *action,
 			cnc, get_container_id (cnc, "Sent Items"),
 			selected_uid, "distribution recipientStatus", &gwitem);
 		recipient_list = e_gw_item_get_recipient_list (gwitem);
-		for (;recipient_list != NULL;  recipient_list = recipient_list->next)
+		for (; recipient_list != NULL;  recipient_list = recipient_list->next)
 		{
 			EGwItemRecipient *recipient;
 			GString *label = NULL;
diff --git a/src/server/create-account.c b/src/server/create-account.c
index b308c87..a462524 100644
--- a/src/server/create-account.c
+++ b/src/server/create-account.c
@@ -9,7 +9,9 @@ static GMainLoop *main_loop;
 static gchar *arg_hostname, *arg_username, *arg_password;
 
 static void
-add_account (const gchar *conf_key, const gchar *hostname, const gchar *username)
+add_account (const gchar *conf_key,
+             const gchar *hostname,
+             const gchar *username)
 {
 	ESourceList *source_list;
 	ESourceGroup *group;
@@ -49,7 +51,8 @@ idle_cb (gpointer data)
 }
 
 gint
-main (gint argc, gchar *argv[])
+main (gint argc,
+      gchar *argv[])
 {
 	g_type_init ();
 	if (argc != 3 && argc != 4) {
diff --git a/src/server/e-gw-connection.c b/src/server/e-gw-connection.c
index 9c4cfc8..ed8efc8 100644
--- a/src/server/e-gw-connection.c
+++ b/src/server/e-gw-connection.c
@@ -68,8 +68,9 @@ struct _EGwConnectionPrivate {
 };
 
 static void
-update_soup_session_proxy_settings (EProxy *proxy, SoupSession* session,
-				    const gchar * uri)
+update_soup_session_proxy_settings (EProxy *proxy,
+                                    SoupSession *session,
+                                    const gchar *uri)
 {
 	SoupURI *proxy_uri = NULL;
 
@@ -84,9 +85,10 @@ update_soup_session_proxy_settings (EProxy *proxy, SoupSession* session,
 }
 
 static void
-proxy_settings_changed (EProxy *proxy, gpointer user_data)
+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;
 
@@ -164,7 +166,9 @@ reauthenticate (EGwConnection *cnc)
 }
 
 static gboolean
-e_gw_connection_response_parse_status_and_description (SoupSoapResponse *response, gint *status, gchar **description)
+e_gw_connection_response_parse_status_and_description (SoupSoapResponse *response,
+                                                       gint *status,
+                                                       gchar **description)
 {
 	SoupSoapParameter *param, *subparam;
 
@@ -210,7 +214,7 @@ e_gw_connection_parse_response_status (SoupSoapResponse *response)
 	case 53530: return E_GW_CONNECTION_STATUS_OTHER;
 	/* FIXME: 58652 should be changed with an enum.*/
 	case 58652: return E_GW_CONNECTION_STATUS_OVER_QUOTA;
-	case 59922: return 59922; /*Very big attachment, get in chunks*/
+	case 59922: return 59922; /*Very big attachment, get in chunks */
 		/* FIXME: map all error codes */
 	}
 
@@ -434,7 +438,7 @@ e_gw_connection_init (EGwConnection *cnc)
 	cnc->priv = priv;
 
 	/* Set a default timeout value of 30 seconds.
-	   FIXME: Make timeout configurable
+	 * FIXME: Make timeout configurable
 	*/
 	if (g_getenv ("SOUP_SESSION_TIMEOUT"))
 		timeout = atoi (g_getenv ("SOUP_SESSION_TIMEOUT"));
@@ -455,10 +459,10 @@ e_gw_connection_init (EGwConnection *cnc)
 
 	/* README: We do not use libsoup logger and use our own as we need formatted output etc. */
 	/*
-	   if (g_getenv ("GROUPWISE_DEBUG")) {
+	 * if (g_getenv ("GROUPWISE_DEBUG")) {
 		if (atoi (g_getenv ("GROUPWISE_DEBUG")) == 1) {
 			SoupLogger *logger;
-
+ *
 			logger = soup_logger_new (SOUP_LOGGER_LOG_BODY, -1);
 			soup_logger_attach (logger, priv->soup_session);
 			g_object_unref (logger);
@@ -467,8 +471,10 @@ e_gw_connection_init (EGwConnection *cnc)
 	*/
 }
 
-static SoupSoapMessage*
-form_login_request (const gchar *uri, const gchar * username, const gchar * password)
+static SoupSoapMessage *
+form_login_request (const gchar *uri,
+                    const gchar *username,
+                    const gchar *password)
 {
 	SoupSoapMessage *msg;
 	/* build the SOAP message */
@@ -487,7 +493,10 @@ form_login_request (const gchar *uri, const gchar * username, const gchar * pass
 }
 
 EGwConnection *
-e_gw_connection_new_with_error_handler (const gchar *uri, const gchar *username, const gchar *password, EGwConnectionErrors *errors)
+e_gw_connection_new_with_error_handler (const gchar *uri,
+                                        const gchar *username,
+                                        const gchar *password,
+                                        EGwConnectionErrors *errors)
 {
 	EGwConnection *cnc;
 	SoupSoapMessage *msg;
@@ -523,7 +532,7 @@ e_gw_connection_new_with_error_handler (const gchar *uri, const gchar *username,
 	cnc = g_object_new (E_TYPE_GW_CONNECTION, NULL);
 
 	/* Set proxy details for the Soup session before any
-	   communication. */
+	 * communication. */
 	update_soup_session_proxy_settings (cnc->priv->proxy,
 					    cnc->priv->soup_session,
 					    uri);
@@ -645,7 +654,9 @@ e_gw_connection_new_with_error_handler (const gchar *uri, const gchar *username,
 }
 
 EGwConnection *
-e_gw_connection_new (const gchar *uri, const gchar *username, const gchar *password)
+e_gw_connection_new (const gchar *uri,
+                     const gchar *username,
+                     const gchar *password)
 {
 	/* This is where I miss function-overloading and default-parameters */
 
@@ -653,7 +664,8 @@ e_gw_connection_new (const gchar *uri, const gchar *username, const gchar *passw
 }
 
 SoupSoapResponse *
-e_gw_connection_send_message (EGwConnection *cnc, SoupSoapMessage *msg)
+e_gw_connection_send_message (EGwConnection *cnc,
+                              SoupSoapMessage *msg)
 {
 	SoupSoapResponse *response;
 	guint status;
@@ -703,7 +715,9 @@ e_gw_connection_logout (EGwConnection *cnc)
 }
 
 EGwConnectionStatus
-e_gw_connection_get_container_list (EGwConnection *cnc, const gchar *top, GList **container_list)
+e_gw_connection_get_container_list (EGwConnection *cnc,
+                                    const gchar *top,
+                                    GList **container_list)
 {
 	SoupSoapMessage *msg;
 	SoupSoapResponse *response;
@@ -773,7 +787,8 @@ e_gw_connection_free_container_list (GList *container_list)
 }
 
 gchar *
-e_gw_connection_get_container_id (EGwConnection *cnc, const gchar *name)
+e_gw_connection_get_container_id (EGwConnection *cnc,
+                                  const gchar *name)
 {
 	EGwConnectionStatus status;
 	GList *container_list = NULL, *l;
@@ -806,7 +821,8 @@ e_gw_connection_get_container_id (EGwConnection *cnc, const gchar *name)
 }
 
 EGwContainer *
-e_gw_connection_get_container (EGwConnection *cnc, const gchar * uid)
+e_gw_connection_get_container (EGwConnection *cnc,
+                               const gchar *uid)
 {
 		SoupSoapMessage *msg;
 		SoupSoapResponse *response;
@@ -852,8 +868,11 @@ e_gw_connection_get_container (EGwConnection *cnc, const gchar * uid)
 }
 
 EGwConnectionStatus
-e_gw_connection_get_items_delta_info (EGwConnection *cnc, const gchar *container, gdouble *first_sequence,
-					gdouble *last_sequence, gdouble *last_po_rebuild_time )
+e_gw_connection_get_items_delta_info (EGwConnection *cnc,
+                                      const gchar *container,
+                                      gdouble *first_sequence,
+                                      gdouble *last_sequence,
+                                      gdouble *last_po_rebuild_time)
 {
 	SoupSoapMessage *msg;
 	SoupSoapResponse *response;
@@ -934,7 +953,13 @@ e_gw_connection_get_items_delta_info (EGwConnection *cnc, const gchar *container
 }
 
 EGwConnectionStatus
-e_gw_connection_get_items_delta (EGwConnection *cnc, const gchar *container, const gchar *view, const gchar *count, const gchar * start_sequence, GList **add_list, GList **delete_list)
+e_gw_connection_get_items_delta (EGwConnection *cnc,
+                                 const gchar *container,
+                                 const gchar *view,
+                                 const gchar *count,
+                                 const gchar *start_sequence,
+                                 GList **add_list,
+                                 GList **delete_list)
 {
 	SoupSoapMessage *msg;
 	SoupSoapResponse *response;
@@ -1016,7 +1041,11 @@ e_gw_connection_get_items_delta (EGwConnection *cnc, const gchar *container, con
 }
 
 EGwConnectionStatus
-e_gw_connection_get_items (EGwConnection *cnc, const gchar *container, const gchar *view, EGwFilter *filter, GList **list)
+e_gw_connection_get_items (EGwConnection *cnc,
+                           const gchar *container,
+                           const gchar *view,
+                           EGwFilter *filter,
+                           GList **list)
 {
 	SoupSoapMessage *msg;
 	SoupSoapResponse *response;
@@ -1083,7 +1112,11 @@ e_gw_connection_get_items (EGwConnection *cnc, const gchar *container, const gch
 }
 
 EGwConnectionStatus
-e_gw_connection_get_items_from_ids (EGwConnection *cnc, const gchar *container, const gchar *view, GPtrArray *item_ids, GList **list)
+e_gw_connection_get_items_from_ids (EGwConnection *cnc,
+                                    const gchar *container,
+                                    const gchar *view,
+                                    GPtrArray *item_ids,
+                                    GList **list)
 {
 	SoupSoapMessage *msg;
 	SoupSoapResponse *response;
@@ -1154,7 +1187,10 @@ e_gw_connection_get_items_from_ids (EGwConnection *cnc, const gchar *container,
 }
 
 EGwConnectionStatus
-e_gw_connection_get_deltas ( EGwConnection *cnc, GSList **adds, GSList **deletes, GSList **updates)
+e_gw_connection_get_deltas (EGwConnection *cnc,
+                            GSList **adds,
+                            GSList **deletes,
+                            GSList **updates)
 {
 	SoupSoapMessage *msg;
 	SoupSoapResponse *response;
@@ -1291,7 +1327,9 @@ e_gw_connection_get_deltas ( EGwConnection *cnc, GSList **adds, GSList **deletes
 }
 
 EGwConnectionStatus
-e_gw_connection_send_item (EGwConnection *cnc, EGwItem *item, GSList **id_list)
+e_gw_connection_send_item (EGwConnection *cnc,
+                           EGwItem *item,
+                           GSList **id_list)
 {
 	SoupSoapMessage *msg;
 	SoupSoapResponse *response;
@@ -1346,7 +1384,9 @@ e_gw_connection_send_item (EGwConnection *cnc, EGwItem *item, GSList **id_list)
 }
 
 EGwConnectionStatus
-e_gw_connection_create_item (EGwConnection *cnc, EGwItem *item, gchar ** id)
+e_gw_connection_create_item (EGwConnection *cnc,
+                             EGwItem *item,
+                             gchar **id)
 {
 	SoupSoapMessage *msg;
 	SoupSoapResponse *response;
@@ -1393,7 +1433,9 @@ e_gw_connection_create_item (EGwConnection *cnc, EGwItem *item, gchar ** id)
 }
 
 EGwConnectionStatus
-e_gw_connection_modify_item (EGwConnection *cnc, const gchar *id , EGwItem *item)
+e_gw_connection_modify_item (EGwConnection *cnc,
+                             const gchar *id ,
+                             EGwItem *item)
 {
 	SoupSoapMessage *msg;
 	SoupSoapResponse *response;
@@ -1436,7 +1478,11 @@ e_gw_connection_modify_item (EGwConnection *cnc, const gchar *id , EGwItem *item
 }
 
 EGwConnectionStatus
-e_gw_connection_get_item (EGwConnection *cnc, const gchar *container, const gchar *id, const gchar *view, EGwItem **item)
+e_gw_connection_get_item (EGwConnection *cnc,
+                          const gchar *container,
+                          const gchar *id,
+                          const gchar *view,
+                          EGwItem **item)
 {
 
 	SoupSoapMessage *msg;
@@ -1496,7 +1542,9 @@ e_gw_connection_get_item (EGwConnection *cnc, const gchar *container, const gcha
 }
 
 EGwConnectionStatus
-e_gw_connection_remove_item (EGwConnection *cnc, const gchar *container, const gchar *id)
+e_gw_connection_remove_item (EGwConnection *cnc,
+                             const gchar *container,
+                             const gchar *id)
 {
 	SoupSoapMessage *msg;
 	SoupSoapResponse *response;
@@ -1531,7 +1579,9 @@ e_gw_connection_remove_item (EGwConnection *cnc, const gchar *container, const g
 }
 
 EGwConnectionStatus
-e_gw_connection_remove_items (EGwConnection *cnc, const gchar *container, GList *item_ids)
+e_gw_connection_remove_items (EGwConnection *cnc,
+                              const gchar *container,
+                              GList *item_ids)
 {
 	SoupSoapMessage *msg;
 	SoupSoapResponse *response;
@@ -1568,7 +1618,11 @@ e_gw_connection_remove_items (EGwConnection *cnc, const gchar *container, GList
 }
 
 EGwConnectionStatus
-e_gw_connection_accept_request (EGwConnection *cnc, const gchar *id, const gchar *accept_level, const gchar *accept_comment, const gchar *recurrence_key)
+e_gw_connection_accept_request (EGwConnection *cnc,
+                                const gchar *id,
+                                const gchar *accept_level,
+                                const gchar *accept_comment,
+                                const gchar *recurrence_key)
 {
 	SoupSoapMessage *msg;
 	gint status;
@@ -1603,7 +1657,10 @@ e_gw_connection_accept_request (EGwConnection *cnc, const gchar *id, const gchar
 }
 
 EGwConnectionStatus
-e_gw_connection_decline_request (EGwConnection *cnc, const gchar *id, const gchar *decline_comment, const gchar *recurrence_key)
+e_gw_connection_decline_request (EGwConnection *cnc,
+                                 const gchar *id,
+                                 const gchar *decline_comment,
+                                 const gchar *recurrence_key)
 {
 	SoupSoapMessage *msg;
 	gint status;
@@ -1637,7 +1694,11 @@ e_gw_connection_decline_request (EGwConnection *cnc, const gchar *id, const gcha
 }
 
 EGwConnectionStatus
-e_gw_connection_retract_request (EGwConnection *cnc, const gchar *id, const gchar *comment, gboolean retract_all, gboolean resend)
+e_gw_connection_retract_request (EGwConnection *cnc,
+                                 const gchar *id,
+                                 const gchar *comment,
+                                 gboolean retract_all,
+                                 gboolean resend)
 {
 	SoupSoapMessage *msg;
 	gint status;
@@ -1665,7 +1726,8 @@ e_gw_connection_retract_request (EGwConnection *cnc, const gchar *id, const gcha
 }
 
 EGwConnectionStatus
-e_gw_connection_complete_request (EGwConnection *cnc, const gchar *id)
+e_gw_connection_complete_request (EGwConnection *cnc,
+                                  const gchar *id)
 {
 	SoupSoapMessage *msg;
 	gint status;
@@ -1692,7 +1754,12 @@ e_gw_connection_complete_request (EGwConnection *cnc, const gchar *id)
 }
 
 EGwConnectionStatus
-e_gw_connection_delegate_request (EGwConnection *cnc, EGwItem *item, const gchar *id, const gchar *comments_org, const gchar *comments_del, const gchar *recur_key)
+e_gw_connection_delegate_request (EGwConnection *cnc,
+                                  EGwItem *item,
+                                  const gchar *id,
+                                  const gchar *comments_org,
+                                  const gchar *comments_del,
+                                  const gchar *recur_key)
 {
 	SoupSoapMessage *msg;
 	gint status;
@@ -1850,7 +1917,9 @@ e_gw_connection_get_date_from_string (const gchar *dtstring)
 }
 
 EGwConnectionStatus
-e_gw_connection_create_book (EGwConnection *cnc, gchar *book_name, gchar **id)
+e_gw_connection_create_book (EGwConnection *cnc,
+                             gchar *book_name,
+                             gchar **id)
 {
 	SoupSoapMessage *msg;
 	gint status;
@@ -1891,7 +1960,8 @@ e_gw_connection_create_book (EGwConnection *cnc, gchar *book_name, gchar **id)
 }
 
 EGwConnectionStatus
-e_gw_connection_get_address_book_list (EGwConnection *cnc, GList **container_list)
+e_gw_connection_get_address_book_list (EGwConnection *cnc,
+                                       GList **container_list)
 {
 	SoupSoapMessage *msg;
 	SoupSoapResponse *response;
@@ -1989,7 +2059,10 @@ e_gw_connection_get_address_book_list (EGwConnection *cnc, GList **container_lis
 }
 
 EGwConnectionStatus
-e_gw_connection_get_address_book_id ( EGwConnection *cnc, gchar *book_name, gchar **id , gboolean *is_writable)
+e_gw_connection_get_address_book_id (EGwConnection *cnc,
+                                     gchar *book_name,
+                                     gchar **id ,
+                                     gboolean *is_writable)
 {
 	EGwConnectionStatus status;
 	GList *container_list = NULL, *l;
@@ -2018,7 +2091,8 @@ e_gw_connection_get_address_book_id ( EGwConnection *cnc, gchar *book_name, gcha
 }
 
 EGwConnectionStatus
-e_gw_connection_modify_settings (EGwConnection *cnc, EGwSendOptions *opts)
+e_gw_connection_modify_settings (EGwConnection *cnc,
+                                 EGwSendOptions *opts)
 {
 	SoupSoapMessage *msg;
 	SoupSoapResponse *response;
@@ -2071,7 +2145,8 @@ e_gw_connection_modify_settings (EGwConnection *cnc, EGwSendOptions *opts)
 }
 
 EGwConnectionStatus
-e_gw_connection_get_settings (EGwConnection *cnc, EGwSendOptions **opts)
+e_gw_connection_get_settings (EGwConnection *cnc,
+                              EGwSendOptions **opts)
 {
 	SoupSoapMessage *msg;
 	SoupSoapResponse *response;
@@ -2139,7 +2214,9 @@ e_gw_connection_get_settings (EGwConnection *cnc, EGwSendOptions **opts)
 }
 
 EGwConnectionStatus
-e_gw_connection_get_categories (EGwConnection *cnc, GHashTable **categories_by_id, GHashTable **categories_by_name)
+e_gw_connection_get_categories (EGwConnection *cnc,
+                                GHashTable **categories_by_id,
+                                GHashTable **categories_by_name)
 {
 	SoupSoapMessage *msg;
 	SoupSoapResponse *response;
@@ -2236,7 +2313,9 @@ e_gw_connection_get_categories (EGwConnection *cnc, GHashTable **categories_by_i
 }
 
 EGwConnectionStatus
-e_gw_connection_add_members (EGwConnection *cnc, const gchar *group_id, GList *member_ids)
+e_gw_connection_add_members (EGwConnection *cnc,
+                             const gchar *group_id,
+                             GList *member_ids)
 {
 	SoupSoapMessage *msg;
 	SoupSoapResponse *response;
@@ -2278,7 +2357,9 @@ e_gw_connection_add_members (EGwConnection *cnc, const gchar *group_id, GList *m
 }
 
 EGwConnectionStatus
-e_gw_connection_remove_members (EGwConnection *cnc, const gchar *group_id, GList *member_ids)
+e_gw_connection_remove_members (EGwConnection *cnc,
+                                const gchar *group_id,
+                                GList *member_ids)
 {
 
 	SoupSoapMessage *msg;
@@ -2321,7 +2402,11 @@ e_gw_connection_remove_members (EGwConnection *cnc, const gchar *group_id, GList
 }
 
 EGwConnectionStatus
-e_gw_connection_create_cursor (EGwConnection *cnc, const gchar *container, const gchar *view, EGwFilter *filter, gint *cursor)
+e_gw_connection_create_cursor (EGwConnection *cnc,
+                               const gchar *container,
+                               const gchar *view,
+                               EGwFilter *filter,
+                               gint *cursor)
 {
 	SoupSoapMessage *msg;
 	SoupSoapResponse *response;
@@ -2378,7 +2463,9 @@ e_gw_connection_create_cursor (EGwConnection *cnc, const gchar *container, const
 }
 
 EGwConnectionStatus
-e_gw_connection_destroy_cursor (EGwConnection *cnc, const gchar *container,  gint cursor)
+e_gw_connection_destroy_cursor (EGwConnection *cnc,
+                                const gchar *container,
+                                gint cursor)
 {
 	SoupSoapMessage *msg;
 	SoupSoapResponse *response;
@@ -2409,7 +2496,11 @@ e_gw_connection_destroy_cursor (EGwConnection *cnc, const gchar *container,  gin
 }
 
 EGwConnectionStatus
-e_gw_connection_position_cursor (EGwConnection *cnc, const gchar *container, gint cursor, const gchar *seek, gint offset)
+e_gw_connection_position_cursor (EGwConnection *cnc,
+                                 const gchar *container,
+                                 gint cursor,
+                                 const gchar *seek,
+                                 gint offset)
 {
 	SoupSoapMessage *msg;
 	SoupSoapResponse *response;
@@ -2439,7 +2530,13 @@ e_gw_connection_position_cursor (EGwConnection *cnc, const gchar *container, gin
 }
 
 EGwConnectionStatus
-e_gw_connection_read_cursor (EGwConnection *cnc, const gchar *container, gint cursor, gboolean forward, gint count, const gchar *cursor_seek, GList **item_list)
+e_gw_connection_read_cursor (EGwConnection *cnc,
+                             const gchar *container,
+                             gint cursor,
+                             gboolean forward,
+                             gint count,
+                             const gchar *cursor_seek,
+                             GList **item_list)
 {
 	SoupSoapMessage *msg;
 	SoupSoapResponse *response;
@@ -2452,7 +2549,7 @@ e_gw_connection_read_cursor (EGwConnection *cnc, const gchar *container, gint cu
 	msg = e_gw_message_new_with_header (cnc->priv->uri, cnc->priv->session_id, "readCursorRequest");
 	e_gw_message_write_int_parameter (msg, "cursor", NULL, cursor);
 	/* there is problem in read curosr if you set this, uncomment after the problem
-	   is fixed in server */
+	 * is fixed in server */
 	e_gw_message_write_string_parameter (msg, "position", NULL, cursor_seek);
 	e_gw_message_write_string_parameter (msg, "forward", NULL, forward ? "true": "false");
 	e_gw_message_write_string_parameter (msg, "container", NULL, container);
@@ -2620,7 +2717,9 @@ EGwConnectionStatus e_gw_connection_get_quick_messages (EGwConnection *cnc, cons
 }
 
 EGwConnectionStatus
-e_gw_connection_create_folder (EGwConnection *cnc, const gchar *parent_name,const gchar *folder_name, gchar **container_id)
+e_gw_connection_create_folder (EGwConnection *cnc,
+                               const gchar *parent_name,const gchar *folder_name,
+                               gchar **container_id)
 {
 	SoupSoapMessage *msg;
 	SoupSoapResponse *response;
@@ -2665,7 +2764,12 @@ e_gw_connection_create_folder (EGwConnection *cnc, const gchar *parent_name,cons
  *
  */
 EGwConnectionStatus
-e_gw_connection_get_attachment (EGwConnection *cnc, const gchar *id, gint offset, gint length, const gchar **attachment, gint *attach_length)
+e_gw_connection_get_attachment (EGwConnection *cnc,
+                                const gchar *id,
+                                gint offset,
+                                gint length,
+                                const gchar **attachment,
+                                gint *attach_length)
 {
 
 	SoupSoapMessage *msg;
@@ -2733,7 +2837,13 @@ e_gw_connection_get_attachment (EGwConnection *cnc, const gchar *id, gint offset
  *
  */
 EGwConnectionStatus
-e_gw_connection_get_attachment_base64 (EGwConnection *cnc, const gchar *id, gint offset, gint length, const gchar **attachment, gint *attach_length, gint *offset_r)
+e_gw_connection_get_attachment_base64 (EGwConnection *cnc,
+                                       const gchar *id,
+                                       gint offset,
+                                       gint length,
+                                       const gchar **attachment,
+                                       gint *attach_length,
+                                       gint *offset_r)
 {
 
 	SoupSoapMessage *msg;
@@ -2805,7 +2915,9 @@ e_gw_connection_get_attachment_base64 (EGwConnection *cnc, const gchar *id, gint
 }
 
 EGwConnectionStatus
-e_gw_connection_add_item (EGwConnection *cnc, const gchar *container, const gchar *id)
+e_gw_connection_add_item (EGwConnection *cnc,
+                          const gchar *container,
+                          const gchar *id)
 {
 	SoupSoapMessage *msg;
 	SoupSoapResponse *response;
@@ -2840,7 +2952,9 @@ e_gw_connection_add_item (EGwConnection *cnc, const gchar *container, const gcha
 }
 
 EGwConnectionStatus
-e_gw_connection_add_items (EGwConnection *cnc, const gchar *container, GList *item_ids)
+e_gw_connection_add_items (EGwConnection *cnc,
+                           const gchar *container,
+                           GList *item_ids)
 {
 	SoupSoapMessage *msg;
 	SoupSoapResponse *response;
@@ -2880,7 +2994,8 @@ e_gw_connection_add_items (EGwConnection *cnc, const gchar *container, GList *it
 }
 
 EGwConnectionStatus
-e_gw_connection_rename_folder (EGwConnection *cnc, const gchar *id ,const gchar *new_name)
+e_gw_connection_rename_folder (EGwConnection *cnc,
+                               const gchar *id ,const gchar *new_name)
 {
 	SoupSoapMessage *msg;
 	SoupSoapResponse *response;
@@ -2923,7 +3038,11 @@ e_gw_connection_rename_folder (EGwConnection *cnc, const gchar *id ,const gchar
 }
 
 EGwConnectionStatus
-e_gw_connection_share_folder (EGwConnection *cnc, gchar *id, GList *new_list, const gchar *sub, const gchar *mesg ,int flag)
+e_gw_connection_share_folder (EGwConnection *cnc,
+                              gchar *id,
+                              GList *new_list,
+                              const gchar *sub,
+                              const gchar *mesg ,int flag)
 {
 	SoupSoapMessage *msg;
 	SoupSoapResponse *response;
@@ -2950,7 +3069,10 @@ e_gw_connection_share_folder (EGwConnection *cnc, gchar *id, GList *new_list, co
 }
 
 EGwConnectionStatus
-e_gw_connection_move_item (EGwConnection *cnc, const gchar *id, const gchar *dest_container_id, const gchar *from_container_id)
+e_gw_connection_move_item (EGwConnection *cnc,
+                           const gchar *id,
+                           const gchar *dest_container_id,
+                           const gchar *from_container_id)
 
 {
 	SoupSoapMessage *msg;
@@ -2987,7 +3109,11 @@ e_gw_connection_move_item (EGwConnection *cnc, const gchar *id, const gchar *des
 }
 
 EGwConnectionStatus
-e_gw_connection_accept_shared_folder (EGwConnection *cnc, gchar *name, gchar *container_id, gchar *item_id, gchar *desc)
+e_gw_connection_accept_shared_folder (EGwConnection *cnc,
+                                      gchar *name,
+                                      gchar *container_id,
+                                      gchar *item_id,
+                                      gchar *desc)
 {
 
 	SoupSoapMessage *msg;
@@ -3048,7 +3174,8 @@ e_gw_connection_purge_deleted_items (EGwConnection *cnc)
 }
 
 EGwConnectionStatus
-e_gw_connection_purge_selected_items (EGwConnection *cnc, GList *item_ids)
+e_gw_connection_purge_selected_items (EGwConnection *cnc,
+                                      GList *item_ids)
 {
 
 	SoupSoapMessage *msg;
@@ -3081,7 +3208,8 @@ e_gw_connection_purge_selected_items (EGwConnection *cnc, GList *item_ids)
 }
 
 EGwConnectionStatus
-e_gw_connection_mark_read (EGwConnection *cnc, GList *item_ids)
+e_gw_connection_mark_read (EGwConnection *cnc,
+                           GList *item_ids)
 {
 	SoupSoapMessage *msg;
 	SoupSoapResponse *response;
@@ -3116,7 +3244,8 @@ e_gw_connection_mark_read (EGwConnection *cnc, GList *item_ids)
 }
 
 EGwConnectionStatus
-e_gw_connection_mark_unread (EGwConnection *cnc, GList *item_ids)
+e_gw_connection_mark_unread (EGwConnection *cnc,
+                             GList *item_ids)
 {
 	SoupSoapMessage *msg;
 	SoupSoapResponse *response;
@@ -3151,7 +3280,10 @@ e_gw_connection_mark_unread (EGwConnection *cnc, GList *item_ids)
 }
 
 EGwConnectionStatus
-e_gw_connection_reply_item (EGwConnection *cnc, const gchar *id, const gchar *view, EGwItem **item)
+e_gw_connection_reply_item (EGwConnection *cnc,
+                            const gchar *id,
+                            const gchar *view,
+                            EGwItem **item)
 {
 	SoupSoapMessage *msg;
 	SoupSoapResponse *response;
@@ -3210,7 +3342,11 @@ e_gw_connection_reply_item (EGwConnection *cnc, const gchar *id, const gchar *vi
 }
 
 EGwConnectionStatus
-e_gw_connection_forward_item (EGwConnection *cnc, const gchar *id, const gchar *view, gboolean embed, EGwItem **item)
+e_gw_connection_forward_item (EGwConnection *cnc,
+                              const gchar *id,
+                              const gchar *view,
+                              gboolean embed,
+                              EGwItem **item)
 {
 	SoupSoapMessage *msg;
 	SoupSoapResponse *response;
@@ -3279,7 +3415,10 @@ e_gw_connection_forward_item (EGwConnection *cnc, const gchar *id, const gchar *
  * */
 
 EGwConnectionStatus
-e_gw_connection_create_junk_entry (EGwConnection *cnc, const gchar *value, const gchar *match_type, const gchar *list_type)
+e_gw_connection_create_junk_entry (EGwConnection *cnc,
+                                   const gchar *value,
+                                   const gchar *match_type,
+                                   const gchar *list_type)
 {
 	SoupSoapMessage *msg;
 	SoupSoapResponse *response;
@@ -3319,7 +3458,11 @@ e_gw_connection_create_junk_entry (EGwConnection *cnc, const gchar *value, const
 
 /*TODO: move to different file*/
 static void
-parse_junk_settings (SoupSoapParameter *param, gint *use_junk, gint *use_block, gint *use_pab, gint *persistence)
+parse_junk_settings (SoupSoapParameter *param,
+                     gint *use_junk,
+                     gint *use_block,
+                     gint *use_pab,
+                     gint *persistence)
 {
 	SoupSoapParameter *subparam, *field_param, *val_param;
 
@@ -3373,7 +3516,11 @@ parse_junk_settings (SoupSoapParameter *param, gint *use_junk, gint *use_block,
  * persistence:
  * */
 EGwConnectionStatus
-e_gw_connection_get_junk_settings (EGwConnection *cnc, gint *use_junk, gint *use_block, gint *use_pab, gint *persistence)
+e_gw_connection_get_junk_settings (EGwConnection *cnc,
+                                   gint *use_junk,
+                                   gint *use_block,
+                                   gint *use_pab,
+                                   gint *persistence)
 {
 	SoupSoapMessage *msg;
 	SoupSoapResponse *response;
@@ -3415,7 +3562,9 @@ e_gw_connection_get_junk_settings (EGwConnection *cnc, gint *use_junk, gint *use
 }
 
 static void
-msg_add_settings (SoupSoapMessage *msg, const gchar *field, gint value)
+msg_add_settings (SoupSoapMessage *msg,
+                  const gchar *field,
+                  gint value)
 {
 	soup_soap_message_start_element (msg, "setting", NULL, NULL);
 	e_gw_message_write_string_parameter (msg, "field", NULL, field);
@@ -3432,7 +3581,11 @@ msg_add_settings (SoupSoapMessage *msg, const gchar *field, gint value)
  * */
 
 EGwConnectionStatus
-e_gw_connection_modify_junk_settings (EGwConnection *cnc, gint use_junk, gint use_pab, gint use_block, gint persistence)
+e_gw_connection_modify_junk_settings (EGwConnection *cnc,
+                                      gint use_junk,
+                                      gint use_pab,
+                                      gint use_block,
+                                      gint persistence)
 {
 	SoupSoapMessage *msg;
 	SoupSoapResponse *response;
@@ -3525,7 +3678,8 @@ e_gw_junkentry_new_from_soap_parameter (SoupSoapParameter *param)
 
 /*TODO:Move this code to some other file and make this function public*/
 static void
-get_junk_list_from_soap_response (SoupSoapResponse *response, GList **entries)
+get_junk_list_from_soap_response (SoupSoapResponse *response,
+                                  GList **entries)
 {
 	SoupSoapParameter *param, *subparam;
 
@@ -3568,7 +3722,8 @@ get_junk_list_from_soap_response (SoupSoapResponse *response, GList **entries)
 
 /* Caller must free the entries*** TODO: have a function in the generic file to free these*/
 EGwConnectionStatus
-e_gw_connection_get_junk_entries (EGwConnection *cnc, GList **entries)
+e_gw_connection_get_junk_entries (EGwConnection *cnc,
+				  GList **entries)
 {
 	SoupSoapMessage *msg;
 	SoupSoapResponse *response;
@@ -3607,7 +3762,8 @@ e_gw_connection_get_junk_entries (EGwConnection *cnc, GList **entries)
 }
 
 EGwConnectionStatus
-e_gw_connection_remove_junk_entry (EGwConnection *cnc, const gchar *id)
+e_gw_connection_remove_junk_entry (EGwConnection *cnc,
+                                   const gchar *id)
 {
 	SoupSoapMessage *msg;
 	SoupSoapResponse *response;
@@ -3642,7 +3798,13 @@ e_gw_connection_remove_junk_entry (EGwConnection *cnc, const gchar *id)
 }
 
 EGwConnectionStatus
-e_gw_connection_read_cal_ids (EGwConnection *cnc, const gchar *container, gint cursor, gboolean forward, gint count, const gchar *cursor_seek, GList **list)
+e_gw_connection_read_cal_ids (EGwConnection *cnc,
+                              const gchar *container,
+                              gint cursor,
+                              gboolean forward,
+                              gint count,
+                              const gchar *cursor_seek,
+                              GList **list)
 {
 	SoupSoapMessage *msg;
 	SoupSoapResponse *response;
@@ -3655,7 +3817,7 @@ e_gw_connection_read_cal_ids (EGwConnection *cnc, const gchar *container, gint c
 	e_gw_message_write_int_parameter (msg, "cursor", NULL, cursor);
 	*list = NULL;
 	/* there is problem in read curosr if you set this, uncomment after the problem
-	   is fixed in server */
+	 * is fixed in server */
 	e_gw_message_write_string_parameter (msg, "position", NULL, cursor_seek);
 	e_gw_message_write_string_parameter (msg, "forward", NULL, forward ? "true": "false");
 	e_gw_message_write_string_parameter (msg, "container", NULL, container);
@@ -3769,7 +3931,13 @@ e_gw_connection_read_cal_ids (EGwConnection *cnc, const gchar *container, gint c
 }
 
 EGwConnectionStatus
-e_gw_connection_get_all_mail_uids (EGwConnection *cnc, const gchar *container, gint cursor, gboolean forward, gint count, const gchar *cursor_seek, GList **list)
+e_gw_connection_get_all_mail_uids (EGwConnection *cnc,
+                                   const gchar *container,
+                                   gint cursor,
+                                   gboolean forward,
+                                   gint count,
+                                   const gchar *cursor_seek,
+                                   GList **list)
 {
 	SoupSoapMessage *msg;
 	SoupSoapResponse *response;
@@ -3782,7 +3950,7 @@ e_gw_connection_get_all_mail_uids (EGwConnection *cnc, const gchar *container, g
 	e_gw_message_write_int_parameter (msg, "cursor", NULL, cursor);
 	*list = NULL;
 	/* there is problem in read curosr if you set this, uncomment after the problem
-	   is fixed in server */
+	 * is fixed in server */
 	e_gw_message_write_string_parameter (msg, "position", NULL, cursor_seek);
 	e_gw_message_write_string_parameter (msg, "forward", NULL, forward ? "true": "false");
 	e_gw_message_write_string_parameter (msg, "container", NULL, container);
@@ -3854,7 +4022,8 @@ e_gw_connection_get_all_mail_uids (EGwConnection *cnc, const gchar *container, g
 }
 
 EGwConnectionStatus
-e_gw_connection_get_proxy_access_list (EGwConnection *cnc, GList **proxy_list)
+e_gw_connection_get_proxy_access_list (EGwConnection *cnc,
+                                       GList **proxy_list)
 {
 	SoupSoapMessage *msg = NULL;
 	SoupSoapResponse *response = NULL;
@@ -3895,7 +4064,8 @@ e_gw_connection_get_proxy_access_list (EGwConnection *cnc, GList **proxy_list)
 }
 
 EGwConnectionStatus
-e_gw_connection_add_proxy (EGwConnection *cnc, proxyHandler *new_proxy)
+e_gw_connection_add_proxy (EGwConnection *cnc,
+                           proxyHandler *new_proxy)
 {
 	SoupSoapMessage *msg = NULL;
 	SoupSoapResponse *response = NULL;
@@ -3923,7 +4093,8 @@ e_gw_connection_add_proxy (EGwConnection *cnc, proxyHandler *new_proxy)
 }
 
 EGwConnectionStatus
-e_gw_connection_remove_proxy (EGwConnection *cnc, proxyHandler *removeProxy)
+e_gw_connection_remove_proxy (EGwConnection *cnc,
+                              proxyHandler *removeProxy)
 {
 	SoupSoapMessage *msg;
 	SoupSoapResponse *response;
@@ -3949,7 +4120,8 @@ e_gw_connection_remove_proxy (EGwConnection *cnc, proxyHandler *removeProxy)
 }
 
 EGwConnectionStatus
-e_gw_connection_modify_proxy (EGwConnection *cnc, proxyHandler *new_proxy)
+e_gw_connection_modify_proxy (EGwConnection *cnc,
+                              proxyHandler *new_proxy)
 {
 	SoupSoapMessage *msg = NULL;
 	SoupSoapResponse *response = NULL;
@@ -3979,7 +4151,8 @@ e_gw_connection_modify_proxy (EGwConnection *cnc, proxyHandler *new_proxy)
 }
 
 EGwConnectionStatus
-e_gw_connection_get_proxy_list (EGwConnection *cnc, GList **proxy_info)
+e_gw_connection_get_proxy_list (EGwConnection *cnc,
+                                GList **proxy_info)
 {
 	SoupSoapMessage *msg;
 	SoupSoapResponse *response;
@@ -4025,8 +4198,11 @@ e_gw_connection_get_proxy_list (EGwConnection *cnc, GList **proxy_info)
 	return E_GW_CONNECTION_STATUS_OK;
 }
 
-static SoupSoapMessage*
-form_proxy_login_request (EGwConnection *cnc, const gchar * username, const gchar * password, const gchar *proxy)
+static SoupSoapMessage *
+form_proxy_login_request (EGwConnection *cnc,
+                          const gchar *username,
+                          const gchar *password,
+                          const gchar *proxy)
 {
 	SoupSoapMessage *msg;
 	/* build the SOAP message */
@@ -4043,7 +4219,11 @@ form_proxy_login_request (EGwConnection *cnc, const gchar * username, const gcha
 }
 
 EGwConnection *
-e_gw_connection_get_proxy_connection (EGwConnection *parent_cnc, gchar *username, const gchar *password, const gchar *proxy, gint  *permissions)
+e_gw_connection_get_proxy_connection (EGwConnection *parent_cnc,
+                                      gchar *username,
+                                      const gchar *password,
+                                      const gchar *proxy,
+                                      gint *permissions)
 {
 	EGwConnection *cnc;
 	SoupSoapMessage *msg;
@@ -4059,7 +4239,7 @@ e_gw_connection_get_proxy_connection (EGwConnection *parent_cnc, gchar *username
 
 	g_static_mutex_lock (&connecting);
 
-	for (i=0; proxy[i]!='\0' && proxy[i]!='@'; i++);
+	for (i = 0; proxy[i]!='\0' && proxy[i]!='@'; i++);
 	if (proxy[i]=='@')
 		name = g_strndup (proxy, i);
 	else
diff --git a/src/server/e-gw-connection.h b/src/server/e-gw-connection.h
index d66bfab..54318fb 100644
--- a/src/server/e-gw-connection.h
+++ b/src/server/e-gw-connection.h
@@ -180,7 +180,7 @@ EGwConnectionStatus e_gw_connection_add_proxy (EGwConnection *cnc, proxyHandler
 EGwConnectionStatus e_gw_connection_remove_proxy (EGwConnection *cnc, proxyHandler *newProxy);
 EGwConnectionStatus e_gw_connection_modify_proxy (EGwConnection *cnc, proxyHandler *newProxy);
 EGwConnectionStatus e_gw_connection_get_proxy_list (EGwConnection *cnc, GList **proxy_info);
-EGwConnection *e_gw_connection_get_proxy_connection (EGwConnection *cnc1, gchar *username, const gchar *password, const gchar *proxy, int* permissions);
+EGwConnection *e_gw_connection_get_proxy_connection (EGwConnection *cnc1, gchar *username, const gchar *password, const gchar *proxy, gint * permissions);
 EGwConnectionStatus e_gw_connection_get_all_mail_uids (EGwConnection *cnc, const gchar *container, gint cursor, gboolean forward, gint count, const gchar *cursor_seek, GList **list);
 
 G_END_DECLS
diff --git a/src/server/e-gw-container.c b/src/server/e-gw-container.c
index 43bb255..6c2e866 100644
--- a/src/server/e-gw-container.c
+++ b/src/server/e-gw-container.c
@@ -167,7 +167,8 @@ e_gw_container_new_from_soap_parameter (SoupSoapParameter *param)
 }
 
 gboolean
-e_gw_container_set_from_soap_parameter (EGwContainer *container, SoupSoapParameter *param)
+e_gw_container_set_from_soap_parameter (EGwContainer *container,
+                                        SoupSoapParameter *param)
 {
 	gchar *value;
 	gint int_value;
@@ -391,7 +392,8 @@ e_gw_container_set_from_soap_parameter (EGwContainer *container, SoupSoapParamet
 }
 
 void
-e_gw_container_get_user_list (EGwContainer *container, GList **user_list)
+e_gw_container_get_user_list (EGwContainer *container,
+                              GList **user_list)
 {
 	g_return_if_fail (E_GW_CONTAINER (container));
 
@@ -408,7 +410,8 @@ e_gw_container_get_sequence (EGwContainer *container)
 }
 
 static  void
-e_gw_container_set_sequence (EGwContainer *container, gint sequence)
+e_gw_container_set_sequence (EGwContainer *container,
+                             gint sequence)
 {
 	g_return_if_fail (E_IS_GW_CONTAINER (container));
 	container->priv->sequence = sequence;
@@ -423,7 +426,8 @@ e_gw_container_get_modified (EGwContainer *container)
 }
 
 static void
-e_gw_container_set_modified (EGwContainer *container, const gchar *modified)
+e_gw_container_set_modified (EGwContainer *container,
+                             const gchar *modified)
 {
 	EGwContainerPrivate *priv;
 
@@ -438,12 +442,13 @@ e_gw_container_set_modified (EGwContainer *container, const gchar *modified)
 }
 
 static void
-e_gw_container_set_owner (EGwContainer *container, const gchar *owner)
+e_gw_container_set_owner (EGwContainer *container,
+                          const gchar *owner)
 {
 	EGwContainerPrivate *priv;
 
 	g_return_if_fail (E_IS_GW_CONTAINER (container));
-	g_return_if_fail (owner!=NULL);
+	g_return_if_fail (owner != NULL);
 
 	priv = container->priv;
 	if (priv->owner)
@@ -460,7 +465,8 @@ e_gw_container_get_owner (EGwContainer *container)
 }
 
 gint
-e_gw_container_get_rights (EGwContainer *container, gchar *email)
+e_gw_container_get_rights (EGwContainer *container,
+                           gchar *email)
 {
 	GList *user_list = NULL;
 	GList *node = NULL;
@@ -488,7 +494,8 @@ e_gw_container_get_is_shared_by_me (EGwContainer *container)
 }
 
 static void
-e_gw_container_set_is_shared_by_me (EGwContainer *container, gboolean is_shared_by_me)
+e_gw_container_set_is_shared_by_me (EGwContainer *container,
+                                    gboolean is_shared_by_me)
 {
 	g_return_if_fail (E_IS_GW_CONTAINER (container));
 
@@ -504,7 +511,8 @@ e_gw_container_get_is_shared_to_me (EGwContainer *container)
 }
 
 static void
-e_gw_container_set_is_shared_to_me (EGwContainer *container, gboolean is_shared_to_me)
+e_gw_container_set_is_shared_to_me (EGwContainer *container,
+                                    gboolean is_shared_to_me)
 {
 	g_return_if_fail (E_IS_GW_CONTAINER (container));
 
@@ -520,7 +528,8 @@ e_gw_container_get_is_system_folder (EGwContainer *container)
 }
 
 void
-e_gw_container_set_is_system_folder (EGwContainer *container, gboolean is_system_folder)
+e_gw_container_set_is_system_folder (EGwContainer *container,
+                                     gboolean is_system_folder)
 {
 	g_return_if_fail (E_IS_GW_CONTAINER (container));
 
@@ -536,7 +545,8 @@ e_gw_container_get_name (EGwContainer *container)
 }
 
 void
-e_gw_container_set_name (EGwContainer *container, const gchar *new_name)
+e_gw_container_set_name (EGwContainer *container,
+                         const gchar *new_name)
 {
 	EGwContainerPrivate *priv;
 
@@ -559,7 +569,8 @@ e_gw_container_get_id (EGwContainer *container)
 }
 
 void
-e_gw_container_set_id (EGwContainer *container, const gchar *new_id)
+e_gw_container_set_id (EGwContainer *container,
+                       const gchar *new_id)
 {
 	EGwContainerPrivate *priv;
 
@@ -582,7 +593,8 @@ e_gw_container_get_parent_id (EGwContainer *container)
 }
 
 void
-e_gw_container_set_parent_id (EGwContainer *container, const gchar *parent_id)
+e_gw_container_set_parent_id (EGwContainer *container,
+                              const gchar *parent_id)
 {
 	EGwContainerPrivate *priv;
 
@@ -624,7 +636,8 @@ e_gw_container_get_is_writable (EGwContainer *container)
 }
 
 void
-e_gw_container_set_is_writable (EGwContainer *container, gboolean is_writable)
+e_gw_container_set_is_writable (EGwContainer *container,
+                                gboolean is_writable)
 {
 	g_return_if_fail (E_IS_GW_CONTAINER (container));
 
@@ -641,7 +654,8 @@ e_gw_container_get_is_frequent_contacts (EGwContainer *container)
 }
 
 void
-e_gw_container_set_is_frequent_contacts (EGwContainer *container, gboolean is_frequent_contacts)
+e_gw_container_set_is_frequent_contacts (EGwContainer *container,
+                                         gboolean is_frequent_contacts)
 {
 	g_return_if_fail (E_IS_GW_CONTAINER (container));
 
@@ -669,7 +683,12 @@ e_gw_container_get_container_type (EGwContainer *container)
  * flag = 0 :add to acl
  */
 void
-e_gw_container_form_message (SoupSoapMessage *msg, gchar *id, GList *new_list, const gchar *sub, const gchar *mesg, gint flag)
+e_gw_container_form_message (SoupSoapMessage *msg,
+                             gchar *id,
+                             GList *new_list,
+                             const gchar *sub,
+                             const gchar *mesg,
+                             gint flag)
 {
 	gboolean add, edit, del;
 	gchar *email = NULL;
@@ -689,7 +708,7 @@ e_gw_container_form_message (SoupSoapMessage *msg, gchar *id, GList *new_list, c
 
 		for (node = new_list; node != NULL; node = node->next) {
 			user = node->data;
-			add=edit=del=FALSE;
+			add = edit = del = FALSE;
 			soup_soap_message_start_element (msg, "entry", NULL, NULL);
 			e_gw_message_write_string_parameter (msg, "displayName", NULL,"");
 			email = g_strdup (user->email);
diff --git a/src/server/e-gw-filter.c b/src/server/e-gw-filter.c
index d6fb37b..b86a056 100644
--- a/src/server/e-gw-filter.c
+++ b/src/server/e-gw-filter.c
@@ -43,12 +43,15 @@ typedef struct _FilterComponent  FilterComponent;
 
 struct _EGwFilterPrivate {
 	GSList *component_list;
-	gint  filter_group_type; /* stores, whether all condtions are to be met or any one of them*/
+	gint  filter_group_type; /* stores, whether all condtions are to be met or any one of them */
 
 };
 
 void
-e_gw_filter_add_filter_component (EGwFilter *filter, EGwFilterOpType operation, const gchar *field_name, const gchar *field_value)
+e_gw_filter_add_filter_component (EGwFilter *filter,
+                                  EGwFilterOpType operation,
+                                  const gchar *field_name,
+                                  const gchar *field_value)
 {
 	FilterComponent *component;
 
@@ -65,7 +68,9 @@ e_gw_filter_add_filter_component (EGwFilter *filter, EGwFilterOpType operation,
 }
 
 void
-e_gw_filter_group_conditions (EGwFilter *filter, EGwFilterOpType operation, gint num_of_condtions)
+e_gw_filter_group_conditions (EGwFilter *filter,
+                              EGwFilterOpType operation,
+                              gint num_of_condtions)
 {
 	FilterComponent *component;
 
@@ -79,7 +84,8 @@ e_gw_filter_group_conditions (EGwFilter *filter, EGwFilterOpType operation, gint
 }
 
 static void
-append_child_component (FilterComponent* filter_component, SoupSoapMessage *msg)
+append_child_component (FilterComponent *filter_component,
+                        SoupSoapMessage *msg)
 {
 
 	const gchar *operation_name;
@@ -136,14 +142,15 @@ append_child_component (FilterComponent* filter_component, SoupSoapMessage *msg)
 	soup_soap_message_end_element (msg);
 }
 
-static GSList*
-append_complex_component (GSList *component_list, SoupSoapMessage *msg)
+static GSList *
+append_complex_component (GSList *component_list,
+                          SoupSoapMessage *msg)
 {
 	FilterComponent *filter_component;
 	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 ) {
 
@@ -173,7 +180,8 @@ append_complex_component (GSList *component_list, SoupSoapMessage *msg)
 }
 
 void
-e_gw_filter_append_to_soap_message (EGwFilter *filter, SoupSoapMessage *msg)
+e_gw_filter_append_to_soap_message (EGwFilter *filter,
+                                    SoupSoapMessage *msg)
 {
 	EGwFilterPrivate *priv;
 	GSList *component_list;
@@ -239,7 +247,7 @@ e_gw_filter_init (EGwFilter *filter)
 	EGwFilterPrivate *priv;
 
 	priv = g_new0 (EGwFilterPrivate, 1);
-	priv->filter_group_type = E_GW_FILTER_OP_AND; /*by default all condtions are to be met*/
+	priv->filter_group_type = E_GW_FILTER_OP_AND; /*by default all condtions are to be met */
 	priv->component_list = NULL;
 	filter->priv = priv;
 }
diff --git a/src/server/e-gw-filter.h b/src/server/e-gw-filter.h
index 9672b48..a3f9b8c 100644
--- a/src/server/e-gw-filter.h
+++ b/src/server/e-gw-filter.h
@@ -67,7 +67,7 @@ struct _EGwFilterClass {
 };
 
 GType       e_gw_filter_get_type (void);
-EGwFilter*  e_gw_filter_new (void);
+EGwFilter *  e_gw_filter_new (void);
 void        e_gw_filter_add_filter_component (EGwFilter *filter, EGwFilterOpType operation, const gchar *field_name, const gchar *field_value);
 void        e_gw_filter_append_to_soap_message (EGwFilter *filter, SoupSoapMessage *msg);
 void        e_gw_filter_group_conditions (EGwFilter *filter, EGwFilterOpType operation, gint num_of_condtions);
diff --git a/src/server/e-gw-item.c b/src/server/e-gw-item.c
index ba70745..d0a67ff 100644
--- a/src/server/e-gw-item.c
+++ b/src/server/e-gw-item.c
@@ -37,7 +37,7 @@ G_DEFINE_TYPE (EGwItem, e_gw_item, G_TYPE_OBJECT)
 struct _EGwItemPrivate {
 	EGwItemType item_type;
 	gchar *container;
-	GList *category_list; /*list of category ids*/
+	GList *category_list; /*list of category ids */
 
 	/* properties */
 	gchar *id;
@@ -141,7 +141,8 @@ struct _EGwItemPrivate {
 static GObjectClass *parent_class = NULL;
 
 static void
-free_recipient (EGwItemRecipient *recipient, gpointer data)
+free_recipient (EGwItemRecipient *recipient,
+                gpointer data)
 {
 	g_free (recipient->email);
 	g_free (recipient->display_name);
@@ -156,7 +157,7 @@ free_recipient (EGwItemRecipient *recipient, gpointer data)
 }
 
 static void
-free_postal_address (gpointer  postal_address)
+free_postal_address (gpointer postal_address)
 {
 	PostalAddress *address;
 	address = (PostalAddress *) postal_address;
@@ -185,14 +186,16 @@ free_full_name (gpointer full_name)
 }
 
 static void
-free_string (gpointer s, gpointer data)
+free_string (gpointer s,
+             gpointer data)
 {
 	if (s)
 		free (s);
 }
 
 static void
-free_attach (gpointer s, gpointer data)
+free_attach (gpointer s,
+             gpointer data)
 {
 	EGwItemAttachment *attach = (EGwItemAttachment *) s;
 	if (attach) {
@@ -214,7 +217,8 @@ free_attach (gpointer s, gpointer data)
 
 }
 static void
-free_member (gpointer member, gpointer data)
+free_member (gpointer member,
+             gpointer data)
 {
 	EGroupMember *group_member = (EGroupMember *) member;
 	if (group_member->id)
@@ -227,7 +231,8 @@ free_member (gpointer member, gpointer data)
 }
 
 static void
-free_im_address ( gpointer address, gpointer data)
+free_im_address (gpointer address,
+                 gpointer data)
 {
 	IMAddress *im_address;
 	im_address = (IMAddress *) address;
@@ -257,7 +262,7 @@ free_link_info (EGwItemLinkInfo *info)
 }
 
 static void
-free_changes ( GHashTable *changes)
+free_changes (GHashTable *changes)
 {
 	gpointer value;
 	if (!changes)
@@ -267,10 +272,10 @@ free_changes ( GHashTable *changes)
 		free_full_name (value);
 	value = g_hash_table_lookup (changes, "email");
 	if (value)
-		g_list_free ((GList*) value);
+		g_list_free ((GList *) value);
 	value = g_hash_table_lookup (changes, "ims");
 	if (value)
-		g_list_free ((GList*) value);
+		g_list_free ((GList *) value);
 	value = g_hash_table_lookup (changes, "Home");
 	if (value)
 		free_postal_address (value);
@@ -620,7 +625,8 @@ e_gw_item_new_empty (void)
 }
 
 static void
-set_recipient_list_from_soap_parameter (EGwItem *item, SoupSoapParameter *param)
+set_recipient_list_from_soap_parameter (EGwItem *item,
+                                        SoupSoapParameter *param)
 {
 	SoupSoapParameter *param_recipient;
 	gchar *email, *cn;
@@ -665,8 +671,8 @@ set_recipient_list_from_soap_parameter (EGwItem *item, SoupSoapParameter *param)
 		/*FIXME  gw recipientTypes need to be added after the server is fixed. */
 
 		/* update Recipient Status
-		 look for accepted/declined and update the item else set it
-		 to none. */
+		 * look for accepted/declined and update the item else set it
+		 * to none. */
 		subparam = soup_soap_parameter_get_first_child_by_name (param_recipient, "recipientStatus");
 		if (subparam) {
 			gchar *formatted_date, *value;
@@ -743,7 +749,8 @@ set_recipient_list_from_soap_parameter (EGwItem *item, SoupSoapParameter *param)
 }
 
 static EGwItemReturnNotify
-get_notification_value (SoupSoapParameter *param, const gchar *param_name)
+get_notification_value (SoupSoapParameter *param,
+                        const gchar *param_name)
 {
 	SoupSoapParameter *subparam;
 
@@ -763,7 +770,8 @@ get_notification_value (SoupSoapParameter *param, const gchar *param_name)
 }
 
 static void
-set_sendoptions_from_soap_parameter (EGwItem *item, SoupSoapParameter *param)
+set_sendoptions_from_soap_parameter (EGwItem *item,
+                                     SoupSoapParameter *param)
 {
 	EGwItemPrivate *priv;
 	SoupSoapParameter *subparam, *child;
@@ -825,7 +833,8 @@ set_sendoptions_from_soap_parameter (EGwItem *item, SoupSoapParameter *param)
 }
 
 gchar *
-e_gw_item_get_field_value (EGwItem *item, const gchar *field_name)
+e_gw_item_get_field_value (EGwItem *item,
+                           const gchar *field_name)
 {
 	gpointer value;
 
@@ -843,7 +852,9 @@ e_gw_item_get_field_value (EGwItem *item, const gchar *field_name)
 }
 
 void
-e_gw_item_set_field_value (EGwItem *item, const gchar *field_name, gchar * field_value)
+e_gw_item_set_field_value (EGwItem *item,
+                           const gchar *field_name,
+                           gchar *field_value)
 {
 	g_return_if_fail (field_name != NULL);
 	g_return_if_fail (field_name != NULL);
@@ -867,7 +878,8 @@ e_gw_item_get_email_list (EGwItem *item)
 }
 
 void
-e_gw_item_set_email_list (EGwItem *item, GList* email_list)
+e_gw_item_set_email_list (EGwItem *item,
+                          GList *email_list)
 {
 	item->priv->email_list = email_list;
 }
@@ -880,18 +892,20 @@ e_gw_item_get_im_list (EGwItem *item)
 }
 
 void
-e_gw_item_set_im_list (EGwItem *item, GList *im_list)
+e_gw_item_set_im_list (EGwItem *item,
+                       GList *im_list)
 {
 	item->priv->im_list = im_list;
 }
-FullName*
+FullName *
 e_gw_item_get_full_name (EGwItem *item)
 {
 	return item->priv->full_name;
 }
 
 void
-e_gw_item_set_full_name (EGwItem *item, FullName *full_name)
+e_gw_item_set_full_name (EGwItem *item,
+                         FullName *full_name)
 {
 	item->priv->full_name = full_name;
 }
@@ -903,14 +917,17 @@ e_gw_item_get_member_list (EGwItem *item)
 }
 
 void
-e_gw_item_set_member_list (EGwItem *item, GList *list)
+e_gw_item_set_member_list (EGwItem *item,
+                           GList *list)
 {
 	item->priv->member_list = list;
 
 }
 
 void
-e_gw_item_set_address (EGwItem *item, const gchar *address_type, PostalAddress *address)
+e_gw_item_set_address (EGwItem *item,
+                       const gchar *address_type,
+                       PostalAddress *address)
 {
 	if (address_type && address)
 		g_hash_table_insert (item->priv->addresses, (gpointer) address_type, address);
@@ -923,20 +940,22 @@ PostalAddress *e_gw_item_get_address (EGwItem *item, const gchar *address_type)
 }
 
 void
-e_gw_item_set_categories (EGwItem *item, GList *category_list)
+e_gw_item_set_categories (EGwItem *item,
+                          GList *category_list)
 {
 	item->priv->category_list = category_list;
 
 }
 
-GList*
+GList *
 e_gw_item_get_categories (EGwItem *item)
 {
 	return item->priv->category_list;
 }
 
 void
-e_gw_item_set_category_name (EGwItem *item, gchar *category_name)
+e_gw_item_set_category_name (EGwItem *item,
+                             gchar *category_name)
 {
 	item->priv->category_name = category_name;
 }
@@ -988,7 +1007,8 @@ void e_gw_item_set_change (EGwItem *item, EGwItemChangeType change_type, const g
 }
 
 static void
-set_common_addressbook_item_fields_from_soap_parameter (EGwItem *item, SoupSoapParameter *param)
+set_common_addressbook_item_fields_from_soap_parameter (EGwItem *item,
+                                                        SoupSoapParameter *param)
 {
 	SoupSoapParameter *subparam, *category_param;
 	GHashTable *simple_fields;
@@ -1050,7 +1070,8 @@ set_common_addressbook_item_fields_from_soap_parameter (EGwItem *item, SoupSoapP
 }
 
 static void
-set_postal_address_from_soap_parameter (PostalAddress *address, SoupSoapParameter *param)
+set_postal_address_from_soap_parameter (PostalAddress *address,
+                                        SoupSoapParameter *param)
 {
 	SoupSoapParameter *subparam;
 	gchar *value;
@@ -1101,7 +1122,8 @@ set_postal_address_from_soap_parameter (PostalAddress *address, SoupSoapParamete
 }
 
 static void
-set_contact_fields_from_soap_parameter (EGwItem *item, SoupSoapParameter *param)
+set_contact_fields_from_soap_parameter (EGwItem *item,
+                                        SoupSoapParameter *param)
 {
 	gchar *value;
 	gchar *type;
@@ -1308,7 +1330,8 @@ set_contact_fields_from_soap_parameter (EGwItem *item, SoupSoapParameter *param)
 
 }
 static void
-set_group_fields_from_soap_parameter (EGwItem *item, SoupSoapParameter *param)
+set_group_fields_from_soap_parameter (EGwItem *item,
+                                      SoupSoapParameter *param)
 {
 
 	gchar *value;
@@ -1358,7 +1381,8 @@ set_group_fields_from_soap_parameter (EGwItem *item, SoupSoapParameter *param)
 }
 
 static void
-set_resource_fields_from_soap_parameter (EGwItem *item, SoupSoapParameter *param)
+set_resource_fields_from_soap_parameter (EGwItem *item,
+                                         SoupSoapParameter *param)
 {
 
 	gchar *value;
@@ -1394,7 +1418,8 @@ set_resource_fields_from_soap_parameter (EGwItem *item, SoupSoapParameter *param
 }
 
 static void
-set_organization_fields_from_soap_parameter (EGwItem *item, SoupSoapParameter *param)
+set_organization_fields_from_soap_parameter (EGwItem *item,
+                                             SoupSoapParameter *param)
 {
 
 	gchar *value;
@@ -1446,7 +1471,9 @@ set_organization_fields_from_soap_parameter (EGwItem *item, SoupSoapParameter *p
 }
 
 static void
-append_postal_address_to_soap_message (SoupSoapMessage *msg, PostalAddress *address, const gchar *address_type)
+append_postal_address_to_soap_message (SoupSoapMessage *msg,
+                                       PostalAddress *address,
+                                       const gchar *address_type)
 {
 	soup_soap_message_start_element (msg, "address", NULL, NULL);
 	soup_soap_message_add_attribute (msg, "type", address_type, NULL, NULL);
@@ -1467,7 +1494,9 @@ append_postal_address_to_soap_message (SoupSoapMessage *msg, PostalAddress *addr
 }
 
 static void
-append_common_addressbook_item_fields_to_soap_message (GHashTable *simple_fields, GList *category_list,  SoupSoapMessage *msg)
+append_common_addressbook_item_fields_to_soap_message (GHashTable *simple_fields,
+                                                       GList *category_list,
+                                                       SoupSoapMessage *msg)
 {
 	gchar * value;
 
@@ -1491,7 +1520,9 @@ append_common_addressbook_item_fields_to_soap_message (GHashTable *simple_fields
 }
 
 static void
-append_full_name_to_soap_message (FullName *full_name, gchar *display_name, SoupSoapMessage *msg)
+append_full_name_to_soap_message (FullName *full_name,
+                                  gchar *display_name,
+                                  SoupSoapMessage *msg)
 {
 	g_return_if_fail (full_name != NULL);
 	soup_soap_message_start_element (msg, "fullName", NULL, NULL);
@@ -1512,7 +1543,8 @@ append_full_name_to_soap_message (FullName *full_name, gchar *display_name, Soup
 }
 
 static void
-append_email_list_soap_message (GList *email_list, SoupSoapMessage *msg)
+append_email_list_soap_message (GList *email_list,
+                                SoupSoapMessage *msg)
 {
 	g_return_if_fail (email_list != NULL);
 
@@ -1526,7 +1558,8 @@ append_email_list_soap_message (GList *email_list, SoupSoapMessage *msg)
 }
 
 static void
-append_im_list_to_soap_message (GList *ims, SoupSoapMessage *msg)
+append_im_list_to_soap_message (GList *ims,
+                                SoupSoapMessage *msg)
 {
 	IMAddress *address;
 	g_return_if_fail (ims != NULL);
@@ -1543,7 +1576,8 @@ append_im_list_to_soap_message (GList *ims, SoupSoapMessage *msg)
 
 }
 static void
-append_phone_list_to_soap_message (GHashTable *simple_fields, SoupSoapMessage *msg)
+append_phone_list_to_soap_message (GHashTable *simple_fields,
+                                   SoupSoapMessage *msg)
 {
 	gchar *value;
 
@@ -1574,7 +1608,8 @@ append_phone_list_to_soap_message (GHashTable *simple_fields, SoupSoapMessage *m
 }
 
 static void
-append_office_info_to_soap_message (GHashTable *simple_fields, SoupSoapMessage *msg)
+append_office_info_to_soap_message (GHashTable *simple_fields,
+                                    SoupSoapMessage *msg)
 {
 	gchar *value;
 	gchar *org_name;
@@ -1603,7 +1638,8 @@ append_office_info_to_soap_message (GHashTable *simple_fields, SoupSoapMessage *
 }
 
 static void
-append_personal_info_to_soap_message (GHashTable *simple_fields, SoupSoapMessage *msg)
+append_personal_info_to_soap_message (GHashTable *simple_fields,
+                                      SoupSoapMessage *msg)
 {
 	gchar *value;
 
@@ -1622,7 +1658,8 @@ append_personal_info_to_soap_message (GHashTable *simple_fields, SoupSoapMessage
 }
 
 static void
-append_contact_fields_to_soap_message (EGwItem *item, SoupSoapMessage *msg)
+append_contact_fields_to_soap_message (EGwItem *item,
+                                       SoupSoapMessage *msg)
 {
 	gchar * value;
 	GHashTable *simple_fields;
@@ -1668,7 +1705,8 @@ append_contact_fields_to_soap_message (EGwItem *item, SoupSoapMessage *msg)
 }
 
 static void
-append_group_fields_to_soap_message (EGwItem *item, SoupSoapMessage *msg)
+append_group_fields_to_soap_message (EGwItem *item,
+                                     SoupSoapMessage *msg)
 {
 	GHashTable *simple_fields;
 	GList *members;
@@ -1693,7 +1731,9 @@ append_group_fields_to_soap_message (EGwItem *item, SoupSoapMessage *msg)
 }
 
 EGwItem *
-e_gw_item_new_from_soap_parameter (const gchar *email, const gchar *container, SoupSoapParameter *param)
+e_gw_item_new_from_soap_parameter (const gchar *email,
+                                   const gchar *container,
+                                   SoupSoapParameter *param)
 {
 	EGwItem *item;
 	gchar *item_type, *internet_prop;
@@ -2116,7 +2156,8 @@ e_gw_item_get_item_type (EGwItem *item)
 }
 
 void
-e_gw_item_set_item_type (EGwItem *item, EGwItemType new_type)
+e_gw_item_set_item_type (EGwItem *item,
+                         EGwItemType new_type)
 {
 	g_return_if_fail (E_IS_GW_ITEM (item));
 
@@ -2132,7 +2173,8 @@ e_gw_item_get_container_id (EGwItem *item)
 }
 
 void
-e_gw_item_set_container_id (EGwItem *item, const gchar *new_id)
+e_gw_item_set_container_id (EGwItem *item,
+                            const gchar *new_id)
 {
 	g_return_if_fail (E_IS_GW_ITEM (item));
 
@@ -2150,7 +2192,8 @@ e_gw_item_get_icalid (EGwItem *item)
 }
 
 void
-e_gw_item_set_icalid (EGwItem *item, const gchar *new_icalid)
+e_gw_item_set_icalid (EGwItem *item,
+                      const gchar *new_icalid)
 {
 	g_return_if_fail (E_IS_GW_ITEM (item));
 
@@ -2168,7 +2211,8 @@ e_gw_item_get_id (EGwItem *item)
 }
 
 void
-e_gw_item_set_id (EGwItem *item, const gchar *new_id)
+e_gw_item_set_id (EGwItem *item,
+                  const gchar *new_id)
 {
 	g_return_if_fail (E_IS_GW_ITEM (item));
 
@@ -2210,7 +2254,8 @@ e_gw_item_get_creation_date (EGwItem *item)
 }
 
 void
-e_gw_item_set_creation_date (EGwItem *item, const gchar *new_date)
+e_gw_item_set_creation_date (EGwItem *item,
+                             const gchar *new_date)
 {
 	g_return_if_fail (E_IS_GW_ITEM (item));
 
@@ -2228,7 +2273,8 @@ e_gw_item_get_delivered_date (EGwItem *item)
 }
 
 void
-e_gw_item_set_delivered_date (EGwItem *item, const gchar *new_date)
+e_gw_item_set_delivered_date (EGwItem *item,
+                              const gchar *new_date)
 {
 	g_return_if_fail (E_IS_GW_ITEM (item));
 
@@ -2246,7 +2292,8 @@ e_gw_item_get_modified_date (EGwItem *item)
 }
 
 void
-e_gw_item_set_modified_date (EGwItem *item, const gchar *new_date)
+e_gw_item_set_modified_date (EGwItem *item,
+                             const gchar *new_date)
 {
 	g_return_if_fail (E_IS_GW_ITEM (item));
 
@@ -2264,7 +2311,8 @@ e_gw_item_get_start_date (EGwItem *item)
 }
 
 void
-e_gw_item_set_start_date (EGwItem *item, const gchar *new_date)
+e_gw_item_set_start_date (EGwItem *item,
+                          const gchar *new_date)
 {
 	g_return_if_fail (E_IS_GW_ITEM (item));
 
@@ -2282,7 +2330,8 @@ e_gw_item_get_end_date (EGwItem *item)
 }
 
 void
-e_gw_item_set_end_date (EGwItem *item, const gchar *new_date)
+e_gw_item_set_end_date (EGwItem *item,
+                        const gchar *new_date)
 {
 	g_return_if_fail (E_IS_GW_ITEM (item));
 
@@ -2300,7 +2349,8 @@ e_gw_item_get_due_date (EGwItem *item)
 }
 
 void
-e_gw_item_set_due_date (EGwItem *item, const gchar *new_date)
+e_gw_item_set_due_date (EGwItem *item,
+                        const gchar *new_date)
 {
 	g_return_if_fail (E_IS_GW_ITEM (item));
 
@@ -2318,7 +2368,8 @@ e_gw_item_get_completed_date (EGwItem *item)
 }
 
 void
-e_gw_item_set_completed_date (EGwItem *item, const gchar *new_date)
+e_gw_item_set_completed_date (EGwItem *item,
+                              const gchar *new_date)
 {
 	g_return_if_fail (E_IS_GW_ITEM (item));
 
@@ -2336,7 +2387,8 @@ e_gw_item_get_subject (EGwItem *item)
 }
 
 void
-e_gw_item_set_subject (EGwItem *item, const gchar *new_subject)
+e_gw_item_set_subject (EGwItem *item,
+                       const gchar *new_subject)
 {
 	g_return_if_fail (E_IS_GW_ITEM (item));
 
@@ -2354,7 +2406,8 @@ e_gw_item_get_message (EGwItem *item)
 }
 
 void
-e_gw_item_set_message (EGwItem *item, const gchar *new_message)
+e_gw_item_set_message (EGwItem *item,
+                       const gchar *new_message)
 {
 	g_return_if_fail (E_IS_GW_ITEM (item));
 
@@ -2372,7 +2425,8 @@ e_gw_item_get_place (EGwItem *item)
 }
 
 void
-e_gw_item_set_place (EGwItem *item, const gchar *new_place)
+e_gw_item_set_place (EGwItem *item,
+                     const gchar *new_place)
 {
 	g_return_if_fail (E_IS_GW_ITEM (item));
 
@@ -2390,7 +2444,8 @@ e_gw_item_get_classification (EGwItem *item)
 }
 
 void
-e_gw_item_set_classification (EGwItem *item, const gchar *new_class)
+e_gw_item_set_classification (EGwItem *item,
+                              const gchar *new_class)
 {
 	g_return_if_fail (E_IS_GW_ITEM (item));
 
@@ -2408,7 +2463,8 @@ e_gw_item_get_security (EGwItem *item)
 }
 
 void
-e_gw_item_set_security (EGwItem *item, const gchar *new_class)
+e_gw_item_set_security (EGwItem *item,
+                        const gchar *new_class)
 {
 	g_return_if_fail (E_IS_GW_ITEM (item));
 
@@ -2426,7 +2482,8 @@ e_gw_item_get_completed (EGwItem *item)
 }
 
 void
-e_gw_item_set_completed (EGwItem *item, gboolean new_completed)
+e_gw_item_set_completed (EGwItem *item,
+                         gboolean new_completed)
 {
 	g_return_if_fail (E_IS_GW_ITEM (item));
 
@@ -2442,7 +2499,8 @@ e_gw_item_get_is_allday_event (EGwItem *item)
 }
 
 void
-e_gw_item_set_is_allday_event (EGwItem *item, gboolean allday_event)
+e_gw_item_set_is_allday_event (EGwItem *item,
+                               gboolean allday_event)
 {
 	g_return_if_fail (E_IS_GW_ITEM (item));
 
@@ -2458,7 +2516,8 @@ e_gw_item_get_accept_level (EGwItem *item)
 }
 
 void
-e_gw_item_set_accept_level (EGwItem *item, const gchar *new_level)
+e_gw_item_set_accept_level (EGwItem *item,
+                            const gchar *new_level)
 {
 	g_return_if_fail (E_IS_GW_ITEM (item));
 
@@ -2475,7 +2534,8 @@ e_gw_item_get_priority (EGwItem *item)
 }
 
 void
-e_gw_item_set_priority (EGwItem *item, const gchar *new_priority)
+e_gw_item_set_priority (EGwItem *item,
+                        const gchar *new_priority)
 {
 	g_return_if_fail (E_IS_GW_ITEM (item));
 
@@ -2493,7 +2553,8 @@ e_gw_item_get_task_priority (EGwItem *item)
 }
 
 void
-e_gw_item_set_task_priority (EGwItem *item, const gchar *new_priority)
+e_gw_item_set_task_priority (EGwItem *item,
+                             const gchar *new_priority)
 {
 	g_return_if_fail (E_IS_GW_ITEM (item));
 
@@ -2509,7 +2570,8 @@ e_gw_item_get_recipient_list (EGwItem *item)
 }
 
 void
-e_gw_item_set_recipient_list (EGwItem  *item, GSList *new_recipient_list)
+e_gw_item_set_recipient_list (EGwItem *item,
+                              GSList *new_recipient_list)
 {
 	/* free old list and set a new one*/
 	g_slist_foreach (item->priv->recipient_list, (GFunc) free_recipient, NULL);
@@ -2525,7 +2587,8 @@ e_gw_item_get_organizer (EGwItem *item)
 }
 
 void
-e_gw_item_set_attach_id_list (EGwItem *item, GSList *attach_list)
+e_gw_item_set_attach_id_list (EGwItem *item,
+                              GSList *attach_list)
 {
 	g_return_if_fail (E_IS_GW_ITEM (item));
 	if (attach_list) {
@@ -2543,7 +2606,8 @@ e_gw_item_get_attach_id_list (EGwItem *item)
 }
 
 void
-e_gw_item_set_organizer (EGwItem  *item, EGwItemOrganizer *organizer)
+e_gw_item_set_organizer (EGwItem *item,
+                         EGwItemOrganizer *organizer)
 {
 	/* free organizer */
 	if (item->priv->organizer) {
@@ -2562,7 +2626,8 @@ e_gw_item_get_recurrence_dates (EGwItem *item)
 }
 
 void
-e_gw_item_set_recurrence_dates (EGwItem  *item, GSList *new_recurrence_dates)
+e_gw_item_set_recurrence_dates (EGwItem *item,
+                                GSList *new_recurrence_dates)
 {
 	/* free old list and set a new one*/
 	g_slist_foreach (item->priv->recurrence_dates, free_string, NULL);
@@ -2579,7 +2644,8 @@ e_gw_item_get_exdate_list (EGwItem *item)
 }
 
 void
-e_gw_item_set_exdate_list (EGwItem  *item, GSList *new_exdate_list)
+e_gw_item_set_exdate_list (EGwItem *item,
+                           GSList *new_exdate_list)
 {
 	/* free old list and set a new one*/
 	g_slist_foreach (item->priv->exdate_list, free_string, NULL);
@@ -2596,7 +2662,8 @@ e_gw_item_get_rrule (EGwItem *item)
 }
 
 void
-e_gw_item_set_rrule (EGwItem  *item, EGwItemRecurrenceRule *new_rrule)
+e_gw_item_set_rrule (EGwItem *item,
+                     EGwItemRecurrenceRule *new_rrule)
 {
 	if (item->priv->rrule) {
 	/* TODO free old list and set a new one*/
@@ -2612,7 +2679,8 @@ e_gw_item_get_recurrence_key (EGwItem *item)
 }
 
 void
-e_gw_item_set_recurrence_key (EGwItem *item, gint recur_key)
+e_gw_item_set_recurrence_key (EGwItem *item,
+                              gint recur_key)
 {
 	item->priv->recurrence_key = recur_key;
 }
@@ -2626,7 +2694,8 @@ e_gw_item_get_trigger (EGwItem *item)
 }
 
 void
-e_gw_item_set_trigger (EGwItem *item, gint trigger)
+e_gw_item_set_trigger (EGwItem *item,
+                       gint trigger)
 {
 	g_return_if_fail (E_IS_GW_ITEM (item));
 
@@ -2634,7 +2703,8 @@ e_gw_item_set_trigger (EGwItem *item, gint trigger)
 }
 
 void
-e_gw_item_set_to (EGwItem *item, const gchar *to)
+e_gw_item_set_to (EGwItem *item,
+                  const gchar *to)
 {
 	g_return_if_fail (E_IS_GW_ITEM (item));
 	item->priv->to = g_strdup (to);
@@ -2663,7 +2733,8 @@ e_gw_item_get_msg_body_id (EGwItem *item)
 }
 
 void
-e_gw_item_set_sendoptions (EGwItem *item, gboolean set)
+e_gw_item_set_sendoptions (EGwItem *item,
+                           gboolean set)
 {
 	g_return_if_fail (E_IS_GW_ITEM (item));
 
@@ -2671,7 +2742,8 @@ e_gw_item_set_sendoptions (EGwItem *item, gboolean set)
 }
 
 void
-e_gw_item_set_reply_request (EGwItem *item, gboolean set)
+e_gw_item_set_reply_request (EGwItem *item,
+                             gboolean set)
 {
 	g_return_if_fail (E_IS_GW_ITEM (item));
 
@@ -2687,7 +2759,8 @@ e_gw_item_get_reply_request (EGwItem *item)
 }
 
 void
-e_gw_item_set_reply_within (EGwItem *item, gchar *reply_within)
+e_gw_item_set_reply_within (EGwItem *item,
+                            gchar *reply_within)
 {
 	g_return_if_fail (E_IS_GW_ITEM (item));
 
@@ -2703,7 +2776,8 @@ e_gw_item_get_reply_within (EGwItem *item)
 }
 
 void
-e_gw_item_set_track_info (EGwItem *item, EGwItemTrack track_info)
+e_gw_item_set_track_info (EGwItem *item,
+                          EGwItemTrack track_info)
 {
 	g_return_if_fail (E_IS_GW_ITEM (item));
 
@@ -2719,7 +2793,8 @@ e_gw_item_get_track_info (EGwItem *item)
 }
 
 void
-e_gw_item_set_autodelete (EGwItem *item, gboolean set)
+e_gw_item_set_autodelete (EGwItem *item,
+                          gboolean set)
 {
 	g_return_if_fail (E_IS_GW_ITEM (item));
 
@@ -2735,7 +2810,8 @@ e_gw_item_get_autodelete (EGwItem *item)
 }
 
 void
-e_gw_item_set_notify_completed (EGwItem *item, EGwItemReturnNotify notify)
+e_gw_item_set_notify_completed (EGwItem *item,
+                                EGwItemReturnNotify notify)
 {
 	g_return_if_fail (E_IS_GW_ITEM (item));
 
@@ -2751,7 +2827,8 @@ e_gw_item_get_notify_completed (EGwItem *item)
 }
 
 void
-e_gw_item_set_notify_accepted (EGwItem *item, EGwItemReturnNotify notify)
+e_gw_item_set_notify_accepted (EGwItem *item,
+                               EGwItemReturnNotify notify)
 {
 	g_return_if_fail (E_IS_GW_ITEM (item));
 
@@ -2767,7 +2844,8 @@ e_gw_item_get_notify_accepted (EGwItem *item)
 }
 
 void
-e_gw_item_set_notify_declined (EGwItem *item, EGwItemReturnNotify notify)
+e_gw_item_set_notify_declined (EGwItem *item,
+                               EGwItemReturnNotify notify)
 {
 	g_return_if_fail (E_IS_GW_ITEM (item));
 
@@ -2783,7 +2861,8 @@ e_gw_item_get_notify_declined (EGwItem *item)
 }
 
 void
-e_gw_item_set_notify_opened (EGwItem *item, EGwItemReturnNotify notify)
+e_gw_item_set_notify_opened (EGwItem *item,
+                             EGwItemReturnNotify notify)
 {
 	g_return_if_fail (E_IS_GW_ITEM (item));
 
@@ -2799,7 +2878,8 @@ e_gw_item_get_notify_opened (EGwItem *item)
 }
 
 void
-e_gw_item_set_notify_deleted (EGwItem *item, EGwItemReturnNotify notify)
+e_gw_item_set_notify_deleted (EGwItem *item,
+                              EGwItemReturnNotify notify)
 {
 	g_return_if_fail (E_IS_GW_ITEM (item));
 
@@ -2815,7 +2895,8 @@ e_gw_item_get_notify_deleted (EGwItem *item)
 }
 
 void
-e_gw_item_set_expires (EGwItem *item, gchar *expires)
+e_gw_item_set_expires (EGwItem *item,
+                       gchar *expires)
 {
 	g_return_if_fail (E_IS_GW_ITEM (item));
 
@@ -2831,7 +2912,8 @@ e_gw_item_get_expires (EGwItem *item)
 }
 
 void
-e_gw_item_set_delay_until (EGwItem *item, gchar *delay_until)
+e_gw_item_set_delay_until (EGwItem *item,
+                           gchar *delay_until)
 {
 	g_return_if_fail (E_IS_GW_ITEM (item));
 
@@ -2847,14 +2929,16 @@ e_gw_item_get_delay_until (EGwItem *item)
 }
 
 void
-e_gw_item_set_source (EGwItem *item, const gchar *source)
+e_gw_item_set_source (EGwItem *item,
+                      const gchar *source)
 {
 	g_return_if_fail (E_IS_GW_ITEM (item));
 	item->priv->source = g_strdup (source);
 }
 
 void
-e_gw_item_set_content_type (EGwItem *item, const gchar *content_type)
+e_gw_item_set_content_type (EGwItem *item,
+                            const gchar *content_type)
 {
 	g_return_if_fail (E_IS_GW_ITEM (item));
 
@@ -2872,7 +2956,8 @@ e_gw_item_get_content_type (EGwItem *item)
 }
 
 void
-e_gw_item_set_link_info (EGwItem *item, EGwItemLinkInfo *info)
+e_gw_item_set_link_info (EGwItem *item,
+                         EGwItemLinkInfo *info)
 {
 	g_return_if_fail (E_IS_GW_ITEM (item));
 	item->priv->link_info = info;
@@ -2886,7 +2971,9 @@ e_gw_item_get_link_info (EGwItem *item)
 }
 
 static void
-add_return_notification (SoupSoapMessage *msg, const gchar *option, EGwItemReturnNotify value)
+add_return_notification (SoupSoapMessage *msg,
+                         const gchar *option,
+                         EGwItemReturnNotify value)
 {
 	soup_soap_message_start_element (msg, option, NULL, NULL);
 
@@ -2902,7 +2989,8 @@ add_return_notification (SoupSoapMessage *msg, const gchar *option, EGwItemRetur
 }
 
 static void
-append_gw_item_options (SoupSoapMessage *msg, EGwItem *item)
+append_gw_item_options (SoupSoapMessage *msg,
+                        EGwItem *item)
 {
 	EGwItemPrivate *priv;
 
@@ -2923,7 +3011,8 @@ append_gw_item_options (SoupSoapMessage *msg, EGwItem *item)
 }
 
 void
-e_gw_item_add_distribution_to_soap_message (EGwItem *item, SoupSoapMessage *msg)
+e_gw_item_add_distribution_to_soap_message (EGwItem *item,
+                                            SoupSoapMessage *msg)
 {
 	GSList *rl;
 	EGwItemPrivate *priv;
@@ -3037,7 +3126,8 @@ e_gw_item_add_distribution_to_soap_message (EGwItem *item, SoupSoapMessage *msg)
 }
 
 static void
-add_attachment_to_soap_message (EGwItemAttachment *attachment, SoupSoapMessage *msg)
+add_attachment_to_soap_message (EGwItemAttachment *attachment,
+                                SoupSoapMessage *msg)
 {
 	gchar *size = NULL;
 
@@ -3080,7 +3170,8 @@ add_attachment_to_soap_message (EGwItemAttachment *attachment, SoupSoapMessage *
 }
 
 static void
-e_gw_item_set_calendar_item_elements (EGwItem *item, SoupSoapMessage *msg)
+e_gw_item_set_calendar_item_elements (EGwItem *item,
+                                      SoupSoapMessage *msg)
 {
 	EGwItemPrivate *priv = item->priv;
 	gchar *dtstring;
@@ -3260,7 +3351,8 @@ e_gw_item_set_calendar_item_elements (EGwItem *item, SoupSoapMessage *msg)
 }
 
 gboolean
-e_gw_item_append_to_soap_message (EGwItem *item, SoupSoapMessage *msg)
+e_gw_item_append_to_soap_message (EGwItem *item,
+                                  SoupSoapMessage *msg)
 {
 	EGwItemPrivate *priv;
 	gchar *alarm;
@@ -3422,7 +3514,9 @@ e_gw_item_append_to_soap_message (EGwItem *item, SoupSoapMessage *msg)
 }
 
 static void
-append_contact_changes_to_soap_message (EGwItem *item, SoupSoapMessage *msg, gint change_type)
+append_contact_changes_to_soap_message (EGwItem *item,
+                                        SoupSoapMessage *msg,
+                                        gint change_type)
 {
 	GHashTable *changes;
 	EGwItemPrivate *priv;
@@ -3481,7 +3575,9 @@ append_contact_changes_to_soap_message (EGwItem *item, SoupSoapMessage *msg, gin
 }
 
 static void
-append_event_changes_to_soap_message (EGwItem *item, SoupSoapMessage *msg, gint change_type)
+append_event_changes_to_soap_message (EGwItem *item,
+                                      SoupSoapMessage *msg,
+                                      gint change_type)
 {
 	GHashTable *changes;
 	EGwItemPrivate *priv;
@@ -3581,7 +3677,8 @@ append_event_changes_to_soap_message (EGwItem *item, SoupSoapMessage *msg, gint
 }
 
 gboolean
-e_gw_item_append_changes_to_soap_message (EGwItem *item, SoupSoapMessage *msg)
+e_gw_item_append_changes_to_soap_message (EGwItem *item,
+                                          SoupSoapMessage *msg)
 {
 	EGwItemPrivate *priv;
 	gchar *value;
diff --git a/src/server/e-gw-item.h b/src/server/e-gw-item.h
index 180ef94..69621b7 100644
--- a/src/server/e-gw-item.h
+++ b/src/server/e-gw-item.h
@@ -64,16 +64,16 @@ typedef enum {
 } EGwItemChangeType;
 
 typedef enum {
-	E_GW_ITEM_STAT_ACCEPTED = 1<<0,
-	E_GW_ITEM_STAT_COMPLETED = 1<<1,
-	E_GW_ITEM_STAT_DELEGATED = 1<<2,
-	E_GW_ITEM_STAT_DELETED   = 1<<3,
-	E_GW_ITEM_STAT_FORWARDED = 1<<4,
-	E_GW_ITEM_STAT_OPENED    = 1<<5,
-	E_GW_ITEM_STAT_READ      = 1<<6,
-	E_GW_ITEM_STAT_REPLIED   = 1<<7,
-	E_GW_ITEM_STAT_DECLINED  = 1<<8,
-	E_GW_ITEM_STAT_NONE      = 1<<31
+	E_GW_ITEM_STAT_ACCEPTED = 1 << 0,
+	E_GW_ITEM_STAT_COMPLETED = 1 << 1,
+	E_GW_ITEM_STAT_DELEGATED = 1 << 2,
+	E_GW_ITEM_STAT_DELETED   = 1 << 3,
+	E_GW_ITEM_STAT_FORWARDED = 1 << 4,
+	E_GW_ITEM_STAT_OPENED    = 1 << 5,
+	E_GW_ITEM_STAT_READ      = 1 << 6,
+	E_GW_ITEM_STAT_REPLIED   = 1 << 7,
+	E_GW_ITEM_STAT_DECLINED  = 1 << 8,
+	E_GW_ITEM_STAT_NONE      = 1 << 31
 } EGwItemStatus;
 
 struct _EGwItem {
@@ -197,18 +197,18 @@ gboolean    e_gw_item_get_is_allday_event (EGwItem *item);
 void	    e_gw_item_set_is_allday_event (EGwItem *item, gboolean is_allday);
 gchar *       e_gw_item_get_field_value (EGwItem *item, const gchar *field_name);
 void        e_gw_item_set_field_value (EGwItem *item, const gchar *field_name, gchar * field_value);
-GList*      e_gw_item_get_email_list (EGwItem *item);
+GList *      e_gw_item_get_email_list (EGwItem *item);
 void        e_gw_item_set_email_list (EGwItem *item, GList *email_list);
-FullName*   e_gw_item_get_full_name (EGwItem *item);
-void        e_gw_item_set_full_name (EGwItem *item, FullName* full_name);
-GList*      e_gw_item_get_member_list (EGwItem *item);
+FullName *   e_gw_item_get_full_name (EGwItem *item);
+void        e_gw_item_set_full_name (EGwItem *item, FullName * full_name);
+GList *      e_gw_item_get_member_list (EGwItem *item);
 void        e_gw_item_set_member_list (EGwItem *item, GList *list);
-PostalAddress* e_gw_item_get_address (EGwItem *item, const gchar *address_type);
+PostalAddress * e_gw_item_get_address (EGwItem *item, const gchar *address_type);
 void        e_gw_item_set_address (EGwItem *item, const gchar *addres_type, PostalAddress *address);
-GList*      e_gw_item_get_im_list (EGwItem *item);
+GList *      e_gw_item_get_im_list (EGwItem *item);
 void        e_gw_item_set_im_list (EGwItem *item, GList *im_list);
 void        e_gw_item_set_categories (EGwItem *item, GList *category_list);
-GList*      e_gw_item_get_categories (EGwItem *item);
+GList *      e_gw_item_get_categories (EGwItem *item);
 void	    e_gw_item_set_to (EGwItem *item, const gchar *to);
 const gchar * e_gw_item_get_to (EGwItem *item);
 const gchar *e_gw_item_get_msg_content_type (EGwItem *item);
diff --git a/src/server/e-gw-message.c b/src/server/e-gw-message.c
index ec81ca2..5298476 100644
--- a/src/server/e-gw-message.c
+++ b/src/server/e-gw-message.c
@@ -27,7 +27,9 @@
 #include "e-gw-message.h"
 
 SoupSoapMessage *
-e_gw_message_new_with_header (const gchar *uri, const gchar *session_id, const gchar *method_name)
+e_gw_message_new_with_header (const gchar *uri,
+                              const gchar *session_id,
+                              const gchar *method_name)
 {
 	SoupSoapMessage *msg;
 
@@ -63,7 +65,10 @@ e_gw_message_new_with_header (const gchar *uri, const gchar *session_id, const g
 }
 
 void
-e_gw_message_write_string_parameter (SoupSoapMessage *msg, const gchar *name, const gchar *prefix, const gchar *value)
+e_gw_message_write_string_parameter (SoupSoapMessage *msg,
+                                     const gchar *name,
+                                     const gchar *prefix,
+                                     const gchar *value)
 {
 	soup_soap_message_start_element (msg, name, prefix, NULL);
 	soup_soap_message_write_string (msg, value);
@@ -72,11 +77,11 @@ e_gw_message_write_string_parameter (SoupSoapMessage *msg, const gchar *name, co
 
 void
 e_gw_message_write_string_parameter_with_attribute (SoupSoapMessage *msg,
-						    const gchar *name,
-						    const gchar *prefix,
-						    const gchar *value,
-						    const gchar *attribute_name,
-						    const gchar *attribute_value)
+                                                    const gchar *name,
+                                                    const gchar *prefix,
+                                                    const gchar *value,
+                                                    const gchar *attribute_name,
+                                                    const gchar *attribute_value)
 {
 	soup_soap_message_start_element (msg, name, prefix, NULL);
 	soup_soap_message_add_attribute (msg, attribute_name, attribute_value, NULL, NULL);
@@ -85,7 +90,10 @@ e_gw_message_write_string_parameter_with_attribute (SoupSoapMessage *msg,
 }
 
 void
-e_gw_message_write_base64_parameter (SoupSoapMessage *msg, const gchar *name, const gchar *prefix, const gchar *value)
+e_gw_message_write_base64_parameter (SoupSoapMessage *msg,
+                                     const gchar *name,
+                                     const gchar *prefix,
+                                     const gchar *value)
 {
 	soup_soap_message_start_element (msg, name, prefix, NULL);
 	soup_soap_message_write_base64 (msg, value, strlen (value));
@@ -93,7 +101,10 @@ e_gw_message_write_base64_parameter (SoupSoapMessage *msg, const gchar *name, co
 }
 
 void
-e_gw_message_write_int_parameter (SoupSoapMessage *msg, const gchar *name, const gchar *prefix, glong value)
+e_gw_message_write_int_parameter (SoupSoapMessage *msg,
+                                  const gchar *name,
+                                  const gchar *prefix,
+                                  glong value)
 {
 	soup_soap_message_start_element (msg, name, prefix, NULL);
 	soup_soap_message_write_int (msg, value);
diff --git a/src/server/e-gw-proxy.c b/src/server/e-gw-proxy.c
index b260603..0511562 100644
--- a/src/server/e-gw-proxy.c
+++ b/src/server/e-gw-proxy.c
@@ -29,7 +29,8 @@
 #include "e-gw-message.h"
 
 void
-e_gw_proxy_construct_proxy_access_list (SoupSoapParameter *param, GList **proxy_list)
+e_gw_proxy_construct_proxy_access_list (SoupSoapParameter *param,
+                                        GList **proxy_list)
 {
 	/* parse the response and create the individual proxy accounts */
 	SoupSoapParameter *subparam;
@@ -141,7 +142,8 @@ e_gw_proxy_construct_proxy_access_list (SoupSoapParameter *param, GList **proxy_
 }
 
 void
-e_gw_proxy_construct_proxy_list (SoupSoapParameter *param, GList **proxy_info)
+e_gw_proxy_construct_proxy_list (SoupSoapParameter *param,
+                                 GList **proxy_info)
 {
 	SoupSoapParameter *subparam;
 	SoupSoapParameter *type_param;
@@ -168,7 +170,8 @@ e_gw_proxy_construct_proxy_list (SoupSoapParameter *param, GList **proxy_info)
 }
 
 static void
-e_gw_proxy_form_soap_request_from_proxyHandler (SoupSoapMessage *msg, proxyHandler *new_proxy)
+e_gw_proxy_form_soap_request_from_proxyHandler (SoupSoapMessage *msg,
+                                                proxyHandler *new_proxy)
 {
 	gboolean added = FALSE;
 	e_gw_message_write_string_parameter (msg, "email", NULL, new_proxy->proxy_email);
@@ -181,7 +184,7 @@ e_gw_proxy_form_soap_request_from_proxyHandler (SoupSoapMessage *msg, proxyHandl
 	}
 	if (new_proxy->permissions & E_GW_PROXY_MAIL_WRITE) {
 		if (added == FALSE) {
-			added=TRUE;
+			added = TRUE;
 			soup_soap_message_start_element (msg, "mail", NULL, NULL);
 		}
 		e_gw_message_write_int_parameter (msg, "write", NULL, 1);
@@ -191,14 +194,14 @@ e_gw_proxy_form_soap_request_from_proxyHandler (SoupSoapMessage *msg, proxyHandl
 
 	added = FALSE;
 	if (new_proxy->permissions & E_GW_PROXY_APPOINTMENT_READ) {
-		added=TRUE;
+		added = TRUE;
 		soup_soap_message_start_element (msg, "appointment", NULL, NULL);
 		e_gw_message_write_int_parameter (msg, "read", NULL, 1);
 	}
 	if (new_proxy->permissions & E_GW_PROXY_APPOINTMENT_WRITE) {
 		if (added == FALSE)
 		{
-			added=TRUE;
+			added = TRUE;
 			soup_soap_message_start_element (msg, "appointment", NULL, NULL);
 		}
 		e_gw_message_write_int_parameter (msg, "write", NULL, 1);
@@ -208,14 +211,14 @@ e_gw_proxy_form_soap_request_from_proxyHandler (SoupSoapMessage *msg, proxyHandl
 
 	added = FALSE;
 	if (new_proxy->permissions & E_GW_PROXY_TASK_READ) {
-		added=TRUE;
+		added = TRUE;
 		soup_soap_message_start_element (msg, "task", NULL, NULL);
 		e_gw_message_write_int_parameter (msg, "read", NULL, 1);
 	}
 	if (new_proxy->permissions & E_GW_PROXY_TASK_WRITE) {
 		if (added == FALSE)
 		{
-			added=TRUE;
+			added = TRUE;
 			soup_soap_message_start_element (msg, "task", NULL, NULL);
 		}
 		e_gw_message_write_int_parameter (msg, "write", NULL, 1);
@@ -225,14 +228,14 @@ e_gw_proxy_form_soap_request_from_proxyHandler (SoupSoapMessage *msg, proxyHandl
 
 	added = FALSE;
 	if (new_proxy->permissions & E_GW_PROXY_NOTES_READ) {
-		added=TRUE;
+		added = TRUE;
 		soup_soap_message_start_element (msg, "note", NULL, NULL);
 		e_gw_message_write_int_parameter (msg, "read", NULL, 1);
 	}
 	if (new_proxy->permissions & E_GW_PROXY_NOTES_WRITE) {
-		if (added==FALSE)
+		if (added == FALSE)
 		{
-			added=TRUE;
+			added = TRUE;
 			soup_soap_message_start_element (msg, "note", NULL, NULL);
 		}
 		e_gw_message_write_int_parameter (msg, "write", NULL, 1);
@@ -242,42 +245,43 @@ e_gw_proxy_form_soap_request_from_proxyHandler (SoupSoapMessage *msg, proxyHandl
 
 	added = FALSE;
 	if (new_proxy->permissions & E_GW_PROXY_GET_ALARMS) {
-		added=TRUE;
+		added = TRUE;
 		soup_soap_message_start_element(msg,"misc",NULL,NULL);
 		e_gw_message_write_int_parameter (msg, "alarms", NULL, 1);
 	}
 	if (new_proxy->permissions & E_GW_PROXY_GET_NOTIFICATIONS) {
-		if (added!=TRUE)
+		if (added != TRUE)
 		{
-			added=TRUE;
+			added = TRUE;
 			soup_soap_message_start_element(msg,"misc",NULL,NULL);
 		}
 		e_gw_message_write_int_parameter (msg, "notify", NULL, 1);
 	}
 
 	if (new_proxy->permissions & E_GW_PROXY_MODIFY_FOLDERS) {
-		if (added!=TRUE)
+		if (added != TRUE)
 		{
-			added=TRUE;
+			added = TRUE;
 			soup_soap_message_start_element(msg,"misc",NULL,NULL);
 		}
 		e_gw_message_write_int_parameter (msg, "setup", NULL, 1);
 	}
 	if (new_proxy->permissions & E_GW_PROXY_READ_PRIVATE) {
-		if (added!=TRUE)
+		if (added != TRUE)
 		{
-			added=TRUE;
+			added = TRUE;
 			soup_soap_message_start_element(msg,"misc",NULL,NULL);
 		}
 		e_gw_message_write_int_parameter (msg, "readHidden", NULL, 1);
 	}
-	if (added==TRUE)
+	if (added == TRUE)
 		soup_soap_message_end_element (msg);
 
 }
 
 void
-e_gw_proxy_form_proxy_add_msg (SoupSoapMessage *msg, proxyHandler *new_proxy)
+e_gw_proxy_form_proxy_add_msg (SoupSoapMessage *msg,
+                               proxyHandler *new_proxy)
 {
 	soup_soap_message_start_element (msg, "entry", NULL, NULL);
 
@@ -285,13 +289,15 @@ e_gw_proxy_form_proxy_add_msg (SoupSoapMessage *msg, proxyHandler *new_proxy)
 }
 
 void
-e_gw_proxy_form_proxy_remove_msg (SoupSoapMessage *msg, proxyHandler *removeProxy)
+e_gw_proxy_form_proxy_remove_msg (SoupSoapMessage *msg,
+                                  proxyHandler *removeProxy)
 {
 	e_gw_message_write_string_parameter (msg, "id", NULL, removeProxy->uniqueid);
 }
 
 void
-e_gw_proxy_form_modify_proxy_msg (SoupSoapMessage *msg, proxyHandler *new_proxy)
+e_gw_proxy_form_modify_proxy_msg (SoupSoapMessage *msg,
+                                  proxyHandler *new_proxy)
 {
 	soup_soap_message_start_element (msg, "updates", NULL, NULL);
 
@@ -306,7 +312,8 @@ e_gw_proxy_form_modify_proxy_msg (SoupSoapMessage *msg, proxyHandler *new_proxy)
 }
 
 void
-e_gw_proxy_parse_proxy_login_response (SoupSoapParameter *param, gint *permissions)
+e_gw_proxy_parse_proxy_login_response (SoupSoapParameter *param,
+                                       gint *permissions)
 {
 	SoupSoapParameter *subparam;
 	SoupSoapParameter *individual_rights;
diff --git a/src/server/e-gw-recur-utils.c b/src/server/e-gw-recur-utils.c
index 7a98a6f..40c568e 100644
--- a/src/server/e-gw-recur-utils.c
+++ b/src/server/e-gw-recur-utils.c
@@ -33,6 +33,6 @@ e_gw_recur_get_day_of_week (gshort day)
 
 	if (day < 1 || day > 7)
 		return "";
-	return days_of_week[day-1];
+	return days_of_week[day - 1];
 }
 
diff --git a/src/server/e-gw-sendoptions.c b/src/server/e-gw-sendoptions.c
index aace978..7804e82 100644
--- a/src/server/e-gw-sendoptions.c
+++ b/src/server/e-gw-sendoptions.c
@@ -42,7 +42,7 @@ static GObjectClass *parent_class = NULL;
 
 static gboolean e_gw_sendoptions_store_settings (SoupSoapParameter *param, EGwSendOptions *opts);
 
-EGwSendOptionsGeneral*
+EGwSendOptionsGeneral *
 e_gw_sendoptions_get_general_options (EGwSendOptions *opts)
 {
 	g_return_val_if_fail (opts != NULL || E_IS_GW_SENDOPTIONS (opts), NULL);
@@ -50,8 +50,9 @@ e_gw_sendoptions_get_general_options (EGwSendOptions *opts)
 	return opts->priv->gopts;
 }
 
-EGwSendOptionsStatusTracking*
-e_gw_sendoptions_get_status_tracking_options (EGwSendOptions *opts, const gchar *type)
+EGwSendOptionsStatusTracking *
+e_gw_sendoptions_get_status_tracking_options (EGwSendOptions *opts,
+                                              const gchar *type)
 {
 	g_return_val_if_fail (opts != NULL || E_IS_GW_SENDOPTIONS (opts), NULL);
 	g_return_val_if_fail (type != NULL, NULL);
@@ -142,7 +143,9 @@ e_gw_sendoptions_init (EGwSendOptions *opts)
 }
 
 static void
-parse_status_tracking_options (SoupSoapParameter *group_param, guint i, EGwSendOptionsStatusTracking *sopts)
+parse_status_tracking_options (SoupSoapParameter *group_param,
+                               guint i,
+                               EGwSendOptionsStatusTracking *sopts)
 {
 	SoupSoapParameter *subparam, *field_param, *val_param;
 
@@ -244,11 +247,12 @@ parse_status_tracking_options (SoupSoapParameter *group_param, guint i, EGwSendO
 }
 
 /* These are not actually general Options. These can be configured seperatly for
-   each component. Since win32 shows them as general options, we too do the same
-   way. So the Options are take from the mail setttings */
+ * each component. Since win32 shows them as general options, we too do the same
+ * way. So the Options are take from the mail setttings */
 
 static void
-parse_general_options (SoupSoapParameter *group_param, EGwSendOptionsGeneral *gopts)
+parse_general_options (SoupSoapParameter *group_param,
+                       EGwSendOptionsGeneral *gopts)
 {
 	SoupSoapParameter *subparam, *field_param, *val_param;
 
@@ -330,7 +334,8 @@ parse_general_options (SoupSoapParameter *group_param, EGwSendOptionsGeneral *go
 /* These settings are common to all components */
 
 static void
-parse_advanced_settings (SoupSoapParameter *group_param, EGwSendOptionsGeneral *gopts)
+parse_advanced_settings (SoupSoapParameter *group_param,
+                         EGwSendOptionsGeneral *gopts)
 {
 	SoupSoapParameter *subparam, *field_param, *val_param;
 
@@ -369,7 +374,8 @@ parse_advanced_settings (SoupSoapParameter *group_param, EGwSendOptionsGeneral *
 
 /* TODO have to handle the locked settings */
 static gboolean
-e_gw_sendoptions_store_settings (SoupSoapParameter *param, EGwSendOptions *opts)
+e_gw_sendoptions_store_settings (SoupSoapParameter *param,
+                                 EGwSendOptions *opts)
 {
 	SoupSoapParameter *group_param;
 	EGwSendOptionsPrivate *priv;
@@ -407,7 +413,11 @@ e_gw_sendoptions_store_settings (SoupSoapParameter *param, EGwSendOptions *opts)
 }
 
 static void
-e_gw_sendoptions_write_settings (SoupSoapMessage *msg, const gchar *field_name, const gchar *value, const gchar *value_name, gboolean value_direct)
+e_gw_sendoptions_write_settings (SoupSoapMessage *msg,
+                                 const gchar *field_name,
+                                 const gchar *value,
+                                 const gchar *value_name,
+                                 gboolean value_direct)
 {
 	soup_soap_message_start_element (msg, "setting", NULL, NULL);
 
@@ -428,7 +438,10 @@ e_gw_sendoptions_write_settings (SoupSoapMessage *msg, const gchar *field_name,
 }
 
 static void
-set_status_tracking_changes (SoupSoapMessage *msg, EGwSendOptionsStatusTracking *n_sopts, EGwSendOptionsStatusTracking *o_sopts, const gchar *comp)
+set_status_tracking_changes (SoupSoapMessage *msg,
+                             EGwSendOptionsStatusTracking *n_sopts,
+                             EGwSendOptionsStatusTracking *o_sopts,
+                             const gchar *comp)
 {
 	gchar *value, *comp_name = NULL;
 
@@ -524,7 +537,9 @@ set_status_tracking_changes (SoupSoapMessage *msg, EGwSendOptionsStatusTracking
 }
 
 static void
-set_general_options_changes (SoupSoapMessage *msg, EGwSendOptionsGeneral *n_gopts, EGwSendOptionsGeneral *o_gopts)
+set_general_options_changes (SoupSoapMessage *msg,
+                             EGwSendOptionsGeneral *n_gopts,
+                             EGwSendOptionsGeneral *o_gopts)
 {
 	gchar *value;
 
@@ -585,7 +600,9 @@ set_general_options_changes (SoupSoapMessage *msg, EGwSendOptionsGeneral *n_gopt
 
 /* n_opts has the new options, o_opts has the old options settings */
 gboolean
-e_gw_sendoptions_form_message_to_modify (SoupSoapMessage *msg, EGwSendOptions *n_opts, EGwSendOptions *o_opts)
+e_gw_sendoptions_form_message_to_modify (SoupSoapMessage *msg,
+                                         EGwSendOptions *n_opts,
+                                         EGwSendOptions *o_opts)
 {
 	g_return_val_if_fail (n_opts != NULL || o_opts != NULL, FALSE);
 	g_return_val_if_fail (E_IS_GW_SENDOPTIONS (n_opts) || E_IS_GW_SENDOPTIONS (o_opts), FALSE);
diff --git a/src/server/e-gw-sendoptions.h b/src/server/e-gw-sendoptions.h
index cbb016f..00ad711 100644
--- a/src/server/e-gw-sendoptions.h
+++ b/src/server/e-gw-sendoptions.h
@@ -95,9 +95,9 @@ typedef struct {
 } EGwSendOptionsStatusTracking;
 
 GType e_gw_sendoptions_get_type (void);
-EGwSendOptions* e_gw_sendoptions_new_from_soap_parameter (SoupSoapParameter *param);
-EGwSendOptionsGeneral* e_gw_sendoptions_get_general_options (EGwSendOptions *opts);
-EGwSendOptionsStatusTracking* e_gw_sendoptions_get_status_tracking_options (EGwSendOptions *opts, const gchar *type);
+EGwSendOptions * e_gw_sendoptions_new_from_soap_parameter (SoupSoapParameter *param);
+EGwSendOptionsGeneral * e_gw_sendoptions_get_general_options (EGwSendOptions *opts);
+EGwSendOptionsStatusTracking * e_gw_sendoptions_get_status_tracking_options (EGwSendOptions *opts, const gchar *type);
 gboolean e_gw_sendoptions_form_message_to_modify (SoupSoapMessage *msg, EGwSendOptions *n_opts, EGwSendOptions *o_opts);
 EGwSendOptions * e_gw_sendoptions_new (void);
 
diff --git a/src/server/soap-test.c b/src/server/soap-test.c
index 221a8b7..50e375c 100644
--- a/src/server/soap-test.c
+++ b/src/server/soap-test.c
@@ -46,7 +46,8 @@ idle_cb (gpointer data)
 }
 
 gint
-main (gint argc, gchar *argv[])
+main (gint argc,
+      gchar *argv[])
 {
 	g_type_init ();
 	g_thread_init (NULL);
diff --git a/src/server/soup-soap-message.c b/src/server/soup-soap-message.c
index 888fc03..f458a5c 100644
--- a/src/server/soup-soap-message.c
+++ b/src/server/soup-soap-message.c
@@ -61,7 +61,9 @@ soup_soap_message_init (SoupSoapMessage *msg)
 }
 
 static xmlNsPtr
-fetch_ns (SoupSoapMessage *msg, const gchar *prefix, const gchar *ns_uri)
+fetch_ns (SoupSoapMessage *msg,
+          const gchar *prefix,
+          const gchar *ns_uri)
 {
 	SoupSoapMessagePrivate *priv = msg->priv;
 	xmlNsPtr ns = NULL;
@@ -92,9 +94,12 @@ fetch_ns (SoupSoapMessage *msg, const gchar *prefix, const gchar *ns_uri)
  * parsed).
  */
 SoupSoapMessage *
-soup_soap_message_new (const gchar *method, const gchar *uri_string,
-		       gboolean standalone, const gchar *xml_encoding,
-		       const gchar *env_prefix, const gchar *env_uri)
+soup_soap_message_new (const gchar *method,
+                       const gchar *uri_string,
+                       gboolean standalone,
+                       const gchar *xml_encoding,
+                       const gchar *env_prefix,
+                       const gchar *env_uri)
 {
 	SoupSoapMessage *msg;
 	SoupURI *uri;
@@ -125,9 +130,12 @@ soup_soap_message_new (const gchar *method, const gchar *uri_string,
  * Returns: the new #SoupSoapMessage
  */
 SoupSoapMessage *
-soup_soap_message_new_from_uri (const gchar *method, SoupURI *uri,
-				gboolean standalone, const gchar *xml_encoding,
-				const gchar *env_prefix, const gchar *env_uri)
+soup_soap_message_new_from_uri (const gchar *method,
+                                SoupURI *uri,
+                                gboolean standalone,
+                                const gchar *xml_encoding,
+                                const gchar *env_prefix,
+                                const gchar *env_uri)
 {
 	SoupSoapMessage *msg;
 	SoupSoapMessagePrivate *priv;
@@ -271,9 +279,9 @@ soup_soap_message_end_body (SoupSoapMessage *msg)
  */
 void
 soup_soap_message_start_element (SoupSoapMessage *msg,
-				 const gchar *name,
-				 const gchar *prefix,
-				 const gchar *ns_uri)
+                                 const gchar *name,
+                                 const gchar *prefix,
+                                 const gchar *ns_uri)
 {
 	SoupSoapMessagePrivate *priv;
 
@@ -322,9 +330,9 @@ soup_soap_message_end_element (SoupSoapMessage *msg)
  */
 void
 soup_soap_message_start_fault (SoupSoapMessage *msg,
-			       const gchar *faultcode,
-			       const gchar *faultstring,
-			       const gchar *faultfactor)
+                               const gchar *faultcode,
+                               const gchar *faultstring,
+                               const gchar *faultfactor)
 {
 	SoupSoapMessagePrivate *priv;
 
@@ -441,11 +449,11 @@ soup_soap_message_end_header (SoupSoapMessage *msg)
  */
 void
 soup_soap_message_start_header_element (SoupSoapMessage *msg,
-					const gchar *name,
-					gboolean must_understand,
-					const gchar *actor_uri,
-					const gchar *prefix,
-					const gchar *ns_uri)
+                                        const gchar *name,
+                                        gboolean must_understand,
+                                        const gchar *actor_uri,
+                                        const gchar *prefix,
+                                        const gchar *ns_uri)
 {
 	SoupSoapMessagePrivate *priv;
 
@@ -479,7 +487,8 @@ soup_soap_message_end_header_element (SoupSoapMessage *msg)
  * Writes the stringified value of @i as the current element's content.
  */
 void
-soup_soap_message_write_int (SoupSoapMessage *msg, glong i)
+soup_soap_message_write_int (SoupSoapMessage *msg,
+                             glong i)
 {
 	gchar *str = g_strdup_printf ("%ld", i);
 	soup_soap_message_write_string (msg, str);
@@ -494,7 +503,8 @@ soup_soap_message_write_int (SoupSoapMessage *msg, glong i)
  * Writes the stringified value of @d as the current element's content.
  */
 void
-soup_soap_message_write_double (SoupSoapMessage *msg, gdouble d)
+soup_soap_message_write_double (SoupSoapMessage *msg,
+                                gdouble d)
 {
 	gchar *str = g_strdup_printf ("%f", d);
 	soup_soap_message_write_string (msg, str);
@@ -511,7 +521,9 @@ soup_soap_message_write_double (SoupSoapMessage *msg, gdouble d)
  * element's content.
  **/
 void
-soup_soap_message_write_base64 (SoupSoapMessage *msg, const gchar *string, gint len)
+soup_soap_message_write_base64 (SoupSoapMessage *msg,
+                                const gchar *string,
+                                gint len)
 {
 	gchar *str = g_base64_encode ((const guchar *) string, len);
 	soup_soap_message_write_string (msg, str);
@@ -527,7 +539,8 @@ soup_soap_message_write_base64 (SoupSoapMessage *msg, const gchar *string, gint
  * content.
  **/
 void
-soup_soap_message_write_time (SoupSoapMessage *msg, const time_t *timeval)
+soup_soap_message_write_time (SoupSoapMessage *msg,
+                              const time_t *timeval)
 {
 	gchar *str = g_strchomp (ctime (timeval));
 	soup_soap_message_write_string (msg, str);
@@ -541,7 +554,8 @@ soup_soap_message_write_time (SoupSoapMessage *msg, const time_t *timeval)
  * Writes the @string as the current element's content.
  */
 void
-soup_soap_message_write_string (SoupSoapMessage *msg, const gchar *string)
+soup_soap_message_write_string (SoupSoapMessage *msg,
+                                const gchar *string)
 {
 	SoupSoapMessagePrivate *priv;
 
@@ -561,7 +575,9 @@ soup_soap_message_write_string (SoupSoapMessage *msg, const gchar *string)
  * element's content.
  */
 void
-soup_soap_message_write_buffer (SoupSoapMessage *msg, const gchar *buffer, gint len)
+soup_soap_message_write_buffer (SoupSoapMessage *msg,
+                                const gchar *buffer,
+                                gint len)
 {
 	SoupSoapMessagePrivate *priv;
 
@@ -580,7 +596,8 @@ soup_soap_message_write_buffer (SoupSoapMessage *msg, const gchar *buffer, gint
  * specifies the element's type name.
  */
 void
-soup_soap_message_set_element_type (SoupSoapMessage *msg, const gchar *xsi_type)
+soup_soap_message_set_element_type (SoupSoapMessage *msg,
+                                    const gchar *xsi_type)
 {
 	SoupSoapMessagePrivate *priv;
 
@@ -619,10 +636,10 @@ soup_soap_message_set_null (SoupSoapMessage *msg)
  */
 void
 soup_soap_message_add_attribute (SoupSoapMessage *msg,
-				 const gchar *name,
-				 const gchar *value,
-				 const gchar *prefix,
-				 const gchar *ns_uri)
+                                 const gchar *name,
+                                 const gchar *value,
+                                 const gchar *prefix,
+                                 const gchar *ns_uri)
 {
 	SoupSoapMessagePrivate *priv;
 
@@ -643,7 +660,9 @@ soup_soap_message_add_attribute (SoupSoapMessage *msg,
  * Adds a new XML namespace to the current element.
  */
 void
-soup_soap_message_add_namespace (SoupSoapMessage *msg, const gchar *prefix, const gchar *ns_uri)
+soup_soap_message_add_namespace (SoupSoapMessage *msg,
+                                 const gchar *prefix,
+                                 const gchar *ns_uri)
 {
 	SoupSoapMessagePrivate *priv;
 
@@ -663,7 +682,8 @@ soup_soap_message_add_namespace (SoupSoapMessage *msg, const gchar *prefix, cons
  * namespaced child elements fall into.
  */
 void
-soup_soap_message_set_default_namespace (SoupSoapMessage *msg, const gchar *ns_uri)
+soup_soap_message_set_default_namespace (SoupSoapMessage *msg,
+                                         const gchar *ns_uri)
 {
 	g_return_if_fail (SOUP_IS_SOAP_MESSAGE (msg));
 
@@ -679,7 +699,8 @@ soup_soap_message_set_default_namespace (SoupSoapMessage *msg, const gchar *ns_u
  * value of @enc_style.
  */
 void
-soup_soap_message_set_encoding_style (SoupSoapMessage *msg, const gchar *enc_style)
+soup_soap_message_set_encoding_style (SoupSoapMessage *msg,
+                                      const gchar *enc_style)
 {
 	SoupSoapMessagePrivate *priv;
 
@@ -755,7 +776,8 @@ soup_soap_message_persist (SoupSoapMessage *msg)
  * for the URI given.
  */
 const gchar *
-soup_soap_message_get_namespace_prefix (SoupSoapMessage *msg, const gchar *ns_uri)
+soup_soap_message_get_namespace_prefix (SoupSoapMessage *msg,
+                                        const gchar *ns_uri)
 {
 	SoupSoapMessagePrivate *priv;
 	xmlNsPtr ns = NULL;
diff --git a/src/server/soup-soap-response.c b/src/server/soup-soap-response.c
index b7a68d6..bcd1a41 100644
--- a/src/server/soup-soap-response.c
+++ b/src/server/soup-soap-response.c
@@ -99,7 +99,8 @@ soup_soap_response_new_from_string (const gchar *xmlstr)
 }
 
 static void
-parse_parameters (SoupSoapResponsePrivate *priv, xmlNodePtr xml_method)
+parse_parameters (SoupSoapResponsePrivate *priv,
+                  xmlNodePtr xml_method)
 {
 	xmlNodePtr tmp;
 
@@ -127,7 +128,8 @@ parse_parameters (SoupSoapResponsePrivate *priv, xmlNodePtr xml_method)
  * Returns: %TRUE if successful, %FALSE otherwise.
  */
 gboolean
-soup_soap_response_from_string (SoupSoapResponse *response, const gchar *xmlstr)
+soup_soap_response_from_string (SoupSoapResponse *response,
+                                const gchar *xmlstr)
 {
 	SoupSoapResponsePrivate *priv;
 	xmlDocPtr old_doc = NULL;
@@ -215,7 +217,8 @@ soup_soap_response_get_method_name (SoupSoapResponse *response)
  * Sets the method name on the given #SoupSoapResponse.
  */
 void
-soup_soap_response_set_method_name (SoupSoapResponse *response, const gchar *method_name)
+soup_soap_response_set_method_name (SoupSoapResponse *response,
+                                    const gchar *method_name)
 {
 	SoupSoapResponsePrivate *priv;
 
@@ -322,7 +325,8 @@ soup_soap_parameter_get_first_child (SoupSoapParameter *param)
  * are no children.
  */
 SoupSoapParameter *
-soup_soap_parameter_get_first_child_by_name (SoupSoapParameter *param, const gchar *name)
+soup_soap_parameter_get_first_child_by_name (SoupSoapParameter *param,
+                                             const gchar *name)
 {
 	SoupSoapParameter *tmp;
 
@@ -374,7 +378,7 @@ soup_soap_parameter_get_next_child (SoupSoapParameter *param)
  */
 SoupSoapParameter *
 soup_soap_parameter_get_next_child_by_name (SoupSoapParameter *param,
-					    const gchar *name)
+                                            const gchar *name)
 {
 	SoupSoapParameter *tmp;
 
@@ -401,7 +405,8 @@ soup_soap_parameter_get_next_child_by_name (SoupSoapParameter *param,
  * Returns: the property, which must be freed by the caller.
  */
 gchar *
-soup_soap_parameter_get_property (SoupSoapParameter *param, const gchar *prop_name)
+soup_soap_parameter_get_property (SoupSoapParameter *param,
+                                  const gchar *prop_name)
 {
 	xmlChar *xml_s;
 	gchar *s;
@@ -468,7 +473,7 @@ soup_soap_response_get_first_parameter (SoupSoapResponse *response)
  */
 SoupSoapParameter *
 soup_soap_response_get_first_parameter_by_name (SoupSoapResponse *response,
-						const gchar *name)
+                                                const gchar *name)
 {
 	SoupSoapResponsePrivate *priv;
 	GList *l;
@@ -499,7 +504,7 @@ soup_soap_response_get_first_parameter_by_name (SoupSoapResponse *response,
  */
 SoupSoapParameter *
 soup_soap_response_get_next_parameter (SoupSoapResponse *response,
-				       SoupSoapParameter *from)
+                                       SoupSoapParameter *from)
 {
 	SoupSoapResponsePrivate *priv;
 	GList *l;
@@ -528,8 +533,8 @@ soup_soap_response_get_next_parameter (SoupSoapResponse *response,
  */
 SoupSoapParameter *
 soup_soap_response_get_next_parameter_by_name (SoupSoapResponse *response,
-					       SoupSoapParameter *from,
-					       const gchar *name)
+                                               SoupSoapParameter *from,
+                                               const gchar *name)
 {
 	SoupSoapParameter *param;
 
@@ -562,7 +567,8 @@ soup_xml_real_node (xmlNode *node)
 }
 
 gint
-soup_soap_response_dump_response (SoupSoapResponse *response, FILE *buffer)
+soup_soap_response_dump_response (SoupSoapResponse *response,
+                                  FILE *buffer)
 {
 	xmlChar *xmlbuff;
 	gint buffersize, ret;



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