More code cleanup.

12 files changed, 60 insertions, 60 deletions

diff --git a/plugins/groupwise-features/addressbook-groupwise.c b/plugins/groupwise-features/addressbook-groupwise.c
index ae0c5e1e8a..4ee5af017e 100644
--- a/plugins/groupwise-features/addressbook-groupwise.c
+++ b/plugins/groupwise-features/addressbook-groupwise.c
@@ -43,7 +43,7 @@ commit_groupwise_addressbook (EPlugin *epl, EConfigTarget *target)
 	if (strncmp (uri_text, "groupwise", 9)) {
 		g_free (uri_text);
 
-		return ;
+		return;
 	}
 	e_source_set_property (source, "auth-domain", "Groupwise");
 	relative_uri = g_strconcat (";", e_source_peek_name (source), NULL);
diff --git a/plugins/groupwise-features/junk-mail-settings.c b/plugins/groupwise-features/junk-mail-settings.c
index dc13fad256..68cbaf6f9d 100644
--- a/plugins/groupwise-features/junk-mail-settings.c
+++ b/plugins/groupwise-features/junk-mail-settings.c
@@ -132,7 +132,7 @@ org_gnome_junk_settings(EPlugin *ep, EMPopupTargetSelect *t)
 	static gint first = 0;
 
 	if (! g_strrstr (t->uri, "groupwise://"))
-		return ;
+		return;
 
 	/* for translation*/
 	if (!first) {
diff --git a/plugins/groupwise-features/junk-settings.c b/plugins/groupwise-features/junk-settings.c
index cc735feee1..23c3820130 100644
--- a/plugins/groupwise-features/junk-settings.c
+++ b/plugins/groupwise-features/junk-settings.c
@@ -142,11 +142,11 @@ find_node(GList *list, gchar *match)
 	JunkEntry *one_entry = NULL;
 	EGwJunkEntry *ent = NULL;
 	GList *tmp;
-	gint i ;
+	gint i;
 
 	if(list){
 		tmp = g_list_first(list);
-		for(i=0; tmp  ; i++)
+		for(i=0; tmp; i++)
 		{
 			one_entry = tmp->data;
 			ent = one_entry->entry;
diff --git a/plugins/groupwise-features/mail-retract.c b/plugins/groupwise-features/mail-retract.c
index 7007ba5760..9e2920d6ab 100644
--- a/plugins/groupwise-features/mail-retract.c
+++ b/plugins/groupwise-features/mail-retract.c
@@ -115,5 +115,5 @@ void org_gnome_retract_message (EPlugin *ep, EMPopupTargetSelect *t)
 
 		e_popup_add_items (t->target.popup, menus, NULL, popup_free, t->folder);
 	}
-	return ;
+	return;
 }
diff --git a/plugins/groupwise-features/mail-send-options.c b/plugins/groupwise-features/mail-send-options.c
index 05b3452091..05d22bedce 100644
--- a/plugins/groupwise-features/mail-send-options.c
+++ b/plugins/groupwise-features/mail-send-options.c
@@ -41,7 +41,7 @@
 
 #include "misc/e-send-options.h"
 
-static ESendOptionsDialog * dialog = NULL ;
+static ESendOptionsDialog * dialog = NULL;
 
 void org_gnome_composer_send_options (EPlugin *ep, EMEventTargetComposer *t);
 
@@ -69,12 +69,12 @@ feed_input_data(ESendOptionsDialog * dialog, gint state, gpointer data)
 	if (state == GTK_RESPONSE_OK) {
 		if (dialog->data->gopts->reply_enabled) {
 			if (dialog->data->gopts->reply_convenient)
-				e_msg_composer_add_header (comp, X_REPLY_CONVENIENT ,"1" ) ;
+				e_msg_composer_add_header (comp, X_REPLY_CONVENIENT ,"1" );
 			else if (dialog->data->gopts->reply_within) {
 				time_t t;
 				t = add_day_to_time (time (NULL), dialog->data->gopts->reply_within);
 				strftime (value, 17, "%Y%m%dT%H%M%SZ", gmtime (&t));
-				e_msg_composer_add_header (comp, X_REPLY_WITHIN , value) ;
+				e_msg_composer_add_header (comp, X_REPLY_WITHIN , value);
 			}
 		}
 
@@ -83,33 +83,33 @@ feed_input_data(ESendOptionsDialog * dialog, gint state, gpointer data)
 				time_t t;
 				t = add_day_to_time (time (NULL), dialog->data->gopts->expire_after);
 				strftime (value, 17, "%Y%m%dT%H%M%SZ", gmtime (&t));
-				e_msg_composer_add_header (comp, X_EXPIRE_AFTER, value) ;
+				e_msg_composer_add_header (comp, X_EXPIRE_AFTER, value);
 			}
 		}
 		if (dialog->data->gopts->delay_enabled) {
 			strftime (value, 17, "%Y%m%dT%H%M%SZ", gmtime (&dialog->data->gopts->delay_until));
-			e_msg_composer_add_header (comp, X_DELAY_UNTIL, value) ;
+			e_msg_composer_add_header (comp, X_DELAY_UNTIL, value);
 		}
 
 		/*Status Tracking Options*/
 		if (dialog->data->sopts->tracking_enabled) {
-			temp = g_strdup_printf ("%d",dialog->data->sopts->track_when) ;
-			e_msg_composer_add_header (comp, X_TRACK_WHEN, temp) ;
-			g_free (temp) ;
+			temp = g_strdup_printf ("%d",dialog->data->sopts->track_when);
+			e_msg_composer_add_header (comp, X_TRACK_WHEN, temp);
+			g_free (temp);
 		}
 
 		if (dialog->data->sopts->autodelete) {
-			e_msg_composer_add_header (comp, X_AUTODELETE, "1") ;
+			e_msg_composer_add_header (comp, X_AUTODELETE, "1");
 		}
 		if (dialog->data->sopts->opened) {
-			temp = g_strdup_printf ("%d",dialog->data->sopts->opened) ;
-			e_msg_composer_add_header (comp, X_RETURN_NOTIFY_OPEN, temp) ;
-			g_free (temp) ;
+			temp = g_strdup_printf ("%d",dialog->data->sopts->opened);
+			e_msg_composer_add_header (comp, X_RETURN_NOTIFY_OPEN, temp);
+			g_free (temp);
 		}
 		if (dialog->data->sopts->declined) {
-			temp = g_strdup_printf ("%d",dialog->data->sopts->declined) ;
-			e_msg_composer_add_header (comp, X_RETURN_NOTIFY_DELETE, temp) ;
-			g_free (temp) ;
+			temp = g_strdup_printf ("%d",dialog->data->sopts->declined);
+			e_msg_composer_add_header (comp, X_RETURN_NOTIFY_DELETE, temp);
+			g_free (temp);
 		}
 
 		if (dialog->data->gopts->priority) {
@@ -142,7 +142,7 @@ void
 org_gnome_composer_send_options (EPlugin *ep, EMEventTargetComposer *t)
 {
 
-	EMsgComposer *comp = (struct _EMsgComposer *)t->composer ;
+	EMsgComposer *comp = (struct _EMsgComposer *)t->composer;
 	EComposerHeaderTable *table;
 	EAccount *account = NULL;
 	gchar *temp = NULL;
@@ -152,17 +152,17 @@ org_gnome_composer_send_options (EPlugin *ep, EMEventTargetComposer *t)
 	if (!account)
 		return;
 
-	temp = strstr (account->transport->url, "groupwise") ;
+	temp = strstr (account->transport->url, "groupwise");
 	if (!temp) {
 		return;
 	}
 	e_msg_composer_set_send_options (comp, TRUE);
 	/* display the send options dialog */
 	if (!dialog) {
-		g_print ("New dialog\n\n") ;
-		dialog = e_sendoptions_dialog_new () ;
+		g_print ("New dialog\n\n");
+		dialog = e_sendoptions_dialog_new ();
 	}
-	e_sendoptions_dialog_run (dialog, GTK_WIDGET (comp), E_ITEM_MAIL) ;
+	e_sendoptions_dialog_run (dialog, GTK_WIDGET (comp), E_ITEM_MAIL);
 
 	g_signal_connect (dialog, "sod_response",
 				  G_CALLBACK (feed_input_data), comp);
diff --git a/plugins/groupwise-features/process-meeting.c b/plugins/groupwise-features/process-meeting.c
index 57eba9392c..5a8a991288 100644
--- a/plugins/groupwise-features/process-meeting.c
+++ b/plugins/groupwise-features/process-meeting.c
@@ -85,7 +85,7 @@ org_gnome_accept (EPlugin *ep, ECalPopupTargetSelect *target)
 		return;
 
 	if (! g_strrstr (uri, "groupwise://"))
-		return ;
+		return;
 
 	/* for translation*/
 	if (!first) {
@@ -347,7 +347,7 @@ org_gnome_retract_resend (EPlugin *ep, ECalPopupTargetSelect *target)
 		return;
 
 	if (! g_strrstr (uri, "groupwise://"))
-		return ;
+		return;
 
 	comp = e_cal_component_new ();
 	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
@@ -451,7 +451,7 @@ retract_object (gpointer val)
 	}
 	g_free (rid);
 
-	free_thread_data (data)	;
+	free_thread_data (data);
 	return GINT_TO_POINTER (0);
 }
 
@@ -466,7 +466,7 @@ object_created_cb (CompEditor *ce, gpointer data)
 
 	response = e_error_run (NULL, "org.gnome.evolution.process_meeting:resend-retract", NULL);
 	if (response == GTK_RESPONSE_NO) {
-		free_thread_data (data)	;
+		free_thread_data (data);
 		return;
 	}
 
diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c
index 8c8013f6fe..d48afaa452 100644
--- a/plugins/groupwise-features/proxy-login.c
+++ b/plugins/groupwise-features/proxy-login.c
@@ -174,7 +174,7 @@ proxy_login_new (void)
 	return prd;
 }
 
-static int
+static gint
 proxy_get_password (EAccount *account, gchar **user_name, gchar **password)
 {
 	const gchar *failed_auth;
@@ -308,9 +308,9 @@ proxy_soap_login (gchar *email)
 	EAccount *srcAccount;
 	EAccount *dstAccount;
 	EGwConnection *proxy_cnc, *cnc;
-	CamelURL *uri = NULL, *parent = NULL ;
+	CamelURL *uri = NULL, *parent = NULL;
 	gchar *password = NULL, *user_name = NULL;
-	gchar *proxy_source_url = NULL, *parent_source_url = NULL ;
+	gchar *proxy_source_url = NULL, *parent_source_url = NULL;
 	gchar *name;
 	gint i;
 	gint permissions = 0;
diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c
index 44c82610d6..7f526f8389 100644
--- a/plugins/groupwise-features/proxy.c
+++ b/plugins/groupwise-features/proxy.c
@@ -251,7 +251,7 @@ proxy_dialog_new (void)
 	return prd;
 }
 
-static int
+static gint
 proxy_get_permissions_from_dialog (EAccount *account)
 {
 	gint permissions;
@@ -301,7 +301,7 @@ proxy_get_permissions_from_dialog (EAccount *account)
 	return permissions;
 }
 
-static int
+static gint
 proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog)
 {
 	GtkTreeIter iter;
diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c
index c3036d1da3..b75d9abebb 100644
--- a/plugins/groupwise-features/send-options.c
+++ b/plugins/groupwise-features/send-options.c
@@ -328,7 +328,7 @@ static void
 send_options_copy_check_changed (EGwSendOptions *n_opts)
 {
 	EGwSendOptionsGeneral *ggopts, *o_gopts;
-	EGwSendOptionsStatusTracking *gmopts, *o_gmopts ;
+	EGwSendOptionsStatusTracking *gmopts, *o_gmopts;
 	EGwSendOptionsStatusTracking *gcopts, *o_gcopts;
 	EGwSendOptionsStatusTracking *gtopts, *o_gtopts;
 
diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c
index c7c315c7f0..50bb6fccf3 100644
--- a/plugins/groupwise-features/share-folder-common.c
+++ b/plugins/groupwise-features/share-folder-common.c
@@ -159,7 +159,7 @@ static void
 create_folder_done (struct _EMCreateFolder *m)
 {
 	struct ShareInfo *ssi = (struct ShareInfo *) m->user_data;
-	CamelStore *store = CAMEL_STORE (m->store) ;
+	CamelStore *store = CAMEL_STORE (m->store);
 	EGwConnection *ccnc;
 
 	if (m->done) {
@@ -207,7 +207,7 @@ new_folder_created_cb (struct _EMCreateFolder *m, gpointer user_data)
 	g_object_unref (emfs);
 }
 
-static int
+static gint
 create_folder (CamelStore *store, const gchar *full_name, void (* done) (struct _EMCreateFolder *m, gpointer user_data), gpointer user_data)
 {
 	gchar *name, *namebuf = NULL;
@@ -332,7 +332,7 @@ new_folder_response (EMFolderSelector *emfs, gint response, EMFolderTreeModel *m
 	g_signal_connect (users_dialog, "response", G_CALLBACK (users_dialog_response), ssi);
 
 	camel_object_unref (store);
-	return ;
+	return;
 
 }
 
@@ -355,7 +355,7 @@ org_gnome_create_option(EPlugin *ep, EMPopupTargetFolder *t)
 
 
 	if (! g_strrstr (t->uri, "groupwise://"))
-		return ;
+		return;
 
 	/* for translation*/
 	if (!first) {
@@ -378,7 +378,7 @@ create_shared_folder(EPopup *ep, EPopupItem *p, gpointer data)
 
 	EMFolderTreeModel *model;
 	EMFolderTree *folder_tree;
-	GtkWidget *dialog ;
+	GtkWidget *dialog;
 	gchar *uri;
 
 	model = mail_component_peek_tree_model (mail_component_peek ());
diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c
index 2b12d4be9b..87404db6bc 100644
--- a/plugins/groupwise-features/share-folder.c
+++ b/plugins/groupwise-features/share-folder.c
@@ -133,7 +133,7 @@ free_user_node(EShUsers *user)
 		g_free(user->email);
 		user->email = NULL;
 	}
-	return ;
+	return;
 }
 
 static void
@@ -144,7 +144,7 @@ free_node(SharedUser *usr)
 		g_free(user->email);
 		user->email = NULL;
 	}
-	return ;
+	return;
 }
 
 static SharedUser *
@@ -153,11 +153,11 @@ find_node(GList *list, gchar *email)
 	SharedUser *user = NULL;
 	EShUsers *usr = NULL;
 	GList *tmp;
-	gint i ;
+	gint i;
 
 	if(list){
 		tmp = g_list_first(list);
-		for(i=0; tmp  ; i++)
+		for(i=0; tmp; i++)
 		{
 			user = tmp->data;
 			usr = user->user_node;
@@ -346,7 +346,7 @@ add_clicked(GtkButton *button, ShareFolder *sf)
 			if (!g_ascii_strcasecmp (email, "" )) {
 				e_error_run (NULL, "org.gnome.evolution.mail_shared_folder:no-user",NULL);
 
-				return ;
+				return;
 			}
 
 
@@ -354,7 +354,7 @@ add_clicked(GtkButton *button, ShareFolder *sf)
 			if (sf->users_list && email){
 				new_user = find_node (sf->users_list, (gchar *)email);
 				if (new_user)
-					return ;
+					return;
 
 			}
 			usr = g_new0 (EShUsers, 1);
@@ -586,7 +586,7 @@ add_right_clicked (GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf )
 	path = gtk_tree_path_new_from_string (arg1);
 	if (!gtk_tree_model_get_iter ((GtkTreeModel *) sf->model, &(sf->iter), path)){
 		gtk_tree_path_free (path);
-		return ;
+		return;
 	}
 	gtk_tree_model_get ((GtkTreeModel *) sf->model, &(sf->iter), 0, &email, 1, &right , -1);
 	usr = find_node(sf->users_list, email);
diff --git a/plugins/groupwise-features/status-track.c b/plugins/groupwise-features/status-track.c
index 2569cbebd7..d9173e09e2 100644
--- a/plugins/groupwise-features/status-track.c
+++ b/plugins/groupwise-features/status-track.c
@@ -64,18 +64,18 @@ static void
 track_status (EPopup *ep, EPopupItem *item, gpointer data)
 {
 	EMPopupTargetSelect *t = (EMPopupTargetSelect *)data;
-	CamelMimeMessage *msg = NULL ;
-	const CamelInternetAddress *from ;
-	const gchar *namep, *addp ;
+	CamelMimeMessage *msg = NULL;
+	const CamelInternetAddress *from;
+	const gchar *namep, *addp;
 
-	GtkDialog *d ;
-	GtkTable *table ;
+	GtkDialog *d;
+	GtkTable *table;
 	GtkWidget *widget;
 	GtkScrolledWindow *win;
 	GtkVBox *vbox;
 
-	time_t time ;
-	gchar *time_str ;
+	time_t time;
+	gchar *time_str;
 
 	gchar *boldmsg;
 
@@ -87,8 +87,8 @@ track_status (EPopup *ep, EPopupItem *item, gpointer data)
 	/*Get message*/
 	msg = camel_folder_get_message (t->folder, g_ptr_array_index (t->uids, 0), NULL);
 	if (!msg) {
-		g_print ("Error!! No message\n") ;
-		return ;
+		g_print ("Error!! No message\n");
+		return;
 	}
 
 	/*Create the dialog*/
@@ -120,8 +120,8 @@ track_status (EPopup *ep, EPopupItem *item, gpointer data)
 	row++;
 
 	/*From*/
-	from = camel_mime_message_get_from (msg) ;
-	camel_internet_address_get (from, 0, &namep, &addp) ;
+	from = camel_mime_message_get_from (msg);
+	camel_internet_address_get (from, 0, &namep, &addp);
 	boldmsg = g_strdup_printf ("<b>%s</b>", _("From:"));
 	widget = gtk_label_new (boldmsg);
 	g_free (boldmsg);
@@ -134,8 +134,8 @@ track_status (EPopup *ep, EPopupItem *item, gpointer data)
 	row++;
 
 	/*creation date*/
-	time = camel_mime_message_get_date (msg, NULL) ;
-	time_str = ctime (&time) ;
+	time = camel_mime_message_get_date (msg, NULL);
+	time_str = ctime (&time);
 	time_str[strlen(time_str)-1] = '\0' ;
 	boldmsg = g_strdup_printf ("<b>%s</b>", _("Creation date:"));
 	widget = gtk_label_new (boldmsg);