More whitespace cleanup.

26 files changed, 76 insertions, 76 deletions

diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
index 2f752e015f..0052c13f30 100644
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ b/calendar/conduits/calendar/calendar-conduit.c
@@ -419,11 +419,11 @@ static gchar *print_remote (GnomePilotRecord *remote)
 	memset (&appt, 0, sizeof (struct Appointment));
 #ifdef PILOT_LINK_0_12
 	buffer = pi_buffer_new(DLP_BUF_SIZE);
-	if(buffer == NULL){
+	if (buffer == NULL) {
 		sprintf (buff, "[NULL]");
 		return buff;
 	}
-	if(pi_buffer_append(buffer, remote->record, remote->length)==NULL){
+	if (pi_buffer_append(buffer, remote->record, remote->length)==NULL) {
 		sprintf (buff, "[NULL]");
 		return buff;
 	}
@@ -853,7 +853,7 @@ local_record_to_pilot_record (ECalLocalRecord *local,
 	/* Generate pilot record structure */
 #ifdef PILOT_LINK_0_12
 	buffer = pi_buffer_new(DLP_BUF_SIZE);
-	if(buffer == NULL){
+	if (buffer == NULL) {
 		pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
 		return p;
 	}
@@ -908,7 +908,7 @@ local_record_from_comp (ECalLocalRecord *local, ECalComponent *comp, ECalConduit
 		pi_buffer_t * record;
 
 		record = pi_buffer_new(DLP_BUF_SIZE);
-		if(record == NULL){
+		if (record == NULL) {
 			pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
 			return;
 		}
@@ -1208,11 +1208,11 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
 
 #ifdef PILOT_LINK_0_12
 	buffer = pi_buffer_new(DLP_BUF_SIZE);
-	if(buffer == NULL){
+	if (buffer == NULL) {
 		return NULL;
 	}
 
-	if(pi_buffer_append(buffer, remote->record, remote->length)==NULL){
+	if (pi_buffer_append(buffer, remote->record, remote->length)==NULL) {
 		return NULL;
 	}
 
@@ -1604,7 +1604,7 @@ pre_sync (GnomePilotConduit *conduit,
 
 #ifdef PILOT_LINK_0_12
 	buffer = pi_buffer_new(DLP_BUF_SIZE);
-	if(buffer == NULL){
+	if (buffer == NULL) {
 		pi_set_error(dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
 		return -1;
 	}
diff --git a/calendar/conduits/common/libecalendar-common-conduit.c b/calendar/conduits/common/libecalendar-common-conduit.c
index 1be106929d..eee54e71fc 100644
--- a/calendar/conduits/common/libecalendar-common-conduit.c
+++ b/calendar/conduits/common/libecalendar-common-conduit.c
@@ -65,18 +65,18 @@ e_pilot_add_category_if_possible(gchar *cat_to_add, struct CategoryAppInfo *cate
 	gint retval = 0; /* 0 is the Unfiled category */
 	LOG(g_message("e_pilot_add_category_if_possible\n"));
 
-	for(i=0; i<PILOT_MAX_CATEGORIES; i++){
+	for (i=0; i<PILOT_MAX_CATEGORIES; i++) {
 		/* if strlen is 0, then the category is empty
 		   the PalmOS doesn't let 0-length strings for
 		   categories */
-		if(strlen(category->name[i]) == 0){
+		if (strlen(category->name[i]) == 0) {
 			gint cat_to_add_len;
 			gint desktopUniqueID;
 
 			cat_to_add_len = strlen(cat_to_add);
 			retval = i;
 
-			if(cat_to_add_len > 15){
+			if (cat_to_add_len > 15) {
 				/* Have to truncate the category name */
 				cat_to_add_len = 15;
 			}
@@ -85,18 +85,18 @@ e_pilot_add_category_if_possible(gchar *cat_to_add, struct CategoryAppInfo *cate
 			 * '\0' can't do direct mem transfer due to
 			 * declaration type
 			 */
-			for(j=0; j<cat_to_add_len; j++){
+			for (j=0; j<cat_to_add_len; j++) {
 				category->name[i][j] = cat_to_add[j];
 			}
 
-			for(j=cat_to_add_len; j<16; j++) {
+			for (j=cat_to_add_len; j<16; j++) {
 				category->name[i][j] = '\0';
 			}
 
 			/* find a desktop id that is not in use between 128 and 255 */
 			for (desktopUniqueID = 128; desktopUniqueID <= 255; desktopUniqueID++) {
 				gint found = 0;
-				for(j=0; j<PILOT_MAX_CATEGORIES; j++){
+				for (j=0; j<PILOT_MAX_CATEGORIES; j++) {
 					if (category->ID[i] == desktopUniqueID) {
 						found = 1;
 					}
@@ -116,7 +116,7 @@ e_pilot_add_category_if_possible(gchar *cat_to_add, struct CategoryAppInfo *cate
 		}
 	}
 
-	if(retval == 0){
+	if (retval == 0) {
 		LOG (g_warning ("*** not adding category - category list already full ***"));
 	}
 
@@ -173,7 +173,7 @@ void e_pilot_remote_category_to_local(gint pilotCategory, ECalComponent *comp, s
 		LOG(g_message("Category: %s\n", category_string));
 
 		/* TODO The calendar editor page and search bar are not updated until a restart of the evolution client */
-		if(e_categories_exist(category_string) == FALSE){
+		if (e_categories_exist(category_string) == FALSE) {
 			/* add if it doesn't exist */
 			LOG(g_message("Category created on pc\n"));
 			e_categories_add(category_string, NULL, NULL, TRUE);
@@ -195,7 +195,7 @@ void e_pilot_remote_category_to_local(gint pilotCategory, ECalComponent *comp, s
 
 		/* remove old item from list so we don't have duplicate entries */
 		newcat_in_list = g_slist_find_custom(c_list, category_string, (GCompareFunc)strcmp);
-		if(newcat_in_list != NULL)
+		if (newcat_in_list != NULL)
 		{
 			c_list = g_slist_remove(c_list, newcat_in_list->data);
 		}
diff --git a/calendar/conduits/memo/memo-conduit.c b/calendar/conduits/memo/memo-conduit.c
index ae45e82439..ac28e0465c 100644
--- a/calendar/conduits/memo/memo-conduit.c
+++ b/calendar/conduits/memo/memo-conduit.c
@@ -332,11 +332,11 @@ static gchar *print_remote (GnomePilotRecord *remote)
 	memset (&memo, 0, sizeof (struct Memo));
 #ifdef PILOT_LINK_0_12
 	buffer = pi_buffer_new(DLP_BUF_SIZE);
-	if(buffer == NULL){
+	if (buffer == NULL) {
 		sprintf (buff, "[NULL]");
 		return buff;
 	}
-	if(pi_buffer_append(buffer, remote->record, remote->length)==NULL){
+	if (pi_buffer_append(buffer, remote->record, remote->length)==NULL) {
 		sprintf (buff, "[NULL]");
 		return buff;
 	}
@@ -482,7 +482,7 @@ local_record_to_pilot_record (EMemoLocalRecord *local,
 	/* Generate pilot record structure */
 #ifdef PILOT_LINK_0_12
 	buffer = pi_buffer_new(DLP_BUF_SIZE);
-	if(buffer == NULL){
+	if (buffer == NULL) {
 		pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
 		return p;
 	}
@@ -543,7 +543,7 @@ local_record_from_comp (EMemoLocalRecord *local, ECalComponent *comp, EMemoCondu
 
 #ifdef PILOT_LINK_0_12
 		record = pi_buffer_new(DLP_BUF_SIZE);
-		if(record == NULL){
+		if (record == NULL) {
 			pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
 			return;
 		}
@@ -580,7 +580,7 @@ local_record_from_comp (EMemoLocalRecord *local, ECalComponent *comp, EMemoCondu
 	e_cal_component_get_description_list (comp, &d_list);
 	if (d_list) {
 		description = (ECalComponentText *) d_list->data;
-		if (description && description->value){
+		if (description && description->value) {
 			local->memo->text = e_pilot_utf8_to_pchar (description->value);
 		}
 		else{
@@ -656,11 +656,11 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
 
 #ifdef PILOT_LINK_0_12
 	buffer = pi_buffer_new(DLP_BUF_SIZE);
-	if(buffer == NULL){
+	if (buffer == NULL) {
 		return NULL;
 	}
 
-	if(pi_buffer_append(buffer, remote->record, remote->length)==NULL){
+	if (pi_buffer_append(buffer, remote->record, remote->length)==NULL) {
 		return NULL;
 	}
 
@@ -698,16 +698,16 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
 		GSList l;
 		ECalComponentText text, sumText;
 
-		for(i = 0; i<ntext && i<50; i++){
-			if(memo.text[i] == '\n'){
+		for (i = 0; i<ntext && i<50; i++) {
+			if (memo.text[i] == '\n') {
 				idxToUse = i;
 				foundNL = TRUE;
 				break;
 			}
 		}
 
-		if(foundNL == FALSE){
-			if(ntext > 50){
+		if (foundNL == FALSE) {
+			if (ntext > 50) {
 				txt2 = g_strndup(memo.text, 50);
 			}
 			else{
@@ -884,7 +884,7 @@ pre_sync (GnomePilotConduit *conduit,
 
 #ifdef PILOT_LINK_0_12
 	buffer = pi_buffer_new(DLP_BUF_SIZE);
-	if(buffer == NULL){
+	if (buffer == NULL) {
 		pi_set_error(dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
 		return -1;
 	}
diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c
index 42e79d778c..89e012bfd7 100644
--- a/calendar/conduits/todo/todo-conduit.c
+++ b/calendar/conduits/todo/todo-conduit.c
@@ -402,11 +402,11 @@ static gchar *print_remote (GnomePilotRecord *remote)
 	memset (&todo, 0, sizeof (struct ToDo));
 #ifdef PILOT_LINK_0_12
 	buffer = pi_buffer_new(DLP_BUF_SIZE);
-	if(buffer == NULL){
+	if (buffer == NULL) {
 		sprintf (buff, "[NULL]");
 		return buff;
 	}
-	if(pi_buffer_append(buffer, remote->record, remote->length)==NULL){
+	if (pi_buffer_append(buffer, remote->record, remote->length)==NULL) {
 		sprintf (buff, "[NULL]");
 		return buff;
 	}
@@ -623,7 +623,7 @@ local_record_to_pilot_record (EToDoLocalRecord *local,
 	/* Generate pilot record structure */
 #ifdef PILOT_LINK_0_12
 	buffer = pi_buffer_new(DLP_BUF_SIZE);
-	if(buffer == NULL){
+	if (buffer == NULL) {
 		pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
 		return p;
 	}
@@ -678,7 +678,7 @@ local_record_from_comp (EToDoLocalRecord *local, ECalComponent *comp, EToDoCondu
 #ifdef PILOT_LINK_0_12
 		pi_buffer_t * record;
 		record = pi_buffer_new(DLP_BUF_SIZE);
-		if(record == NULL){
+		if (record == NULL) {
 			pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
 			return;
 		}
@@ -828,11 +828,11 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
 
 #ifdef PILOT_LINK_0_12
 	buffer = pi_buffer_new(DLP_BUF_SIZE);
-	if(buffer == NULL){
+	if (buffer == NULL) {
 		return NULL;
 	}
 
-	if(pi_buffer_append(buffer, remote->record, remote->length)==NULL){
+	if (pi_buffer_append(buffer, remote->record, remote->length)==NULL) {
 		return NULL;
 	}
 
@@ -1075,7 +1075,7 @@ pre_sync (GnomePilotConduit *conduit,
 
 #ifdef PILOT_LINK_0_12
 	buffer = pi_buffer_new(DLP_BUF_SIZE);
-	if(buffer == NULL){
+	if (buffer == NULL) {
 		pi_set_error(dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
 		return -1;
 	}
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index e06b75ba50..066f295a7d 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -971,17 +971,17 @@ free_tray_icon_data (TrayIconData *tray_data)
 {
 	g_return_if_fail (tray_data != NULL);
 
-	if (tray_data->summary){
+	if (tray_data->summary) {
 		g_free (tray_data->summary);
 		tray_data->summary = NULL;
 	}
 
-	if (tray_data->description){
+	if (tray_data->description) {
 		g_free (tray_data->description);
 		tray_data->description = NULL;
 	}
 
-	if (tray_data->location){
+	if (tray_data->location) {
 		g_free (tray_data->location);
 		tray_data->location = NULL;
 	}
@@ -1128,7 +1128,7 @@ tray_list_remove_async (Message *msg)
 
 		TrayIconData *tray_data = list->data;
 
-		if (!tray_data->snooze_set){
+		if (!tray_data->snooze_set) {
 			GList *temp = list->next;
 			gboolean status;
 
diff --git a/calendar/gui/cal-search-bar.c b/calendar/gui/cal-search-bar.c
index 918338bf3f..63fcb03497 100644
--- a/calendar/gui/cal-search-bar.c
+++ b/calendar/gui/cal-search-bar.c
@@ -420,7 +420,7 @@ notify_e_cal_view_contains (CalSearchBar *cal_search, const gchar *field, const
 	g_free (text);
 
 	/* Apply the selected view on search */
-	if (view && *view){
+	if (view && *view) {
 	    sexp = g_strconcat ("(and ",sexp, view, ")", NULL);
 	}
 
@@ -710,7 +710,7 @@ make_suboptions (CalSearchBar *cal_search)
 		e_search_bar_set_viewoption_menu ((ESearchBar *)cal_search, menu);
 	}
 
-	if(subitems != NULL)
+	if (subitems != NULL)
 		g_free (subitems);
 }
 
diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c
index ab411f9e7b..5ac97f7a13 100644
--- a/calendar/gui/dialogs/alarm-dialog.c
+++ b/calendar/gui/dialogs/alarm-dialog.c
@@ -623,7 +623,7 @@ populate_widgets_from_alarm (Dialog *dialog)
                 g_warning ("%s: Unexpected alarm type (%d)", G_STRLOC, trigger->type);
 	}
 
-	switch ( trigger->u.rel_duration.is_neg ){
+	switch ( trigger->u.rel_duration.is_neg ) {
 	case 1:
 		e_dialog_combo_box_set (dialog->relative_combo, BEFORE, relative_map);
 		break;
diff --git a/calendar/gui/dialogs/calendar-setup.c b/calendar/gui/dialogs/calendar-setup.c
index de7025fd96..9b396ce2cf 100644
--- a/calendar/gui/dialogs/calendar-setup.c
+++ b/calendar/gui/dialogs/calendar-setup.c
@@ -270,7 +270,7 @@ eccp_general_offline (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidg
 			offline_setting = gtk_check_button_new_with_mnemonic (_("Cop_y calendar contents locally for offline operation"));
 		else if (sdialog->source_type == E_CAL_SOURCE_TYPE_TODO)
 			offline_setting = gtk_check_button_new_with_mnemonic (_("Cop_y task list contents locally for offline operation"));
-		else if(sdialog->source_type == E_CAL_SOURCE_TYPE_JOURNAL)
+		else if (sdialog->source_type == E_CAL_SOURCE_TYPE_JOURNAL)
 			offline_setting = gtk_check_button_new_with_mnemonic (_("Cop_y memo list contents locally for offline operation"));
 
 		gtk_widget_show (offline_setting);
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index 55989a4818..7e95d72ce1 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -1537,7 +1537,7 @@ time_sel_changed (GtkComboBox *combo, EventPage *epage)
 		gtk_widget_show (priv->end_time);
 		hour_sel_changed (GTK_SPIN_BUTTON (priv->hour_selector), epage);
 		minute_sel_changed (GTK_SPIN_BUTTON (priv->minute_selector), epage);
-	} else if (!selection){
+	} else if (!selection) {
 		gtk_widget_show (priv->time_hour);
 		gtk_widget_hide (priv->end_time);
 
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c
index f110c28564..c82bed2efc 100644
--- a/calendar/gui/dialogs/memo-page.c
+++ b/calendar/gui/dialogs/memo-page.c
@@ -586,7 +586,7 @@ memo_page_fill_component (CompEditorPage *page,
 	gtk_text_buffer_get_end_iter   (text_buffer, &text_iter_end);
 	str = gtk_text_buffer_get_text (text_buffer, &text_iter_start, &text_iter_end, FALSE);
 
-	if (!str || strlen (str) == 0){
+	if (!str || strlen (str) == 0) {
 		e_cal_component_set_description_list (comp, NULL);
 	}
 	else {
@@ -596,7 +596,7 @@ memo_page_fill_component (CompEditorPage *page,
 		gchar *txt, *p;
 		gunichar uc;
 
-		for(i = 0, p = str, uc = g_utf8_get_char_validated (p, -1);
+		for (i = 0, p = str, uc = g_utf8_get_char_validated (p, -1);
 		    i < 50 && p && uc < (gunichar)-2;
 		    i++, p = g_utf8_next_char (p), uc = g_utf8_get_char_validated (p, -1)) {
 			idxToUse = p - str;
@@ -755,7 +755,7 @@ get_widgets (MemoPage *mpage)
 #define GW(name) glade_xml_get_widget (priv->xml, name)
 
 	priv->main = GW ("memo-page");
-	if (!priv->main){
+	if (!priv->main) {
 		g_warning("couldn't find memo-page!");
 		return FALSE;
 	}
diff --git a/calendar/gui/dialogs/save-comp.c b/calendar/gui/dialogs/save-comp.c
index 3f47312d22..7284f1d0d5 100644
--- a/calendar/gui/dialogs/save-comp.c
+++ b/calendar/gui/dialogs/save-comp.c
@@ -45,7 +45,7 @@ save_component_dialog (GtkWindow *parent, ECalComponent *comp)
 {
 	ECalComponentVType vtype = e_cal_component_get_vtype(comp);
 
-	switch(vtype) {
+	switch (vtype) {
 		case E_CAL_COMPONENT_EVENT:
 			return e_error_run (parent, "calendar:prompt-save-appointment", NULL);
 		case E_CAL_COMPONENT_TODO:
diff --git a/calendar/gui/dialogs/select-source-dialog.c b/calendar/gui/dialogs/select-source-dialog.c
index 462ed7d82a..bae86827b9 100644
--- a/calendar/gui/dialogs/select-source-dialog.c
+++ b/calendar/gui/dialogs/select-source-dialog.c
@@ -48,7 +48,7 @@ select_source_dialog (GtkWindow *parent, ECalSourceType obj_type)
 		gconf_key = "/apps/evolution/calendar/sources";
 	else if (obj_type == E_CAL_SOURCE_TYPE_TODO)
 		gconf_key = "/apps/evolution/tasks/sources";
-        else if(obj_type == E_CAL_SOURCE_TYPE_JOURNAL)
+        else if (obj_type == E_CAL_SOURCE_TYPE_JOURNAL)
                 gconf_key = "/apps/evolution/memos/sources";
 	else
 		return NULL;
diff --git a/calendar/gui/e-cal-component-memo-preview.c b/calendar/gui/e-cal-component-memo-preview.c
index f19141b61a..f3969157a9 100644
--- a/calendar/gui/e-cal-component-memo-preview.c
+++ b/calendar/gui/e-cal-component-memo-preview.c
@@ -146,7 +146,7 @@ write_html (GtkHTMLStream *stream, ECal *ecal, ECalComponent *comp, icaltimezone
 				one_added = TRUE;
 			}
 			else{
-				if(one_added == FALSE){
+				if (one_added == FALSE) {
 					g_string_append_printf (string, "%s", (const gchar *) node->data);
 					one_added = TRUE;
 				}
diff --git a/calendar/gui/e-cal-model-memos.c b/calendar/gui/e-cal-model-memos.c
index 45d3e140b0..dc21b9bdda 100644
--- a/calendar/gui/e-cal-model-memos.c
+++ b/calendar/gui/e-cal-model-memos.c
@@ -151,7 +151,7 @@ ecmm_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer value)
 	}
 
 	comp_data = e_cal_model_get_component_at (E_CAL_MODEL (model), row);
-	if (!comp_data){
+	if (!comp_data) {
 		g_warning("couldn't get component data: row == %d", row);
 		return;
 	}
diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c
index 27eae77074..d951d13878 100644
--- a/calendar/gui/e-cal-model-tasks.c
+++ b/calendar/gui/e-cal-model-tasks.c
@@ -444,7 +444,7 @@ get_due_status (ECalModelTasks *model, ECalModelComponent *comp_data)
 			icalparameter *param;
 			const gchar *tzid;
 
-			if(!(param = icalproperty_get_first_parameter (prop, ICAL_TZID_PARAMETER)))
+			if (!(param = icalproperty_get_first_parameter (prop, ICAL_TZID_PARAMETER)))
 				return E_CAL_MODEL_TASKS_DUE_FUTURE;
 
 			/* Get the current time in the same timezone as the DUE date.*/
@@ -1214,7 +1214,7 @@ e_cal_model_tasks_update_due_tasks (ECalModelTasks *model)
 	{
 		comp_data = e_cal_model_get_component_at (E_CAL_MODEL (model), row);
 		status = get_due_status (E_CAL_MODEL_TASKS (model), comp_data);
-		if((status == E_CAL_MODEL_TASKS_DUE_TODAY) || (status == E_CAL_MODEL_TASKS_DUE_OVERDUE))
+		if ((status == E_CAL_MODEL_TASKS_DUE_TODAY) || (status == E_CAL_MODEL_TASKS_DUE_OVERDUE))
 		{
 			e_table_model_pre_change (E_TABLE_MODEL (model));
 			e_table_model_row_changed (E_TABLE_MODEL (model), row);
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 7e39f14a98..962d419460 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -2548,7 +2548,7 @@ icalcomp_contains_category (icalcomponent *icalcomp, const gchar *category)
 	     property = icalcomponent_get_next_property (icalcomp, ICAL_CATEGORIES_PROPERTY)) {
 		gchar *value = icalproperty_get_value_as_string_r (property);
 
-		if (value && strcmp (category, value) == 0){
+		if (value && strcmp (category, value) == 0) {
 			g_free (value);
 			return TRUE;
 		}
@@ -2659,7 +2659,7 @@ e_calendar_utils_show_error_silent (GtkWidget *widget)
 {
 	EActivityHandler *handler = calendar_component_peek_activity_handler (calendar_component_peek ());
 
-	if(!g_object_get_data ((GObject *) widget, "response-handled")) {
+	if (!g_object_get_data ((GObject *) widget, "response-handled")) {
 		g_signal_connect(widget, "response", G_CALLBACK(error_response), NULL);
 	}
 
@@ -2671,7 +2671,7 @@ e_calendar_utils_show_info_silent (GtkWidget *widget)
 {
 	EActivityHandler *handler = calendar_component_peek_activity_handler (calendar_component_peek ());
 
-	if(!g_object_get_data ((GObject *) widget, "response-handled")) {
+	if (!g_object_get_data ((GObject *) widget, "response-handled")) {
 		g_signal_connect(widget, "response", G_CALLBACK(error_response), NULL);
 	}
 
diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c
index 180b3adb1c..c4865ee707 100644
--- a/calendar/gui/e-day-view-top-item.c
+++ b/calendar/gui/e-day-view-top-item.c
@@ -426,7 +426,7 @@ e_day_view_top_item_draw_long_event (EDayViewTopItem *dvtitem,
 		GdkColormap *colormap;
 
 		colormap = gtk_widget_get_colormap (GTK_WIDGET (day_view));
-		if (gdk_colormap_alloc_color (colormap, &bg_color, TRUE, TRUE)){
+		if (gdk_colormap_alloc_color (colormap, &bg_color, TRUE, TRUE)) {
 			red = bg_color.red;
 			green = bg_color.green;
 			blue = bg_color.blue;
@@ -487,7 +487,7 @@ e_day_view_top_item_draw_long_event (EDayViewTopItem *dvtitem,
 
 	draw_curved_rectangle (cr, x0, y0, rect_width, rect_height, radius);
 
-	if (gradient){
+	if (gradient) {
 		pat = cairo_pattern_create_linear (item_x - x + 5.5, item_y + 2.5 - y,
 						item_x - x + 5, item_y - y + item_h + 7.5);
 		cairo_pattern_add_color_stop_rgba (pat, 1, red/cc, green/cc, blue/cc, 0.8);
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 5642bc7b02..614e7b7d87 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -1317,7 +1317,7 @@ e_day_view_style_set (GtkWidget *widget,
 	day_view = E_DAY_VIEW (widget);
 	e_day_view_set_colors(day_view, widget);
 
-	for (week_day = 0; week_day < E_DAY_VIEW_MAX_DAYS; week_day++){
+	for (week_day = 0; week_day < E_DAY_VIEW_MAX_DAYS; week_day++) {
 		for (event_num = 0; event_num < day_view->events[week_day]->len; event_num++) {
 			event = &g_array_index (day_view->events[week_day], EDayViewEvent, event_num);
 			if (event->canvas_item) {
@@ -1846,7 +1846,7 @@ e_day_view_update_event_label (EDayView *day_view,
 	if ((interval/day_view->mins_per_row) >= 2)
 		short_event = FALSE;
 	else if ((interval%day_view->mins_per_row)==0) {
-		if (((event->end_minute%day_view->mins_per_row)==0) || ((event->start_minute%day_view->mins_per_row)==0)){
+		if (((event->end_minute%day_view->mins_per_row)==0) || ((event->start_minute%day_view->mins_per_row)==0)) {
 			short_event = TRUE;
 		}
 	} else
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index ca99bb5dba..e8922abde7 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -909,7 +909,7 @@ set_date_label (EItipControl *itip, GtkHTML *html, GtkHTMLStream *html_stream,
 	g_string_truncate (buffer, 0);
 
 	e_cal_component_get_dtend (comp, &datetime);
-	if (datetime.value){
+	if (datetime.value) {
 		/* For Translators : 'ends' is ends:date implying a task ends on what date */
 		str = g_strdup_printf ("<b>%s:</b>", _("Ends"));
 		write_label_piece (itip, &datetime, buffer, str, "<br>", FALSE);
diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c
index 55e3af816e..d4b87fc270 100644
--- a/calendar/gui/e-meeting-list-view.c
+++ b/calendar/gui/e-meeting-list-view.c
@@ -396,7 +396,7 @@ attendee_edited_cb (GtkCellRenderer *renderer, const gchar *path, GList *address
 		gchar *name = names->data, *email = addresses->data;
 		gint existing_row;
 
-		if (!((name && *name) || (email && *email)) || ((e_meeting_store_find_attendee (model, email, &existing_row) != NULL) && existing_row != row)){
+		if (!((name && *name) || (email && *email)) || ((e_meeting_store_find_attendee (model, email, &existing_row) != NULL) && existing_row != row)) {
 			if (existing_attendee) {
 				removed = TRUE;
 				e_meeting_list_view_remove_attendee_from_name_selector (E_MEETING_LIST_VIEW (view),
diff --git a/calendar/gui/e-meeting-time-sel-item.c b/calendar/gui/e-meeting-time-sel-item.c
index 90a12b51df..041ae6e403 100644
--- a/calendar/gui/e-meeting-time-sel-item.c
+++ b/calendar/gui/e-meeting-time-sel-item.c
@@ -294,7 +294,7 @@ e_meeting_time_selector_item_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
 	    && (meeting_end_x - meeting_start_x > 2)) {
 		cairo_save (cr);
 		gdk_cairo_set_source_color (cr, &mts->meeting_time_bg_color);
-		if (is_display_top){
+		if (is_display_top) {
 			cairo_rectangle (cr, meeting_start_x + 1 - x, mts->row_height * 2 - y,
 					    meeting_end_x - meeting_start_x - 2, mts->row_height);
 			cairo_fill (cr);
diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c
index 8ad8b608a2..66c1bed136 100644
--- a/calendar/gui/e-week-view-event-item.c
+++ b/calendar/gui/e-week-view-event-item.c
@@ -501,7 +501,7 @@ e_week_view_event_item_draw (GnomeCanvasItem  *canvas_item,
 
 		draw_curved_rectangle (cr, cx0, cy0, rect_width, rect_height, radius);
 
-		if (gradient){
+		if (gradient) {
 			pat = cairo_pattern_create_linear (rect_x + 2, y1 + 1,
 						rect_x + 2, y2 - 7.25);
 			cairo_pattern_add_color_stop_rgba (pat, 1, red/cc, green/cc, blue/cc, 0.8);
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 5ff63a3450..2d5c80996b 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -895,7 +895,7 @@ e_week_view_style_set (GtkWidget *widget,
 				span_num++) {
 			span = &g_array_index (week_view->spans,
 					EWeekViewEventSpan, span_num);
-			if (span->text_item){
+			if (span->text_item) {
 				gnome_canvas_item_set (span->text_item,
 						"fill_color_gdk", &widget->style->text[GTK_STATE_NORMAL],
 						NULL);
@@ -2243,7 +2243,7 @@ e_week_view_on_scroll (GtkWidget *widget,
 		g_object_set_data (G_OBJECT (week_view), "tooltip-window", NULL);
 	}
 
-	switch (scroll->direction){
+	switch (scroll->direction) {
 	case GDK_SCROLL_UP:
 		new_value = adj->value - adj->page_increment;
 		break;
@@ -3049,7 +3049,7 @@ e_week_view_start_editing_event (EWeekView *week_view,
 		/* Unfocussing can cause a removal but not a new
 		 * addition so just run backwards through the
 		 * events */
-		for (event_num--; event_num >= 0; event_num--){
+		for (event_num--; event_num >= 0; event_num--) {
 			event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
 			if (event->comp_data == comp_data)
 				break;
@@ -3397,7 +3397,7 @@ e_week_view_scroll_a_step (EWeekView *week_view, ECalViewMoveDirection direction
 	GtkAdjustment *adj = GTK_RANGE (week_view->vscrollbar)->adjustment;
 	gfloat new_value;
 
-	switch (direction){
+	switch (direction) {
 	case E_CAL_VIEW_MOVE_UP:
 		new_value = adj->value - adj->step_increment;
 		break;
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 43f131fbe3..adfcdac09f 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -1039,7 +1039,7 @@ search_bar_sexp_changed_cb (CalSearchBar *cal_search, const gchar *sexp, gpointe
 	gcal = GNOME_CALENDAR (data);
 
 	/* Choose List view if the search made in the search bar is based on date */
-	if(sexp != NULL && strstr (sexp, d_sexp ) != NULL) {
+	if (sexp != NULL && strstr (sexp, d_sexp ) != NULL) {
 		gcal->priv->lview_select_daten_range = FALSE;
 		gtk_widget_hide (GTK_WIDGET (gcal->priv->date_navigator));
 		gnome_calendar_set_view (gcal, GNOME_CAL_LIST_VIEW);
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index 860edd7ffd..79df2ddad4 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -497,7 +497,7 @@ comp_to_list (ECalComponentItipMethod method, ECalComponent *comp, GList *users,
 
 	case E_CAL_COMPONENT_METHOD_REPLY:
 
-		if (reply_all){
+		if (reply_all) {
 			e_cal_component_get_attendee_list (comp, &attendees);
 			len = g_slist_length (attendees);
 
@@ -568,7 +568,7 @@ comp_to_list (ECalComponentItipMethod method, ECalComponent *comp, GList *users,
 			if (att->cutype != ICAL_CUTYPE_INDIVIDUAL && att->cutype != ICAL_CUTYPE_GROUP)
 				continue;
 
-			if (!g_ascii_strcasecmp (itip_strip_mailto (att->value), sender) || (att->sentby && !g_ascii_strcasecmp (itip_strip_mailto (att->sentby), sender))){
+			if (!g_ascii_strcasecmp (itip_strip_mailto (att->value), sender) || (att->sentby && !g_ascii_strcasecmp (itip_strip_mailto (att->sentby), sender))) {
 
 				if (!(att->delfrom && *att->delfrom))
 					break;
@@ -584,7 +584,7 @@ comp_to_list (ECalComponentItipMethod method, ECalComponent *comp, GList *users,
 
 		break;
 	case E_CAL_COMPONENT_METHOD_PUBLISH:
-		if(users) {
+		if (users) {
 			GList *list;
 
 			array = g_ptr_array_new ();
@@ -1367,7 +1367,7 @@ reply_to_calendar_comp (ECalComponentItipMethod method,
 	top_level = comp_toplevel_with_zones (method, comp, client, zones);
 	ical_string = icalcomponent_as_ical_string_r (top_level);
 
-	if (e_cal_component_get_vtype (comp) == E_CAL_COMPONENT_EVENT){
+	if (e_cal_component_get_vtype (comp) == E_CAL_COMPONENT_EVENT) {
 
 		GString *body;
 		gchar *orig_from = NULL;
@@ -1385,7 +1385,7 @@ reply_to_calendar_comp (ECalComponentItipMethod method,
 
 		e_cal_component_get_description_list (comp, &text_list);
 
-		if (text_list){
+		if (text_list) {
 			ECalComponentText text = *((ECalComponentText *)text_list->data);
 			if (text.value)
 				description = text.value;
@@ -1528,7 +1528,7 @@ fb_sort (struct icalperiodtype *ipt, gint fb_count)
 			if (icaltime_compare (ipt[i].start, ipt[j].start) < 0)
 				continue;
 
-			if (icaltime_compare (ipt[i].start, ipt[j].start) == 0){
+			if (icaltime_compare (ipt[i].start, ipt[j].start) == 0) {
 				if (icaltime_compare (ipt[i].end,
 						     ipt[j].start) < 0)
 					continue;
diff --git a/calendar/gui/main.c b/calendar/gui/main.c
index 99245384ec..9d078edbd9 100644
--- a/calendar/gui/main.c
+++ b/calendar/gui/main.c
@@ -168,7 +168,7 @@ factory (BonoboGenericFactory *factory,
 		BonoboObject *object = BONOBO_OBJECT (tasks_component_peek ());
 		bonobo_object_ref (object);
 		return object;
-	} else if (strcmp (component_id, MEMOS_COMPONENT_ID) == 0){
+	} else if (strcmp (component_id, MEMOS_COMPONENT_ID) == 0) {
 		BonoboObject *object = BONOBO_OBJECT (memos_component_peek ());
 		bonobo_object_ref (object);
 		return object;