[evolution-data-server/gnome-3-6] Coding style and whitespace cleanup.

[Matthew Barnes <mbarnes src gnome org>]

commit 2f8dcbeb4ab33852ffd44d1acc57d22f3fadd623
Author: Matthew Barnes <mbarnes redhat com>
Date:   Fri Nov 9 21:54:46 2012 -0500

    Coding style and whitespace cleanup.

 camel/camel-certdb.c                             |    9 ++++-----
 camel/camel-imapx-server.c                       |    2 +-
 camel/camel-mime-utils.c                         |    2 +-
 camel/providers/pop3/camel-pop3-engine.c         |    8 ++++----
 camel/providers/pop3/camel-pop3-folder.c         |    8 ++++----
 libebackend/e-collection-backend.c               |    9 +++++----
 modules/online-accounts/goaewsclient.c           |    6 +++---
 modules/online-accounts/module-online-accounts.c |    9 +++++++--
 8 files changed, 29 insertions(+), 24 deletions(-)
---
diff --git a/camel/camel-certdb.c b/camel/camel-certdb.c
index 94508fb..6176fe4 100644
--- a/camel/camel-certdb.c
+++ b/camel/camel-certdb.c
@@ -70,7 +70,7 @@ typedef struct {
 
 static CamelCertDBKey *
 certdb_key_new (const gchar *hostname,
-		const gchar *fingerprint)
+                const gchar *fingerprint)
 {
 	CamelCertDBKey *key;
 
@@ -108,7 +108,7 @@ certdb_key_hash (gconstpointer ptr)
 
 static gboolean
 certdb_key_equal (gconstpointer ptr1,
-		  gconstpointer ptr2)
+                  gconstpointer ptr2)
 {
 	const CamelCertDBKey *key1 = ptr1, *key2 = ptr2;
 	gboolean same_hostname;
@@ -128,7 +128,6 @@ certdb_key_equal (gconstpointer ptr1,
 		return g_ascii_strcasecmp (key1->fingerprint, key2->fingerprint) == 0;
 	}
 
-	
 	return same_hostname;
 }
 
@@ -511,7 +510,7 @@ camel_certdb_touch (CamelCertDB *certdb)
 CamelCert *
 camel_certdb_get_host (CamelCertDB *certdb,
                        const gchar *hostname,
-		       const gchar *fingerprint)
+                       const gchar *fingerprint)
 {
 	CamelCert *cert;
 	CamelCertDBKey *key;
@@ -581,7 +580,7 @@ camel_certdb_put (CamelCertDB *certdb,
 void
 camel_certdb_remove_host (CamelCertDB *certdb,
                           const gchar *hostname,
-			  const gchar *fingerprint)
+                          const gchar *fingerprint)
 {
 	CamelCert *cert;
 	CamelCertDBKey *key;
diff --git a/camel/camel-imapx-server.c b/camel/camel-imapx-server.c
index 8b3a6e6..bf1a0bf 100644
--- a/camel/camel-imapx-server.c
+++ b/camel/camel-imapx-server.c
@@ -975,7 +975,7 @@ imapx_command_start_next (CamelIMAPXServer *is,
 						is->tagprefix,
 						"waiting for idle to stop \n");
 					/* if there are more pending commands,
-					   then they should be processed too */
+					 * then they should be processed too */
 					break;
 
 				case IMAPX_IDLE_STOP_ERROR:
diff --git a/camel/camel-mime-utils.c b/camel/camel-mime-utils.c
index f4395b1..08324e2 100644
--- a/camel/camel-mime-utils.c
+++ b/camel/camel-mime-utils.c
@@ -2052,7 +2052,7 @@ header_decode_atom (const gchar **in)
 
 static gboolean
 extract_rfc2047_encoded_word (const gchar **in,
-			      gchar **word)
+                              gchar **word)
 {
 	const gchar *inptr = *in, *start;
 
diff --git a/camel/providers/pop3/camel-pop3-engine.c b/camel/providers/pop3/camel-pop3-engine.c
index 7ee2843..44aa4c3 100644
--- a/camel/providers/pop3/camel-pop3-engine.c
+++ b/camel/providers/pop3/camel-pop3-engine.c
@@ -135,7 +135,7 @@ CamelPOP3Engine *
 camel_pop3_engine_new (CamelStream *source,
                        guint32 flags,
                        GCancellable *cancellable,
-		       GError **error)
+                       GError **error)
 {
 	CamelPOP3Engine *pe;
 
@@ -165,7 +165,7 @@ camel_pop3_engine_new (CamelStream *source,
 gboolean
 camel_pop3_engine_reget_capabilities (CamelPOP3Engine *engine,
                                       GCancellable *cancellable,
-				      GError **error)
+                                      GError **error)
 {
 	g_return_val_if_fail (CAMEL_IS_POP3_ENGINE (engine), FALSE);
 
@@ -189,7 +189,7 @@ static void
 cmd_capa (CamelPOP3Engine *pe,
           CamelPOP3Stream *stream,
           GCancellable *cancellable,
-	  GError **error,
+          GError **error,
           gpointer data)
 {
 	guchar *line, *tok, *next;
@@ -234,7 +234,7 @@ cmd_capa (CamelPOP3Engine *pe,
 static gboolean
 get_capabilities (CamelPOP3Engine *pe,
                   GCancellable *cancellable,
-		  GError **error)
+                  GError **error)
 {
 	CamelPOP3Command *pc;
 	GError *local_error = NULL;
diff --git a/camel/providers/pop3/camel-pop3-folder.c b/camel/providers/pop3/camel-pop3-folder.c
index 4c0a407..5e6f438 100644
--- a/camel/providers/pop3/camel-pop3-folder.c
+++ b/camel/providers/pop3/camel-pop3-folder.c
@@ -63,7 +63,7 @@ static void
 cmd_uidl (CamelPOP3Engine *pe,
           CamelPOP3Stream *stream,
           GCancellable *cancellable,
-	  GError **error,
+          GError **error,
           gpointer data)
 {
 	gint ret;
@@ -98,7 +98,7 @@ static void
 cmd_builduid (CamelPOP3Engine *pe,
               CamelPOP3Stream *stream,
               GCancellable *cancellable,
-	      GError **error,
+              GError **error,
               gpointer data)
 {
 	GChecksum *checksum;
@@ -147,7 +147,7 @@ static void
 cmd_list (CamelPOP3Engine *pe,
           CamelPOP3Stream *stream,
           GCancellable *cancellable,
-	  GError **error,
+          GError **error,
           gpointer data)
 {
 	gint ret;
@@ -322,7 +322,7 @@ static void
 cmd_tocache (CamelPOP3Engine *pe,
              CamelPOP3Stream *stream,
              GCancellable *cancellable,
-	     GError **error,
+             GError **error,
              gpointer data)
 {
 	CamelPOP3FolderInfo *fi = data;
diff --git a/libebackend/e-collection-backend.c b/libebackend/e-collection-backend.c
index 4593f00..f00298f 100644
--- a/libebackend/e-collection-backend.c
+++ b/libebackend/e-collection-backend.c
@@ -351,11 +351,12 @@ collection_backend_child_is_mail (ESource *child_source)
 
 static gboolean
 include_master_source_enabled_transform (GBinding *binding,
-					 const GValue *source_value,
-					 GValue *target_value,
-					 gpointer backend)
+                                         const GValue *source_value,
+                                         GValue *target_value,
+                                         gpointer backend)
 {
-	g_value_set_boolean (target_value,
+	g_value_set_boolean (
+		target_value,
 		g_value_get_boolean (source_value) &&
 		e_source_get_enabled (e_backend_get_source (backend)));
 
diff --git a/modules/online-accounts/goaewsclient.c b/modules/online-accounts/goaewsclient.c
index e59e149..4fc1ab4 100644
--- a/modules/online-accounts/goaewsclient.c
+++ b/modules/online-accounts/goaewsclient.c
@@ -116,7 +116,7 @@ ews_autodiscover_cancelled_cb (GCancellable *cancellable,
 
 static gboolean
 has_suffix_icmp (const gchar *text,
-		 const gchar *suffix)
+                 const gchar *suffix)
 {
 	gint ii, tlen, slen;
 
@@ -130,7 +130,7 @@ has_suffix_icmp (const gchar *text,
 		return FALSE;
 
 	for (ii = 0; ii < slen; ii++) {
-		if (g_ascii_tolower (text[tlen - ii - 1]) != 
+		if (g_ascii_tolower (text[tlen - ii - 1]) !=
 		    g_ascii_tolower (suffix[slen - ii - 1]))
 			break;
 	}
@@ -158,7 +158,7 @@ ews_autodiscover_parse_protocol (xmlNode *node,
 			const gchar *oab_url;
 
 			content = xmlNodeGetContent (node);
-			oab_url = (const char *) content;
+			oab_url = (const gchar *) content;
 
 			if (!has_suffix_icmp (oab_url, "oab.xml")) {
 				gchar *tmp;
diff --git a/modules/online-accounts/module-online-accounts.c b/modules/online-accounts/module-online-accounts.c
index 7a48124..8232614 100644
--- a/modules/online-accounts/module-online-accounts.c
+++ b/modules/online-accounts/module-online-accounts.c
@@ -172,7 +172,7 @@ online_accounts_new_source (EOnlineAccounts *extension)
 #ifdef HAVE_GOA_PASSWORD_BASED
 static void
 replace_host (gchar **url,
-	      const gchar *host)
+              const gchar *host)
 {
 	SoupURI *uri;
 
@@ -254,6 +254,7 @@ online_accounts_config_exchange (EOnlineAccounts *extension,
 	/* This will be NULL if Evolution-EWS is not installed. */
 	if (source_extension != NULL) {
 		GoaAccount *goa_account;
+		CamelSettings *settings;
 		gchar *host, *user, *email;
 
 		goa_account = goa_object_peek_account (goa_object);
@@ -273,7 +274,11 @@ online_accounts_config_exchange (EOnlineAccounts *extension,
 			"email", email,
 			NULL);
 
-		g_object_set (e_source_camel_get_settings (E_SOURCE_CAMEL (source_extension)),
+		settings = e_source_camel_get_settings (
+			E_SOURCE_CAMEL (source_extension));
+
+		g_object_set (
+			settings,
 			"host", host,
 			"user", user,
 			"email", email,