Coding style and whitespace cleanup.

15 files changed, 15 insertions, 25 deletions

diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c
index aeb8a1e2b5..3c2436dc27 100644
--- a/addressbook/conduit/address-conduit.c
+++ b/addressbook/conduit/address-conduit.c
@@ -1037,7 +1037,7 @@ is_syncable (EAddrConduitContext *ctxt, EAddrLocalRecord *local)
 }
 
 static void
-set_contact_text (EContact *contact, EContactField field, struct Address address, 
+set_contact_text (EContact *contact, EContactField field, struct Address address,
 	gint entry, const gchar *pilot_charset)
 {
 	gchar *text = NULL;
@@ -1610,7 +1610,7 @@ pre_sync (GnomePilotConduit *conduit,
 	ctxt->dbi = dbi;
 
 #ifdef PILOT_LINK_0_12
-	if(NULL == dbi->pilotInfo->pilot_charset)
+	if (NULL == dbi->pilotInfo->pilot_charset)
 		ctxt->pilot_charset = NULL;
 	else
 		ctxt->pilot_charset = g_strdup(dbi->pilotInfo->pilot_charset);
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index f31b25de95..d9a0e1ab86 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -38,7 +38,6 @@
 #include <libedataserverui/e-category-completion.h>
 #include <libedataserverui/e-source-combo-box.h>
 
-
 #include "addressbook/util/addressbook.h"
 #include "addressbook/printing/e-contact-print.h"
 #include "addressbook/gui/widgets/eab-gui-util.h"
diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
index 6aa88387b4..a2466508ee 100644
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ b/calendar/conduits/calendar/calendar-conduit.c
@@ -1515,7 +1515,7 @@ pre_sync (GnomePilotConduit *conduit,
 
 	ctxt->dbi = dbi;
 #ifdef PILOT_LINK_0_12
-	if(NULL == dbi->pilotInfo->pilot_charset)
+	if (NULL == dbi->pilotInfo->pilot_charset)
 		ctxt->pilot_charset = NULL;
 	else
 		 ctxt->pilot_charset = g_strdup(dbi->pilotInfo->pilot_charset);
diff --git a/calendar/conduits/memo/memo-conduit.c b/calendar/conduits/memo/memo-conduit.c
index 5b25ca6da9..d04e42b156 100644
--- a/calendar/conduits/memo/memo-conduit.c
+++ b/calendar/conduits/memo/memo-conduit.c
@@ -811,7 +811,7 @@ pre_sync (GnomePilotConduit *conduit,
 	ctxt->client = NULL;
 
 #ifdef PILOT_LINK_0_12
-	if(NULL == dbi->pilotInfo->pilot_charset)
+	if (NULL == dbi->pilotInfo->pilot_charset)
 		ctxt->pilot_charset = NULL;
 	else
 		ctxt->pilot_charset = g_strdup(dbi->pilotInfo->pilot_charset);
diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c
index 3620582d80..59d3ad9b4b 100644
--- a/calendar/conduits/todo/todo-conduit.c
+++ b/calendar/conduits/todo/todo-conduit.c
@@ -1006,7 +1006,7 @@ pre_sync (GnomePilotConduit *conduit,
 	ctxt->client = NULL;
 
 #ifdef PILOT_LINK_0_12
-	if(NULL == dbi->pilotInfo->pilot_charset)
+	if (NULL == dbi->pilotInfo->pilot_charset)
 		ctxt->pilot_charset = NULL;
 	else
 		ctxt->pilot_charset = g_strdup(dbi->pilotInfo->pilot_charset);
@@ -1173,7 +1173,7 @@ post_sync (GnomePilotConduit *conduit,
 		e_cal_free_change_list (changed);
 	g_free (change_id);
 	if (ctxt->pilot_charset)
-		g_free (ctxt->pilot_charset);	
+		g_free (ctxt->pilot_charset);
 	LOG (g_message ( "---------------------------------------------------------\n" ));
 
 	return 0;
diff --git a/e-util/e-alert-dialog.c b/e-util/e-alert-dialog.c
index dd4d399f36..5f8cdc178d 100644
--- a/e-util/e-alert-dialog.c
+++ b/e-util/e-alert-dialog.c
@@ -267,7 +267,6 @@ e_alert_dialog_class_init (EAlertDialogClass *klass)
 							     G_PARAM_STATIC_STRINGS));
 }
 
-
 GtkWidget*
 e_alert_dialog_new (GtkWindow *parent, EAlert *alert)
 {
@@ -291,7 +290,6 @@ e_alert_dialog_new_for_args (GtkWindow *parent, const gchar *tag, const gchar *a
 	return d;
 }
 
-
 gint
 e_alert_run_dialog(GtkWindow *parent, EAlert *alert)
 {
diff --git a/e-util/e-alert.c b/e-util/e-alert.c
index f0d27fe6be..01fade0e32 100644
--- a/e-util/e-alert.c
+++ b/e-util/e-alert.c
@@ -128,7 +128,6 @@ map_type(const gchar *name)
 	return 3;
 }
 
-
 G_DEFINE_TYPE (EAlert, e_alert, G_TYPE_OBJECT)
 
 #define ALERT_PRIVATE(o) \
@@ -444,7 +443,6 @@ e_alert_constructed (GObject *obj)
 
 	g_warn_if_fail(alert->priv->definition);
 
-
 }
 
 static void
@@ -532,7 +530,6 @@ e_alert_new_array(const gchar *tag, GPtrArray *args)
 	return g_object_new (E_TYPE_ALERT, "tag", tag, "args", args, NULL);
 }
 
-
 /* unfortunately, gmarkup_escape doesn't expose its gstring based api :( */
 static void
 e_alert_append_text_escaped (GString *out, const gchar *text)
@@ -579,7 +576,6 @@ e_alert_format_string (GString *out, const gchar *fmt, GPtrArray *args, gboolean
 	g_string_append(out, fmt);
 }
 
-
 guint32
 e_alert_get_flags (EAlert *alert)
 {
diff --git a/e-util/e-pilot-util.c b/e-util/e-pilot-util.c
index 3ce67c8e7b..3d8d2cddfb 100644
--- a/e-util/e-pilot-util.c
+++ b/e-util/e-pilot-util.c
@@ -40,7 +40,7 @@ e_pilot_utf8_to_pchar (const gchar *string, const gchar *pilot_charset)
 		return NULL;
 
 #ifdef PILOT_LINK_0_12
-    res = convert_ToPilotChar_WithCharset ("UTF-8", string, strlen (string), 
+    res = convert_ToPilotChar_WithCharset ("UTF-8", string, strlen (string),
           &pstring, pilot_charset);
 #else
     res = convert_ToPilotChar ("UTF-8", string, strlen (string), &pstring);
@@ -62,7 +62,7 @@ e_pilot_utf8_from_pchar (const gchar *string, const gchar *pilot_charset)
 		return NULL;
 
 #ifdef PILOT_LINK_0_12
-    res = convert_FromPilotChar_WithCharset ("UTF-8", string, strlen (string), 
+    res = convert_FromPilotChar_WithCharset ("UTF-8", string, strlen (string),
           &ustring, pilot_charset);
 #else
     res = convert_FromPilotChar ("UTF-8", string, strlen (string), &ustring);
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index 979279c963..6dae4ded13 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -819,7 +819,7 @@ action_mail_save_as_cb (GtkAction *action,
 			suggestion = g_strconcat (subject, ".mbox", NULL);
 		camel_message_info_free (info);
 	}
-	
+
 	if (!suggestion) {
 		/* To Translators: This is a part of a suggested file name used when saving
 		   a message or multiple messages to an mbox format, when the first message
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c
index 19697a4f6a..545c934805 100644
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@ -428,7 +428,7 @@ em_folder_tree_model_set_unread_count (EMFolderTreeModel *model,
 
 static void
 folder_unread_updated_cb (MailFolderCache *cache, CamelStore *store,
-			  const gchar *full_name, int unread, gpointer user_data)
+			  const gchar *full_name, gint unread, gpointer user_data)
 {
 	EMFolderTreeModel *model = (EMFolderTreeModel*) user_data;
 	em_folder_tree_model_set_unread_count (model, store, full_name, unread);
diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c
index 5bf5be4bbd..10a66a4f47 100644
--- a/mail/mail-folder-cache.c
+++ b/mail/mail-folder-cache.c
@@ -143,7 +143,6 @@ struct _store_info {
 	GQueue folderinfo_updates;
 };
 
-
 static void folder_changed(CamelObject *o, gpointer event_data, gpointer user_data);
 static void folder_renamed(CamelObject *o, gpointer event_data, gpointer user_data);
 static void folder_finalised(CamelObject *o, gpointer event_data, gpointer user_data);
@@ -1135,7 +1134,6 @@ mail_folder_cache_get_folder_info_flags (MailFolderCache *self, CamelFolder *fol
 	return fi.fi != NULL;
 }
 
-
 static void
 mail_folder_cache_dispose (GObject *object)
 {
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index df7b2e13b4..93120359c8 100644
--- a/mail/mail-mt.c
+++ b/mail/mail-mt.c
@@ -970,7 +970,7 @@ mail_operation_status (CamelOperation *op, const gchar *what, gint pc, gpointer
 }
 
 void
-mail_mt_set_backend (char *backend)
+mail_mt_set_backend (gchar *backend)
 {
 	shell_builtin_backend = backend;
 }
diff --git a/mail/mail-mt.h b/mail/mail-mt.h
index e8d046d9e4..7497c377eb 100644
--- a/mail/mail-mt.h
+++ b/mail/mail-mt.h
@@ -107,7 +107,7 @@ gint mail_async_event_emit(MailAsyncEvent *ea, mail_async_event_t type, MailAsyn
 /* wait for all outstanding async events to complete */
 gint mail_async_event_destroy(MailAsyncEvent *ea);
 
-void mail_mt_set_backend (char *backend);
+void mail_mt_set_backend (gchar *backend);
 
 /* Call a function in the gui thread, wait for it to return, type is the marshaller to use */
 typedef enum {
diff --git a/plugins/caldav/caldav-browse-server.c b/plugins/caldav/caldav-browse-server.c
index 93b1eec242..ff19ff0c38 100644
--- a/plugins/caldav/caldav-browse-server.c
+++ b/plugins/caldav/caldav-browse-server.c
@@ -19,7 +19,6 @@
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -431,7 +430,7 @@ traverse_users_calendars_cb (GObject *dialog, const gchar *msg_path, guint statu
 							g_string_append (supports, _("Tasks"));
 						else if (g_str_equal (comp, "VJOURNAL"))
 							g_string_append (supports, _("Memos"));
-						
+
 						g_free (comp);
 					}
 				}
@@ -593,7 +592,7 @@ find_users_calendar_cb (GObject *dialog, const gchar *msg_path, guint status_cod
 
 	if (user_data == NULL)
 		base_url_is_calendar = xpath_exists (xpctx, NULL, "/D:multistatus/D:response/D:propstat/D:prop/D:resourcetype/C:calendar");
-		
+
 	calendar_home_set = xpath_get_string (xpctx, "/D:multistatus/D:response/D:propstat/D:prop/C:calendar-home-set/D:href");
 	if (user_data == NULL && (!calendar_home_set || !*calendar_home_set)) {
 		g_free (calendar_home_set);
diff --git a/shell/e-shell-utils.c b/shell/e-shell-utils.c
index 1a8d7830f2..70638ec2dd 100644
--- a/shell/e-shell-utils.c
+++ b/shell/e-shell-utils.c
@@ -215,7 +215,7 @@ e_shell_run_save_dialog (EShell *shell,
 
 			gtk_file_filter_add_pattern (filter, flt);
 			if (g_ascii_strcasecmp (flt, "*.mbox") == 0)
-				gtk_file_filter_set_name (filter, _("Berkeley Mailbox (mbox)")); 
+				gtk_file_filter_set_name (filter, _("Berkeley Mailbox (mbox)"));
 			else if (g_ascii_strcasecmp (flt, "*.vcf") == 0)
 				gtk_file_filter_set_name (filter, _("vCard (.vcf)"));
 			else if (g_ascii_strcasecmp (flt, "*.ics") == 0)