Coding style and whitespace cleanups.

14 files changed, 26 insertions, 27 deletions

diff --git a/composer/e-composer-from-header.c b/composer/e-composer-from-header.c
index e7963666f3..320768c79c 100644
--- a/composer/e-composer-from-header.c
+++ b/composer/e-composer-from-header.c
@@ -111,7 +111,7 @@ e_composer_from_header_new (const gchar *label)
 }
 
 EComposerHeader *
-e_composer_from_header_new_with_action (const gchar *label, const char *action)
+e_composer_from_header_new_with_action (const gchar *label, const gchar *action)
 {
 	return g_object_new (
 		E_TYPE_COMPOSER_FROM_HEADER, "label", label,
diff --git a/composer/e-composer-from-header.h b/composer/e-composer-from-header.h
index cf360693aa..3fbf5a7012 100644
--- a/composer/e-composer-from-header.h
+++ b/composer/e-composer-from-header.h
@@ -63,7 +63,7 @@ struct _EComposerFromHeaderClass {
 
 GType		e_composer_from_header_get_type	(void);
 EComposerHeader * e_composer_from_header_new	(const gchar *label);
-EComposerHeader * e_composer_from_header_new_with_action (const gchar *label, const char *action);
+EComposerHeader * e_composer_from_header_new_with_action (const gchar *label, const gchar *action);
 EAccountList *	e_composer_from_header_get_account_list
 						(EComposerFromHeader *header);
 void		e_composer_from_header_set_account_list
diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c
index ed999bf019..55dc6a65a0 100644
--- a/composer/e-composer-header-table.c
+++ b/composer/e-composer-header-table.c
@@ -519,7 +519,7 @@ composer_header_table_constructor (GType type,
 			gtk_table_attach (
 				GTK_TABLE (object), box,
 				1, 4, ii, ii + 1, GTK_FILL | GTK_EXPAND, 0, 0, 3);
-		
+
 		} else {
 			gtk_table_attach (
 				GTK_TABLE (object), priv->headers[ii]->input_widget,
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 8b77c716a5..e76159a0dc 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -2336,7 +2336,6 @@ em_utils_reply_to_message(CamelFolder *folder, const gchar *uid, CamelMimeMessag
 
 	g_return_val_if_fail(message != NULL, NULL);
 
-	
 	to = camel_internet_address_new();
 	cc = camel_internet_address_new();
 
diff --git a/mail/em-event.h b/mail/em-event.h
index 6b6a5cf675..6b3618405f 100644
--- a/mail/em-event.h
+++ b/mail/em-event.h
@@ -152,7 +152,7 @@ EMEvent *em_event_peek(void);
 EMEventTargetFolder *em_event_target_new_folder(EMEvent *emp, const gchar *uri, guint32 flags);
 EMEventTargetFolderBrowser *em_event_target_new_folder_browser (EMEvent *eme, EMFolderBrowser *emfb);
 EMEventTargetComposer *em_event_target_new_composer(EMEvent *emp, const EMsgComposer *composer, guint32 flags);
-EMEventTargetMessage *em_event_target_new_message(EMEvent *emp, CamelFolder *folder, CamelMimeMessage *message, const gchar *uid, guint32 flags, 
+EMEventTargetMessage *em_event_target_new_message(EMEvent *emp, CamelFolder *folder, CamelMimeMessage *message, const gchar *uid, guint32 flags,
 							EMsgComposer *composer);
 EMEventTargetSendReceive * em_event_target_new_send_receive(EMEvent *eme, GtkWidget *table, gpointer data, gint row, guint32 flags);
 EMEventTargetCustomIcon * em_event_target_new_custom_icon(EMEvent *eme, GtkTreeStore *store, GtkTreeIter *iter, const gchar *uri, guint32 flags);
diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c
index 66f76c6548..5c939992ac 100644
--- a/mail/em-folder-browser.c
+++ b/mail/em-folder-browser.c
@@ -1285,7 +1285,7 @@ emfb_search_search_activated(ESearchBar *esb, EMFolderBrowser *emfb)
 				    l = l->next;
 			    }
 
-    			    camel_vee_folder_set_expression (efb->all_account_search_vf, search_word);
+			    camel_vee_folder_set_expression (efb->all_account_search_vf, search_word);
 
 			    efb->account_search_cancel = camel_operation_new (NULL, NULL);
 			    vfolder_setup ((CamelFolder *)efb->all_account_search_vf, NULL, folder_list, efb->account_search_cancel);
diff --git a/mail/em-sync-stream.c b/mail/em-sync-stream.c
index 8c7d266855..982a56c90a 100644
--- a/mail/em-sync-stream.c
+++ b/mail/em-sync-stream.c
@@ -108,7 +108,7 @@ emss_sync_op (EMSyncStream *emss, enum _write_msg_t op,
 	msg.len = len;
 
 	camel_object_ref (emss);
-	
+
 	if (emss->idle_id)
 		g_source_remove (emss->idle_id);
 	emss->idle_id = g_idle_add ((GSourceFunc) emss_process_message, &msg);
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index 729a4228cc..0032a21432 100644
--- a/mail/mail-mt.c
+++ b/mail/mail-mt.c
@@ -486,7 +486,7 @@ mail_msg_idle_cb (void)
 	G_LOCK (idle_source_id);
 	idle_source_id = 0;
 	G_UNLOCK (idle_source_id);
-	mail_component_show_status_bar (TRUE);	
+	mail_component_show_status_bar (TRUE);
 	/* check the main loop queue */
 	while ((msg = g_async_queue_try_pop (main_loop_queue)) != NULL) {
 		if (msg->info->exec != NULL)
@@ -503,7 +503,7 @@ mail_msg_idle_cb (void)
 		mail_msg_check_error (msg);
 		mail_msg_unref (msg);
 	}
-	mail_component_show_status_bar (FALSE);	
+	mail_component_show_status_bar (FALSE);
 	return FALSE;
 }
 
diff --git a/mail/mail-send-recv.h b/mail/mail-send-recv.h
index d00e461b4f..08ab233d13 100644
--- a/mail/mail-send-recv.h
+++ b/mail/mail-send-recv.h
@@ -29,17 +29,17 @@
 G_BEGIN_DECLS
 
 /* send/receive all uri's */
-GtkWidget *     mail_send_receive               (void);
-GtkWidget * 	mail_send_receive_dialog (gboolean show_dialog);
+GtkWidget *	mail_send_receive		(void);
+GtkWidget *	mail_send_receive_dialog	(gboolean show_dialog);
 
 /* receive a single uri */
-void            mail_receive_uri                (const gchar *uri,
+void		mail_receive_uri		(const gchar *uri,
 						 gboolean keep_on_server);
 
-void            mail_send                       (void);
+void		mail_send			(void);
 
 /* setup auto receive stuff */
-void            mail_autoreceive_init           (CamelSession *session);
+void		mail_autoreceive_init		(CamelSession *session);
 
 G_END_DECLS
 
diff --git a/plugins/groupwise-features/mail-send-options.c b/plugins/groupwise-features/mail-send-options.c
index 701205f04c..8244088f8a 100644
--- a/plugins/groupwise-features/mail-send-options.c
+++ b/plugins/groupwise-features/mail-send-options.c
@@ -175,17 +175,17 @@ org_gnome_composer_send_options (EPlugin *ep, EMEventTargetComposer *t)
 void
 org_gnome_composer_message_reply (EPlugin *ep, EMEventTargetMessage *t)
 {
-	EMsgComposer *comp = (struct _EMsgComposer *)t->composer ;
+	EMsgComposer *comp = (struct _EMsgComposer *)t->composer;
 	EComposerHeaderTable *table;
 	EAccount *account = NULL;
-	char *temp = NULL;
-	
+	gchar *temp = NULL;
+
 	table = e_msg_composer_get_header_table (comp);
 	account = e_composer_header_table_get_account (table);
 	if (!account)
 		return;
- 
-	temp = strstr (account->transport->url, "groupwise") ;
+
+	temp = strstr (account->transport->url, "groupwise");
 	if (!temp) {
 		return;
 	}
diff --git a/widgets/misc/e-attachment-icon-view.c b/widgets/misc/e-attachment-icon-view.c
index 340805773d..edfecb57d8 100644
--- a/widgets/misc/e-attachment-icon-view.c
+++ b/widgets/misc/e-attachment-icon-view.c
@@ -40,11 +40,11 @@ enum {
 	PROP_EDITABLE
 };
 
-static int icon_size = GTK_ICON_SIZE_DIALOG;
+static gint icon_size = GTK_ICON_SIZE_DIALOG;
 static gpointer parent_class;
 
 void
-e_attachment_icon_view_set_default_icon_size (int size)
+e_attachment_icon_view_set_default_icon_size (gint size)
 {
 	icon_size = size;
 }
diff --git a/widgets/misc/e-attachment-icon-view.h b/widgets/misc/e-attachment-icon-view.h
index 8b118a7a39..e89992fb76 100644
--- a/widgets/misc/e-attachment-icon-view.h
+++ b/widgets/misc/e-attachment-icon-view.h
@@ -60,8 +60,8 @@ struct _EAttachmentIconViewClass {
 
 GType		e_attachment_icon_view_get_type		(void);
 GtkWidget *	e_attachment_icon_view_new		(void);
-void		e_attachment_icon_view_set_default_icon_size 
-							(int size);
+void		e_attachment_icon_view_set_default_icon_size
+							(gint size);
 G_END_DECLS
 
 #endif /* E_ATTACHMENT_ICON_VIEW_H */
diff --git a/widgets/misc/e-attachment-paned.c b/widgets/misc/e-attachment-paned.c
index 0ba853bf3d..8e25098767 100644
--- a/widgets/misc/e-attachment-paned.c
+++ b/widgets/misc/e-attachment-paned.c
@@ -38,7 +38,7 @@
 #define NUM_VIEWS 2
 
 /* Initial height of the lower pane. */
-static int initial_height = 150;
+static gint initial_height = 150;
 
 struct _EAttachmentPanedPrivate {
 	GtkTreeModel *model;
@@ -67,7 +67,7 @@ enum {
 static gpointer parent_class;
 
 void
-e_attachment_paned_set_default_height (int height)
+e_attachment_paned_set_default_height (gint height)
 {
 	initial_height = height;
 }
diff --git a/widgets/misc/e-attachment-paned.h b/widgets/misc/e-attachment-paned.h
index 93722a248e..a9022a7bc6 100644
--- a/widgets/misc/e-attachment-paned.h
+++ b/widgets/misc/e-attachment-paned.h
@@ -82,8 +82,8 @@ GtkWidget *	e_attachment_paned_get_controls_container
 						(EAttachmentPaned *paned);
 GtkWidget *	e_attachment_paned_get_view_combo
 						(EAttachmentPaned *paned);
-void		e_attachment_paned_set_default_height 
-						(int height);
+void		e_attachment_paned_set_default_height
+						(gint height);
 
 G_END_DECLS