More code cleanup.

8 files changed, 19 insertions, 19 deletions

diff --git a/plugins/exchange-operations/exchange-calendar.c b/plugins/exchange-operations/exchange-calendar.c
index e43d3b0531..f9f7bd7d40 100644
--- a/plugins/exchange-operations/exchange-calendar.c
+++ b/plugins/exchange-operations/exchange-calendar.c
@@ -391,7 +391,7 @@ e_exchange_calendar_commit (EPlugin *epl, EConfigTarget *target)
 	uri_text = e_source_get_uri (source);
 	if (uri_text && strncmp (uri_text, "exchange", 8)) {
 		g_free (uri_text);
-		return ;
+		return;
 	}
 
 	status = exchange_is_offline (&offline_status);
diff --git a/plugins/exchange-operations/exchange-config-listener.c b/plugins/exchange-operations/exchange-config-listener.c
index c898f1b4c5..4e10acabdd 100644
--- a/plugins/exchange-operations/exchange-config-listener.c
+++ b/plugins/exchange-operations/exchange-config-listener.c
@@ -207,7 +207,7 @@ set_special_mail_folder (ExchangeAccount *account, const gchar *folder_type,
 		return;
 	physical_uri = e_folder_get_physical_uri (folder);
 
-	/* remove ; form the uri */
+	/* remove; form the uri */
 	camel_url = camel_url_new (physical_uri, NULL);
 	url_string = camel_url_to_string (camel_url, CAMEL_URL_HIDE_ALL);
 	camel_url_free (camel_url);
@@ -311,7 +311,7 @@ add_account_esources (ExchangeAccount *account,
 	    !e_source_list_add_group (tasks_source_list, tasks_source_group, -1)) {
 		goto done;
 	}
-	for ( ; folders != NULL ; folders = g_slist_next (folders)) {
+	for (; folders != NULL; folders = g_slist_next (folders)) {
 		/* Create source for each folder and add to the group */
 
 		folder = folders->data;
@@ -537,7 +537,7 @@ remove_account_esource (ExchangeAccount *account,
 	groups = e_source_list_peek_groups (source_list);
 	found_group = FALSE;
 
-	for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) {
+	for (; groups != NULL && !found_group; groups = g_slist_next (groups)) {
 		group = E_SOURCE_GROUP (groups->data);
 
 		if (strcmp (e_source_group_peek_name (group), account->account_name) == 0
@@ -545,7 +545,7 @@ remove_account_esource (ExchangeAccount *account,
                     strcmp (e_source_group_peek_base_uri (group), EXCHANGE_URI_PREFIX) == 0) {
 			sources = e_source_group_peek_sources (group);
 
-			for( ; sources != NULL; sources = g_slist_next (sources)) {
+			for(; sources != NULL; sources = g_slist_next (sources)) {
 				source = E_SOURCE (sources->data);
 				source_uid = e_source_peek_uid (source);
 
@@ -1193,7 +1193,7 @@ exchange_config_listener_modify_esource_group_name (ExchangeConfigListener *excl
 
 	groups = e_source_list_peek_groups (c_source_list);
 
-	for ( ; groups != NULL; groups = g_slist_next (groups)) {
+	for (; groups != NULL; groups = g_slist_next (groups)) {
 		group = E_SOURCE_GROUP (groups->data);
 		if (!strcmp (e_source_group_peek_name (group), old_name)) {
 			e_source_group_set_name (group, new_name);
@@ -1203,7 +1203,7 @@ exchange_config_listener_modify_esource_group_name (ExchangeConfigListener *excl
 
 	groups = e_source_list_peek_groups (t_source_list);
 
-	for ( ; groups != NULL; groups = g_slist_next (groups)) {
+	for (; groups != NULL; groups = g_slist_next (groups)) {
 		group = E_SOURCE_GROUP (groups->data);
 		if (!strcmp (e_source_group_peek_name (group), old_name)) {
 			e_source_group_set_name (group, new_name);
@@ -1213,7 +1213,7 @@ exchange_config_listener_modify_esource_group_name (ExchangeConfigListener *excl
 
 	groups = e_source_list_peek_groups (a_source_list);
 
-	for ( ; groups != NULL; groups = g_slist_next (groups)) {
+	for (; groups != NULL; groups = g_slist_next (groups)) {
 		group = E_SOURCE_GROUP (groups->data);
 		if (!strcmp (e_source_group_peek_name (group), old_name)) {
 			e_source_group_set_name (group, new_name);
@@ -1252,7 +1252,7 @@ exchange_add_autocompletion_folders (GConfClient *gc_client, ExchangeAccount *ac
 	sl = e_source_list_new_for_gconf (gc_client, CONF_KEY_CONTACTS);
 	groups = e_source_list_peek_groups (sl);
 
-	for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) {
+	for (; groups != NULL && !found_group; groups = g_slist_next (groups)) {
 		ESourceGroup *group = E_SOURCE_GROUP (groups->data);
 
 		if (strcmp (e_source_group_peek_name (group), account->account_name) == 0
@@ -1260,7 +1260,7 @@ exchange_add_autocompletion_folders (GConfClient *gc_client, ExchangeAccount *ac
 		    strcmp (e_source_group_peek_base_uri (group), EXCHANGE_URI_PREFIX) == 0) {
 			GSList *sources = e_source_group_peek_sources (group);
 
-			for( ; sources != NULL; sources = g_slist_next (sources)) {
+			for(; sources != NULL; sources = g_slist_next (sources)) {
 				ESource *source = E_SOURCE (sources->data);
 				const gchar *absolute_uri;
 
@@ -1372,7 +1372,7 @@ remove_selected_non_offline_esources (ExchangeAccount *account, const gchar *gco
 	groups = e_source_list_peek_groups (source_list);
 	found_group = FALSE;
 
-	for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) {
+	for (; groups != NULL && !found_group; groups = g_slist_next (groups)) {
 		group = E_SOURCE_GROUP (groups->data);
 
 		if (strcmp (e_source_group_peek_name (group), account->account_name) == 0
@@ -1380,7 +1380,7 @@ remove_selected_non_offline_esources (ExchangeAccount *account, const gchar *gco
                     strcmp (e_source_group_peek_base_uri (group), EXCHANGE_URI_PREFIX) == 0) {
 			sources = e_source_group_peek_sources (group);
 
-			for( ; sources != NULL; sources = g_slist_next (sources)) {
+			for(; sources != NULL; sources = g_slist_next (sources)) {
 				source = E_SOURCE (sources->data);
 				source_uid = e_source_peek_uid (source);
 
diff --git a/plugins/exchange-operations/exchange-delegates.c b/plugins/exchange-operations/exchange-delegates.c
index b4ef8c43ad..5ecc02e0b1 100644
--- a/plugins/exchange-operations/exchange-delegates.c
+++ b/plugins/exchange-operations/exchange-delegates.c
@@ -472,7 +472,7 @@ add_button_clicked_cb (GtkWidget *widget, gpointer data)
 			    -1);
 }
 
-static int
+static gint
 get_selected_row (GtkWidget *tree_view, GtkTreeIter *iter)
 {
 	GtkTreeSelection *selection;
diff --git a/plugins/exchange-operations/exchange-folder-permission.c b/plugins/exchange-operations/exchange-folder-permission.c
index 03d7ac7aa9..7113ef8e64 100644
--- a/plugins/exchange-operations/exchange-folder-permission.c
+++ b/plugins/exchange-operations/exchange-folder-permission.c
@@ -181,7 +181,7 @@ org_gnome_exchange_folder_permissions (EPlugin *ep, EMPopupTargetFolder *target)
 	if (! g_strrstr (target->uri, "exchange://") ||
 	    !exchange_account_get_folder (account, fixed_path)) {
 		g_free (fixed_path);
-		return ;
+		return;
 	}
 
 	g_free (fixed_path);
diff --git a/plugins/exchange-operations/exchange-mail-send-options.c b/plugins/exchange-operations/exchange-mail-send-options.c
index 9537f592a3..87f851a8c8 100644
--- a/plugins/exchange-operations/exchange-mail-send-options.c
+++ b/plugins/exchange-operations/exchange-mail-send-options.c
@@ -185,8 +185,8 @@ org_gnome_exchange_send_options (EPlugin *ep, EMEventTargetComposer *target)
 	e_msg_composer_set_send_options (composer, TRUE);
 	/*disply the send options dialog*/
 	if (!dialog) {
-		g_print ("New dialog\n\n") ;
-		dialog = exchange_sendoptions_dialog_new () ;
+		g_print ("New dialog\n\n");
+		dialog = exchange_sendoptions_dialog_new ();
 	}
 	exchange_sendoptions_dialog_run (dialog, GTK_WIDGET (composer));
 	g_signal_connect (dialog, "sod_response", G_CALLBACK (append_to_header), GTK_WIDGET (composer));
diff --git a/plugins/exchange-operations/exchange-operations.h b/plugins/exchange-operations/exchange-operations.h
index 5de844ba7f..3b4518f5fa 100644
--- a/plugins/exchange-operations/exchange-operations.h
+++ b/plugins/exchange-operations/exchange-operations.h
@@ -46,7 +46,7 @@ ExchangeConfigListenerStatus exchange_is_offline (gint *mode);
 gboolean exchange_operations_tokenize_string (gchar **string, gchar *token, gchar delimit, guint maxsize);
 
 gboolean exchange_operations_cta_add_node_to_tree (GtkTreeStore *store, GtkTreeIter *parent, const gchar *nuri);
-void exchange_operations_cta_select_node_from_tree (GtkTreeStore *store, GtkTreeIter *parent, const gchar *nuri, const gchar *ruri, GtkTreeSelection *selection) ;
+void exchange_operations_cta_select_node_from_tree (GtkTreeStore *store, GtkTreeIter *parent, const gchar *nuri, const gchar *ruri, GtkTreeSelection *selection);
 
 void exchange_operations_report_error (ExchangeAccount *account, ExchangeAccountResult result);
 
diff --git a/plugins/exchange-operations/exchange-send-options.c b/plugins/exchange-operations/exchange-send-options.c
index e44056abb8..cc707ab65e 100644
--- a/plugins/exchange-operations/exchange-send-options.c
+++ b/plugins/exchange-operations/exchange-send-options.c
@@ -87,7 +87,7 @@ static guint signals[LAST_SIGNAL] = {0};
 /* exchange_send_options_get_widgets_data(ExchangeSendOptionsDialog *sod)
    Return Value:This function returns a -1 if an error occurs. In case of error-free operation a 1 is returned.
 */
-static int
+static gint
 exchange_send_options_get_widgets_data (ExchangeSendOptionsDialog *sod)
 {
 	ExchangeSendOptionsDialogPrivate *priv;
diff --git a/plugins/exchange-operations/exchange-send-options.h b/plugins/exchange-operations/exchange-send-options.h
index 8a6d37d947..f41ac85371 100644
--- a/plugins/exchange-operations/exchange-send-options.h
+++ b/plugins/exchange-operations/exchange-send-options.h
@@ -63,7 +63,7 @@ typedef struct {
 	const gchar *delegate_name;
 	const gchar *delegate_email;
 	const gchar *delegate_address;
-} ExchangeSendOptions ;
+} ExchangeSendOptions;
 
 struct _ExchangeSendOptionsDialog {
 	GObject object;