[evolution-data-server] Whitespace and coding style cleanups.

[Matthew Barnes <mbarnes src gnome org>]

commit a46e1be8c01f148c7424aebbb0e39847c3c98ea4
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat May 7 12:20:18 2011 -0400

    Whitespace and coding style cleanups.

 camel/camel-sasl-ntlm.c                    |   26 +++++++++++++-------------
 camel/camel-url.c                          |    1 -
 camel/providers/imap/camel-imap-command.c  |    2 +-
 camel/providers/imap/camel-imap-provider.c |    2 +-
 camel/providers/imapx/camel-imapx-server.c |    2 +-
 camel/providers/imapx/camel-imapx-server.h |    2 +-
 camel/providers/nntp/camel-nntp-provider.c |    2 +-
 libedataserverui/e-categories-editor.c     |    5 ++---
 libedataserverui/e-categories-editor.h     |    2 +-
 libedataserverui/e-categories-selector.c   |    2 +-
 libedataserverui/e-category-editor.c       |    2 +-
 11 files changed, 23 insertions(+), 25 deletions(-)
---
diff --git a/camel/camel-sasl-ntlm.c b/camel/camel-sasl-ntlm.c
index 012fd8f..b0fbd7b 100644
--- a/camel/camel-sasl-ntlm.c
+++ b/camel/camel-sasl-ntlm.c
@@ -688,9 +688,9 @@ sasl_ntlm_challenge_sync (CamelSasl *sasl,
 	if (priv->helper_stream && !url->passwd) {
 		guchar *data;
 		gsize length = 0;
-		char buf[1024];
+		gchar buf[1024];
 		gsize s = 0;
-		buf [0] = 0;
+		buf[0] = 0;
 
 		if (!token || !token->len) {
 			if (priv->type1_msg) {
@@ -706,7 +706,7 @@ sasl_ntlm_challenge_sync (CamelSasl *sasl,
 			if (camel_stream_printf (priv->helper_stream, "TT %s\n",
 						 type2) >= 0 &&
 			   (s = camel_stream_read (priv->helper_stream, buf,
-				   sizeof(buf), cancellable, NULL)) > 4 &&
+				   sizeof (buf), cancellable, NULL)) > 4 &&
 			   buf[0] == 'K' && buf[1] == 'K' && buf[2] == ' ' &&
 			   buf[s-1] == '\n') {
 				buf[s-1] = 0;
@@ -740,14 +740,14 @@ sasl_ntlm_challenge_sync (CamelSasl *sasl,
 		} sess_nonce;
 		GChecksum *md5;
 		guint8 digest[16];
-		gsize digest_len = sizeof(digest);
+		gsize digest_len = sizeof (digest);
 
-		sess_nonce.clnt[0] = g_random_int();
-		sess_nonce.clnt[1] = g_random_int();
+		sess_nonce.clnt[0] = g_random_int ();
+		sess_nonce.clnt[1] = g_random_int ();
 
 		/* LM response is 8-byte client nonce, NUL-padded to 24 */
-		memcpy(lm_resp, sess_nonce.clnt, 8);
-		memset(lm_resp + 8, 0, 16);
+		memcpy (lm_resp, sess_nonce.clnt, 8);
+		memset (lm_resp + 8, 0, 16);
 
 		/* Session nonce is client nonce + server nonce */
 		memcpy (sess_nonce.srv,
@@ -755,8 +755,8 @@ sasl_ntlm_challenge_sync (CamelSasl *sasl,
 
 		/* Take MD5 of session nonce */
 		md5 = g_checksum_new (G_CHECKSUM_MD5);
-		g_checksum_update (md5, (void *)&sess_nonce, 16);
-		g_checksum_get_digest (md5, (void *)&digest, &digest_len);
+		g_checksum_update (md5, (gpointer)&sess_nonce, 16);
+		g_checksum_get_digest (md5, (gpointer)&digest, &digest_len);
 		g_checksum_get_digest (md5, digest, &digest_len);
 
 		g_checksum_free (md5);
@@ -839,7 +839,7 @@ sasl_ntlm_try_empty_password_sync (CamelSasl *sasl,
 	gchar buf[1024];
 	gsize s;
 	gchar *command;
-	int ret;
+	gint ret;
 
 	if (access (NTLM_AUTH_HELPER, X_OK))
 		return FALSE;
@@ -853,7 +853,7 @@ sasl_ntlm_try_empty_password_sync (CamelSasl *sasl,
 			"%s --helper-protocol ntlmssp-client-1 "
 			"--use-cached-creds --username '%s' "
 			"--domain '%.*s'", NTLM_AUTH_HELPER,
-			user + 1, (int)(user - url->user), 
+			user + 1, (gint)(user - url->user),
 			url->user);
 	} else {
 		command = g_strdup_printf (
@@ -872,7 +872,7 @@ sasl_ntlm_try_empty_password_sync (CamelSasl *sasl,
 		g_object_unref (stream);
 		return FALSE;
 	}
-	s = camel_stream_read (stream, buf, sizeof(buf), cancellable, NULL);
+	s = camel_stream_read (stream, buf, sizeof (buf), cancellable, NULL);
 	if (s < 4) {
 		g_object_unref (stream);
 		return FALSE;
diff --git a/camel/camel-url.c b/camel/camel-url.c
index 1dedf5f..7c565ee 100644
--- a/camel/camel-url.c
+++ b/camel/camel-url.c
@@ -481,7 +481,6 @@ camel_url_set_user (CamelURL *url,
 	url->user = g_strdup (user);
 }
 
-
 /**
  * camel_url_set_authmech:
  * @url: a #CamelURL
diff --git a/camel/providers/imap/camel-imap-command.c b/camel/providers/imap/camel-imap-command.c
index 8194ff3..372d162 100644
--- a/camel/providers/imap/camel-imap-command.c
+++ b/camel/providers/imap/camel-imap-command.c
@@ -399,7 +399,7 @@ camel_imap_command_response (CamelImapStore *store,
 			url = camel_service_get_camel_url (service);
 			session = camel_service_get_session (service);
 
-			msg = g_strdup_printf(
+			msg = g_strdup_printf (
 				_("Alert from IMAP server %s %s:\n%s"),
 				url->user, url->host, respbuf + 12);
 			camel_session_alert_user (
diff --git a/camel/providers/imap/camel-imap-provider.c b/camel/providers/imap/camel-imap-provider.c
index bc1d3f7..3404ec1 100644
--- a/camel/providers/imap/camel-imap-provider.c
+++ b/camel/providers/imap/camel-imap-provider.c
@@ -78,7 +78,7 @@ CamelProviderPortEntry imap_port_entries[] = {
 				   		{ 143, N_("IMAP default port"), FALSE },
 						{ 993, N_("IMAP over SSL"), TRUE },
 						{ 0, NULL, 0 }
-			    		     };
+					     };
 
 static CamelProvider imap_provider = {
 	"imap",
diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c
index f99d4bf..1d22f28 100644
--- a/camel/providers/imapx/camel-imapx-server.c
+++ b/camel/providers/imapx/camel-imapx-server.c
@@ -5207,7 +5207,7 @@ imapx_server_get_message (CamelIMAPXServer *is,
 		   we could just use the queue lock with a GCond, but instead
 		   we have to use a GMutex. I miss the kernel waitqueues. */
 		do {
-			int this;
+			gint this;
 
 			g_mutex_lock (is->fetch_mutex);
 			this = is->fetch_count;
diff --git a/camel/providers/imapx/camel-imapx-server.h b/camel/providers/imapx/camel-imapx-server.h
index 67a1bb0..d89dfb7 100644
--- a/camel/providers/imapx/camel-imapx-server.h
+++ b/camel/providers/imapx/camel-imapx-server.h
@@ -122,7 +122,7 @@ struct _CamelIMAPXServer {
 	/* used to synchronize duplicate get_message requests */
 	GCond *fetch_cond;
 	GMutex *fetch_mutex;
-	int fetch_count;
+	gint fetch_count;
 };
 
 struct _CamelIMAPXServerClass {
diff --git a/camel/providers/nntp/camel-nntp-provider.c b/camel/providers/nntp/camel-nntp-provider.c
index 88829f0..73367ba 100644
--- a/camel/providers/nntp/camel-nntp-provider.c
+++ b/camel/providers/nntp/camel-nntp-provider.c
@@ -51,7 +51,7 @@ static CamelProviderConfEntry nntp_conf_entries[] = {
 CamelProviderPortEntry nntp_port_entries[] = {
 						  { 119, N_("Default NNTP port"), FALSE },
 						  { 563, N_("NNTP over SSL"), TRUE },
-					    	  { 0, NULL, 0 }
+						  { 0, NULL, 0 }
 					     };
 
 static CamelProvider news_provider = {
diff --git a/libedataserverui/e-categories-editor.c b/libedataserverui/e-categories-editor.c
index 7a4e208..35184c1 100644
--- a/libedataserverui/e-categories-editor.c
+++ b/libedataserverui/e-categories-editor.c
@@ -68,7 +68,6 @@ entry_changed_cb (GtkEntry *entry,
 	g_signal_emit (editor, signals[ENTRY_CHANGED], 0);
 }
 
-
 static void
 categories_editor_selection_changed_cb (ECategoriesEditor *editor,
                                         GtkTreeSelection *selection)
@@ -104,7 +103,7 @@ static void
 new_button_clicked_cb (GtkButton *button,
                        ECategoriesEditor *editor)
 {
-	ECategoryEditor *cat_editor = e_category_editor_new();
+	ECategoryEditor *cat_editor = e_category_editor_new ();
 
 	e_category_editor_create_category (cat_editor);
 
@@ -115,7 +114,7 @@ static void
 edit_button_clicked_cb (GtkButton *button,
                         ECategoriesEditor *editor)
 {
-	ECategoryEditor *cat_editor = e_category_editor_new();
+	ECategoryEditor *cat_editor = e_category_editor_new ();
 	const gchar *category;
 
 	category = e_categories_selector_get_selected (
diff --git a/libedataserverui/e-categories-editor.h b/libedataserverui/e-categories-editor.h
index 2789c0d..2896987 100644
--- a/libedataserverui/e-categories-editor.h
+++ b/libedataserverui/e-categories-editor.h
@@ -67,7 +67,7 @@ void		e_categories_editor_set_categories
 						 const gchar *categories);
 gboolean	e_categories_editor_get_entry_visible
 						(ECategoriesEditor *editor);
-void 		e_categories_editor_set_entry_visible
+void		e_categories_editor_set_entry_visible
 						(ECategoriesEditor *editor,
 						 gboolean entry_visible);
 
diff --git a/libedataserverui/e-categories-selector.c b/libedataserverui/e-categories-selector.c
index addd266..09a7ea1 100644
--- a/libedataserverui/e-categories-selector.c
+++ b/libedataserverui/e-categories-selector.c
@@ -332,7 +332,7 @@ e_categories_selector_init (ECategoriesSelector *selector)
 
 	g_signal_connect (
 		selector, "key-press-event",
-		G_CALLBACK(categories_selector_key_press_event), NULL);
+		G_CALLBACK (categories_selector_key_press_event), NULL);
 
 	e_categories_register_change_listener (
 		G_CALLBACK (categories_selector_listener_cb), selector);
diff --git a/libedataserverui/e-category-editor.c b/libedataserverui/e-category-editor.c
index 958a578..e96e079 100644
--- a/libedataserverui/e-category-editor.c
+++ b/libedataserverui/e-category-editor.c
@@ -152,7 +152,7 @@ e_category_editor_init (ECategoryEditor *editor)
 		chooser_dialog, "update-preview",
 		G_CALLBACK (update_preview), NULL);
 
-	preview = gtk_image_new();
+	preview = gtk_image_new ();
 	gtk_file_chooser_set_preview_widget (
 		GTK_FILE_CHOOSER (chooser_dialog), preview);
 	gtk_file_chooser_set_preview_widget_active (