Coding style and whitespace cleanup.

addressbook/gui/contact-editor/eab-editor.c

@@ -214,7 +214,8 @@ eab_editor_class_init (EABEditorClass *class)
 static void
 eab_editor_init (EABEditor *editor)
 {
-	editor->priv = G_TYPE_INSTANCE_GET_PRIVATE (editor, EAB_TYPE_EDITOR, EABEditorPrivate);
+	editor->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		editor, EAB_TYPE_EDITOR, EABEditorPrivate);
 
 	all_editors = g_slist_prepend (all_editors, editor);
 }

addressbook/gui/contact-list-editor/e-contact-list-editor.c

@@ -1266,7 +1266,8 @@ contact_list_editor_init (EContactListEditor *editor)
 	GtkCellRenderer *renderer;
 	GtkTreeView *view;
 
-	editor->priv = priv = G_TYPE_INSTANCE_GET_PRIVATE (editor, E_TYPE_CONTACT_LIST_EDITOR, EContactListEditorPrivate);
+	editor->priv = priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		editor, E_TYPE_CONTACT_LIST_EDITOR, EContactListEditorPrivate);
 
 	priv->editable = TRUE;
 	priv->allows_contact_lists = TRUE;

addressbook/gui/widgets/e-addressbook-model.c

@@ -670,7 +670,8 @@ addressbook_model_class_init (EAddressbookModelClass *class)
 static void
 addressbook_model_init (EAddressbookModel *model)
 {
-	model->priv = G_TYPE_INSTANCE_GET_PRIVATE (model, E_TYPE_ADDRESSBOOK_MODEL, EAddressbookModelPrivate);
+	model->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		model, E_TYPE_ADDRESSBOOK_MODEL, EAddressbookModelPrivate);
 
 	model->priv->contacts = g_ptr_array_new ();
 	model->priv->first_get_view = TRUE;

addressbook/gui/widgets/e-addressbook-selector.c

@@ -320,7 +320,9 @@ addressbook_selector_class_init (EAddressbookSelectorClass *class)
 static void
 addressbook_selector_init (EAddressbookSelector *selector)
 {
-	selector->priv = G_TYPE_INSTANCE_GET_PRIVATE (selector, E_TYPE_ADDRESSBOOK_SELECTOR, EAddressbookSelectorPrivate);
+	selector->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		selector, E_TYPE_ADDRESSBOOK_SELECTOR,
+		EAddressbookSelectorPrivate);
 
 	gtk_drag_dest_set (
 		GTK_WIDGET (selector), GTK_DEST_DEFAULT_ALL,

addressbook/gui/widgets/e-addressbook-view.c

@@ -844,7 +844,8 @@ addressbook_view_init (EAddressbookView *view)
 {
 	GtkTargetList *target_list;
 
-	view->priv = G_TYPE_INSTANCE_GET_PRIVATE (view, E_TYPE_ADDRESSBOOK_VIEW, EAddressbookViewPrivate);
+	view->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		view, E_TYPE_ADDRESSBOOK_VIEW, EAddressbookViewPrivate);
 
 	view->priv->model = e_addressbook_model_new ();
 

addressbook/gui/widgets/eab-config.c

@@ -35,7 +35,8 @@ struct _EABConfigPrivate {
 static void
 ecp_init (EABConfig *cfg)
 {
-	cfg->priv = G_TYPE_INSTANCE_GET_PRIVATE (cfg, EAB_TYPE_CONFIG, EABConfigPrivate);
+	cfg->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		cfg, EAB_TYPE_CONFIG, EABConfigPrivate);
 }
 
 static void
@@ -86,7 +87,9 @@ ecp_set_target (EConfig *ec, EConfigTarget *t)
 		case EAB_CONFIG_TARGET_SOURCE: {
 			EABConfigTargetSource *s = (EABConfigTargetSource *)t;
 
-			p->source_changed_id = g_signal_connect(s->source, "changed", G_CALLBACK(ecp_source_changed), ec);
+			p->source_changed_id = g_signal_connect (
+				s->source, "changed",
+				G_CALLBACK (ecp_source_changed), ec);
 			break; }
 		}
 	}
@@ -134,7 +137,8 @@ eab_config_new (gint type, const gchar *menuid)
 EABConfigTargetSource *
 eab_config_target_new_source (EABConfig *ecp, struct _ESource *source)
 {
-	EABConfigTargetSource *t = e_config_target_new (&ecp->config, EAB_CONFIG_TARGET_SOURCE, sizeof (*t));
+	EABConfigTargetSource *t = e_config_target_new (
+		&ecp->config, EAB_CONFIG_TARGET_SOURCE, sizeof (*t));
 
 	t->source = source;
 	g_object_ref (source);

addressbook/gui/widgets/eab-contact-display.c

@@ -1194,7 +1194,8 @@ eab_contact_display_init (EABContactDisplay *display)
 	const gchar *domain = GETTEXT_PACKAGE;
 	GError *error = NULL;
 
-	display->priv = G_TYPE_INSTANCE_GET_PRIVATE (display, EAB_TYPE_CONTACT_DISPLAY, EABContactDisplayPrivate);
+	display->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		display, EAB_TYPE_CONTACT_DISPLAY, EABContactDisplayPrivate);
 	display->priv->mode = EAB_CONTACT_DISPLAY_RENDER_NORMAL;
 	display->priv->orientation = GTK_ORIENTATION_HORIZONTAL;
 

calendar/gui/alarm-notify/alarm-notify.c

@@ -238,7 +238,8 @@ alarm_notify_init (AlarmNotify *an)
 {
 	gint ii;
 
-	an->priv = G_TYPE_INSTANCE_GET_PRIVATE (an, TYPE_ALARM_NOTIFY, AlarmNotifyPrivate);
+	an->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		an, TYPE_ALARM_NOTIFY, AlarmNotifyPrivate);
 	an->priv->mutex = g_mutex_new ();
 	an->priv->selected_calendars = config_data_get_calendars (
 		"/apps/evolution/calendar/sources");

calendar/gui/comp-util.c

@@ -231,9 +231,11 @@ cal_comp_is_on_server (ECalComponent *comp, ECal *client)
 	 */
 	e_cal_component_get_uid (comp, &uid);
 
-	/*TODO We should not be checking for this here. But since e_cal_util_construct_instance does not
-	  create the instances of all day events, so we dafault to old behaviour */
-	if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_RECURRENCES_NO_MASTER)) {
+	/* TODO We should not be checking for this here. But since
+	 *      e_cal_util_construct_instance does not create the instances
+	 *      of all day events, so we default to old behaviour. */
+	if (e_cal_get_static_capability (
+		client, CAL_STATIC_CAPABILITY_RECURRENCES_NO_MASTER)) {
 		rid = e_cal_component_get_recurid_as_string (comp);
 	}
 
@@ -255,7 +257,8 @@ cal_comp_is_on_server (ECalComponent *comp, ECal *client)
 
 /**
  * is_icalcomp_on_the_server:
- * same as @cal_comp_is_on_server, only the component parameter is icalcomponent, not the ECalComponent.
+ * same as @cal_comp_is_on_server, only the component parameter is
+ * icalcomponent, not the ECalComponent.
  **/
 gboolean
 is_icalcomp_on_the_server (icalcomponent *icalcomp, ECal *client)
@@ -446,7 +449,8 @@ cal_comp_update_time_by_active_window (ECalComponent *comp, EShell *shell)
 
 		if (e_shell_window_get_active_view (shell_window)
 		    && g_str_equal (e_shell_window_get_active_view (shell_window), "calendar")) {
-			EShellView *view;
+			EShellContent *shell_content;
+			EShellView *shell_view;
 			GnomeCalendar *gnome_cal;
 			time_t start = 0, end = 0;
 			icaltimezone *zone;
@@ -454,11 +458,13 @@ cal_comp_update_time_by_active_window (ECalComponent *comp, EShell *shell)
 			icalcomponent *icalcomp;
 			icalproperty *prop;
 
-			view = e_shell_window_peek_shell_view (shell_window, "calendar");
-			g_return_if_fail (view != NULL);
+			shell_view = e_shell_window_peek_shell_view (
+				shell_window, "calendar");
+			g_return_if_fail (shell_view != NULL);
 
 			gnome_cal = NULL;
-			g_object_get (G_OBJECT (e_shell_view_get_shell_content (view)), "calendar", &gnome_cal, NULL);
+			shell_content = e_shell_view_get_shell_content (shell_view);
+			g_object_get (shell_content, "calendar", &gnome_cal, NULL);
 			g_return_if_fail (gnome_cal != NULL);
 
 			gnome_calendar_get_current_time_range (gnome_cal, &start, &end);
@@ -616,7 +622,9 @@ datetime_to_zone (ECal *client, ECalComponentDateTime *date, const gchar *tzid)
 	from = icaltimezone_get_builtin_timezone_from_tzid (date->tzid);
 	if (!from) {
 		if (!e_cal_get_timezone (client, date->tzid, &from, NULL))
-			g_warning ("%s: Could not get timezone from server: %s", G_STRFUNC, date->tzid ? date->tzid : "");
+			g_warning (
+				"%s: Could not get timezone from server: %s",
+				G_STRFUNC, date->tzid ? date->tzid : "");
 	}
 
 	to = icaltimezone_get_builtin_timezone_from_tzid (tzid);
@@ -638,7 +646,9 @@ datetime_to_zone (ECal *client, ECalComponentDateTime *date, const gchar *tzid)
  * Changes 'dtstart' of the component, but converts time to the old timezone.
  **/
 void
-cal_comp_set_dtstart_with_oldzone (ECal *client, ECalComponent *comp, const ECalComponentDateTime *pdate)
+cal_comp_set_dtstart_with_oldzone (ECal *client,
+                                   ECalComponent *comp,
+                                   const ECalComponentDateTime *pdate)
 {
 	ECalComponentDateTime olddate, date;
 
@@ -664,7 +674,9 @@ cal_comp_set_dtstart_with_oldzone (ECal *client, ECalComponent *comp, const ECal
  * Changes 'dtend' of the component, but converts time to the old timezone.
  **/
 void
-cal_comp_set_dtend_with_oldzone (ECal *client, ECalComponent *comp, const ECalComponentDateTime *pdate)
+cal_comp_set_dtend_with_oldzone (ECal *client,
+                                 ECalComponent *comp,
+                                 const ECalComponentDateTime *pdate)
 {
 	ECalComponentDateTime olddate, date;
 
@@ -682,7 +694,8 @@ cal_comp_set_dtend_with_oldzone (ECal *client, ECalComponent *comp, const ECalCo
 }
 
 void
-comp_util_sanitize_recurrence_master (ECalComponent *comp, ECal *client)
+comp_util_sanitize_recurrence_master (ECalComponent *comp,
+                                      ECal *client)
 {
 	ECalComponent *master = NULL;
 	icalcomponent *icalcomp = NULL;
@@ -704,7 +717,9 @@ comp_util_sanitize_recurrence_master (ECalComponent *comp, ECal *client)
 	e_cal_component_get_recurid (comp, &rid);
 	e_cal_component_get_dtstart (comp, &sdt);
 
-	if (rid.datetime.value && sdt.value && icaltime_compare_date_only (*rid.datetime.value, *sdt.value) == 0) {
+	if (rid.datetime.value && sdt.value &&
+	    icaltime_compare_date_only (
+	    *rid.datetime.value, *sdt.value) == 0) {
 		ECalComponentDateTime msdt, medt, edt;
 		gint *sequence;
 

calendar/gui/dialogs/comp-editor-page.c

@@ -172,7 +172,8 @@ comp_editor_page_class_init (CompEditorPageClass *class)
 static void
 comp_editor_page_init (CompEditorPage *page)
 {
-	page->priv = G_TYPE_INSTANCE_GET_PRIVATE (page, TYPE_COMP_EDITOR_PAGE, CompEditorPagePrivate);
+	page->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		page, TYPE_COMP_EDITOR_PAGE, CompEditorPagePrivate);
 
 	page->accel_group = NULL;
 }

calendar/gui/dialogs/comp-editor.c

@@ -1831,7 +1831,8 @@ comp_editor_init (CompEditor *editor)
 	express_mode = e_shell_get_express_mode (shell);
 	meego_mode = e_shell_get_meego_mode (shell);
 
-	editor->priv = priv = G_TYPE_INSTANCE_GET_PRIVATE (editor, TYPE_COMP_EDITOR, CompEditorPrivate);
+	editor->priv = priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		editor, TYPE_COMP_EDITOR, CompEditorPrivate);
 
 	g_object_weak_ref (
 		G_OBJECT (editor), (GWeakNotify)

calendar/gui/dialogs/event-editor.c

@@ -539,7 +539,8 @@ event_editor_init (EventEditor *ee)
 	const gchar *id;
 	GError *error = NULL;
 
-	ee->priv = G_TYPE_INSTANCE_GET_PRIVATE (ee, TYPE_EVENT_EDITOR, EventEditorPrivate);
+	ee->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		ee, TYPE_EVENT_EDITOR, EventEditorPrivate);
 	ee->priv->model = E_MEETING_STORE (e_meeting_store_new ());
 	ee->priv->meeting_shown = TRUE;
 	ee->priv->updating = FALSE;

calendar/gui/dialogs/event-page.c

@@ -289,7 +289,8 @@ event_page_class_init (EventPageClass *class)
 static void
 event_page_init (EventPage *epage)
 {
-	epage->priv = G_TYPE_INSTANCE_GET_PRIVATE (epage, TYPE_EVENT_PAGE, EventPagePrivate);
+	epage->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		epage, TYPE_EVENT_PAGE, EventPagePrivate);
 	epage->priv->deleted_attendees = g_ptr_array_new ();
 	epage->priv->alarm_interval = -1;
 	epage->priv->alarm_map = alarm_map_with_user_time;

calendar/gui/dialogs/memo-editor.c

@@ -136,7 +136,8 @@ memo_editor_init (MemoEditor *me)
 	const gchar *id;
 	GError *error = NULL;
 
-	me->priv = G_TYPE_INSTANCE_GET_PRIVATE (me, TYPE_MEMO_EDITOR, MemoEditorPrivate);
+	me->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		me, TYPE_MEMO_EDITOR, MemoEditorPrivate);
 	me->priv->updating = FALSE;
 
 	ui_manager = comp_editor_get_ui_manager (editor);

calendar/gui/dialogs/memo-page.c

@@ -315,7 +315,8 @@ memo_page_class_init (MemoPageClass *class)
 static void
 memo_page_init (MemoPage *mpage)
 {
-	mpage->priv = G_TYPE_INSTANCE_GET_PRIVATE (mpage, TYPE_MEMO_PAGE, MemoPagePrivate);
+	mpage->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		mpage, TYPE_MEMO_PAGE, MemoPagePrivate);
 }
 
 /* returns whether changed info text */

calendar/gui/dialogs/recurrence-page.c

@@ -377,7 +377,8 @@ recurrence_page_class_init (RecurrencePageClass *class)
 static void
 recurrence_page_init (RecurrencePage *rpage)
 {
-	rpage->priv = G_TYPE_INSTANCE_GET_PRIVATE (rpage, TYPE_RECURRENCE_PAGE, RecurrencePagePrivate);
+	rpage->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		rpage, TYPE_RECURRENCE_PAGE, RecurrencePagePrivate);
 }
 
 /* get_widget handler for the recurrence page */

calendar/gui/dialogs/schedule-page.c

@@ -271,7 +271,8 @@ schedule_page_class_init (SchedulePageClass *class)
 static void
 schedule_page_init (SchedulePage *spage)
 {
-	spage->priv = G_TYPE_INSTANCE_GET_PRIVATE (spage, TYPE_SCHEDULE_PAGE, SchedulePagePrivate);
+	spage->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		spage, TYPE_SCHEDULE_PAGE, SchedulePagePrivate);
 }
 
 /* Gets the widgets from the XML file and returns if they are all available. */

calendar/gui/dialogs/task-details-page.c

@@ -436,7 +436,8 @@ task_details_page_class_init (TaskDetailsPageClass *class)
 static void
 task_details_page_init (TaskDetailsPage *tdpage)
 {
-	tdpage->priv = G_TYPE_INSTANCE_GET_PRIVATE (tdpage, TYPE_TASK_DETAILS_PAGE, TaskDetailsPagePrivate);
+	tdpage->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		tdpage, TYPE_TASK_DETAILS_PAGE, TaskDetailsPagePrivate);
 }
 
 /* Gets the widgets from the XML file and returns if they are all available. */

calendar/gui/dialogs/task-editor.c

@@ -316,7 +316,8 @@ task_editor_init (TaskEditor *te)
 	const gchar *id;
 	GError *error = NULL;
 
-	te->priv = G_TYPE_INSTANCE_GET_PRIVATE (te, TYPE_TASK_EDITOR, TaskEditorPrivate);
+	te->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		te, TYPE_TASK_EDITOR, TaskEditorPrivate);
 	te->priv->model = E_MEETING_STORE (e_meeting_store_new ());
 	te->priv->assignment_shown = TRUE;
 	te->priv->updating = FALSE;

calendar/gui/dialogs/task-page.c

@@ -217,7 +217,8 @@ task_page_class_init (TaskPageClass *class)
 static void
 task_page_init (TaskPage *tpage)
 {
-	tpage->priv = G_TYPE_INSTANCE_GET_PRIVATE (tpage, TYPE_TASK_PAGE, TaskPagePrivate);
+	tpage->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		tpage, TYPE_TASK_PAGE, TaskPagePrivate);
 	tpage->priv->deleted_attendees = g_ptr_array_new ();
 }