[evolution-data-server] Coding style and whitespace cleanups.

[Matthew Barnes <mbarnes src gnome org>]

commit 8de0685fd0c4b52487963659c0ff598fecfe436f
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Jun 6 16:20:57 2010 -0400

    Coding style and whitespace cleanups.

 addressbook/backends/google/util.c                 |    8 ++++----
 .../backends/webdav/e-book-backend-webdav.c        |    2 +-
 calendar/libedata-cal/e-data-cal-factory.c         |    2 +-
 camel/camel-gpg-context.c                          |    2 +-
 camel/camel-session.c                              |    6 +++---
 camel/providers/imap/camel-imap-store.c            |    4 ++--
 camel/providers/imapx/camel-imapx-server.c         |    4 ++--
 camel/providers/nntp/camel-nntp-store.c            |    4 ++--
 camel/providers/smtp/camel-smtp-transport.c        |    4 ++--
 libedataserverui/e-name-selector-dialog.c          |    5 ++---
 10 files changed, 20 insertions(+), 21 deletions(-)
---
diff --git a/addressbook/backends/google/util.c b/addressbook/backends/google/util.c
index 1a685cf..e3e7166 100644
--- a/addressbook/backends/google/util.c
+++ b/addressbook/backends/google/util.c
@@ -982,10 +982,10 @@ gdata_gd_organization_from_attribute (EVCardAttribute *attr, gboolean *have_prim
 		/* TITLE and ROLE are dealt with separately in _gdata_entry_update_from_e_contact() */
 
 		__debug__ ("New %sorganization entry %s (%s/%s)",
-		           gdata_gd_organization_is_primary (org) ? "primary " : "",
-		           gdata_gd_organization_get_name (org),
-		           gdata_gd_organization_get_relation_type (org),
-		           gdata_gd_organization_get_label (org));
+			   gdata_gd_organization_is_primary (org) ? "primary " : "",
+			   gdata_gd_organization_get_name (org),
+			   gdata_gd_organization_get_relation_type (org),
+			   gdata_gd_organization_get_label (org));
 	}
 
 	return org;
diff --git a/addressbook/backends/webdav/e-book-backend-webdav.c b/addressbook/backends/webdav/e-book-backend-webdav.c
index c34c5c4..11493e5 100644
--- a/addressbook/backends/webdav/e-book-backend-webdav.c
+++ b/addressbook/backends/webdav/e-book-backend-webdav.c
@@ -774,7 +774,7 @@ check_addressbook_changed (EBookBackendWebdav *webdav, gchar **new_ctag)
 			const gchar *GETCTAG_XPATH_STATUS = "string(/D:multistatus/D:response/D:propstat/D:prop/D:getctag/../../D:status)";
 			const gchar *GETCTAG_XPATH_VALUE = "string(/D:multistatus/D:response/D:propstat/D:prop/D:getctag)";
 			xmlXPathContextPtr xpctx;
-	
+
 			xpctx = xmlXPathNewContext (xml);
 			xmlXPathRegisterNs (xpctx, (xmlChar *) "D", (xmlChar *) "DAV:");
 
diff --git a/calendar/libedata-cal/e-data-cal-factory.c b/calendar/libedata-cal/e-data-cal-factory.c
index efc19c9..d22e41b 100644
--- a/calendar/libedata-cal/e-data-cal-factory.c
+++ b/calendar/libedata-cal/e-data-cal-factory.c
@@ -706,7 +706,7 @@ main (gint argc, gchar **argv)
 	DBusGProxy *bus_proxy;
 	guint32 request_name_ret;
 	EOfflineListener *eol;
-	
+
 	setlocale (LC_ALL, "");
 	bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
diff --git a/camel/camel-gpg-context.c b/camel/camel-gpg-context.c
index b7000d5..f6c390d 100644
--- a/camel/camel-gpg-context.c
+++ b/camel/camel-gpg-context.c
@@ -929,7 +929,7 @@ gpg_ctx_parse_status (struct _GpgCtx *gpg,
 				if (str && *str && i == 2) {
 					struct {
 						gint gpg_hash_algo;
-						CamelCipherHash camel_hash_algo; 
+						CamelCipherHash camel_hash_algo;
 					} hash_algos[] = {
 						/* the rest are deprecated/not supported by gpg any more */
 						{  2, CAMEL_CIPHER_HASH_SHA1 },
diff --git a/camel/camel-session.c b/camel/camel-session.c
index 037b87b..51b6f1e 100644
--- a/camel/camel-session.c
+++ b/camel/camel-session.c
@@ -64,8 +64,8 @@ struct _CamelSessionPrivate {
 	GHashTable *thread_msg_op;
 	GHashTable *junk_headers;
 
-	char *socks_proxy_host;
-	int socks_proxy_port;
+	gchar *socks_proxy_host;
+	gint socks_proxy_port;
 
 	guint check_junk        : 1;
 	guint network_available : 1;
@@ -1117,7 +1117,7 @@ camel_session_unlock (CamelSession *session,
  * Since: 3.0
  */
 void
-camel_session_set_socks_proxy (CamelSession *session, const gchar *socks_host, int socks_port)
+camel_session_set_socks_proxy (CamelSession *session, const gchar *socks_host, gint socks_port)
 {
 	g_return_if_fail (CAMEL_IS_SESSION (session));
 
diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index fce179a..8bfea3b 100644
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -401,8 +401,8 @@ connect_to_server (CamelService *service, struct addrinfo *ai, gint ssl_mode, Ca
 {
 	CamelImapStore *store = (CamelImapStore *) service;
 	CamelSession *session;
-	char *socks_host;
-	int socks_port;
+	gchar *socks_host;
+	gint socks_port;
 	CamelImapResponse *response;
 	CamelStream *tcp_stream;
 	CamelSockOptData sockopt;
diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c
index c81c17d..0b8fda3 100644
--- a/camel/providers/imapx/camel-imapx-server.c
+++ b/camel/providers/imapx/camel-imapx-server.c
@@ -2122,8 +2122,8 @@ gboolean
 imapx_connect_to_server (CamelIMAPXServer *is, CamelException *ex)
 {
 	CamelStream * tcp_stream = NULL;
-	char *socks_host;
-	int socks_port;
+	gchar *socks_host;
+	gint socks_port;
 	CamelSockOptData sockopt;
 	gint ret, ssl_mode = 0;
 
diff --git a/camel/providers/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c
index cc9dbd4..56e70dd 100644
--- a/camel/providers/nntp/camel-nntp-store.c
+++ b/camel/providers/nntp/camel-nntp-store.c
@@ -210,8 +210,8 @@ connect_to_server (CamelService *service, struct addrinfo *ai, gint ssl_mode, Ca
 	CamelNNTPStore *store = (CamelNNTPStore *) service;
 	CamelDiscoStore *disco_store = (CamelDiscoStore*) service;
 	CamelSession *session;
-	char *socks_host;
-	int socks_port;
+	gchar *socks_host;
+	gint socks_port;
 	CamelStream *tcp_stream;
 	gboolean retval = FALSE;
 	guchar *buf;
diff --git a/camel/providers/smtp/camel-smtp-transport.c b/camel/providers/smtp/camel-smtp-transport.c
index c1fc31f..f60d012 100644
--- a/camel/providers/smtp/camel-smtp-transport.c
+++ b/camel/providers/smtp/camel-smtp-transport.c
@@ -190,8 +190,8 @@ connect_to_server (CamelService *service,
 {
 	CamelSmtpTransport *transport = CAMEL_SMTP_TRANSPORT (service);
 	CamelSession *session;
-	char *socks_host;
-	int socks_port;
+	gchar *socks_host;
+	gint socks_port;
 	CamelStream *tcp_stream;
 	gchar *respbuf = NULL;
 	gint ret;
diff --git a/libedataserverui/e-name-selector-dialog.c b/libedataserverui/e-name-selector-dialog.c
index 26c2d28..2ca361a 100644
--- a/libedataserverui/e-name-selector-dialog.c
+++ b/libedataserverui/e-name-selector-dialog.c
@@ -550,7 +550,6 @@ make_tree_view_for_section (ENameSelectorDialog *name_selector_dialog, EDestinat
 	gtk_tree_view_set_headers_visible (tree_view, FALSE);
 	gtk_tree_view_set_model (tree_view, GTK_TREE_MODEL (destination_store));
 
-
 	return tree_view;
 }
 
@@ -558,8 +557,8 @@ static void
 setup_section_button (ENameSelectorDialog *name_selector_dialog,
 		      GtkButton *button,
 		      double halign,
-		      const char *label_text,
-		      const char *icon_name,
+		      const gchar *label_text,
+		      const gchar *icon_name,
 		      gboolean icon_before_label)
 {
 	GtkWidget *alignment;