Coding style and whitespace cleanup.

1 files changed, 17 insertions, 14 deletions

diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index 79e951244e..7d679e6bbf 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -43,6 +43,10 @@
 #include "cancel-comp.h"
 #include "event-editor.h"
 
+#define EVENT_EDITOR_GET_PRIVATE(obj) \
+	(G_TYPE_INSTANCE_GET_PRIVATE \
+	((obj), TYPE_EVENT_EDITOR, EventEditorPrivate))
+
 struct _EventEditorPrivate {
 	EventPage *event_page;
 	RecurrencePage *recur_page;
@@ -117,7 +121,7 @@ create_schedule_page (CompEditor *editor)
 	CompEditorPage *page;
 	GtkWidget *content_area;
 
-	priv = EVENT_EDITOR (editor)->priv;
+	priv = EVENT_EDITOR_GET_PRIVATE (editor);
 
 	priv->sched_window = gtk_dialog_new_with_buttons (
 		_("Free/Busy"), GTK_WINDOW (editor), GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -296,7 +300,7 @@ event_editor_constructor (GType type,
 		type, n_construct_properties, construct_properties);
 
 	editor = COMP_EDITOR (object);
-	priv = EVENT_EDITOR (object)->priv;
+	priv = EVENT_EDITOR_GET_PRIVATE (object);
 
 	shell = comp_editor_get_shell (editor);
 
@@ -394,7 +398,7 @@ event_editor_dispose (GObject *object)
 {
 	EventEditorPrivate *priv;
 
-	priv = EVENT_EDITOR (object)->priv;
+	priv = EVENT_EDITOR_GET_PRIVATE (object);
 
 	if (priv->event_page) {
 		g_object_unref (priv->event_page);
@@ -427,7 +431,7 @@ event_editor_constructed (GObject *object)
 {
 	EventEditorPrivate *priv;
 
-	priv = EVENT_EDITOR (object)->priv;
+	priv = EVENT_EDITOR_GET_PRIVATE (object);
 
 	g_object_bind_property (
 		object, "client",
@@ -444,7 +448,7 @@ event_editor_show_categories (CompEditor *editor,
 {
 	EventEditorPrivate *priv;
 
-	priv = EVENT_EDITOR (editor)->priv;
+	priv = EVENT_EDITOR_GET_PRIVATE (editor);
 
 	event_page_set_show_categories (priv->event_page, visible);
 }
@@ -455,7 +459,7 @@ event_editor_show_role (CompEditor *editor,
 {
 	EventEditorPrivate *priv;
 
-	priv = EVENT_EDITOR (editor)->priv;
+	priv = EVENT_EDITOR_GET_PRIVATE (editor);
 
 	event_page_set_view_role (priv->event_page, visible);
 }
@@ -466,7 +470,7 @@ event_editor_show_rsvp (CompEditor *editor,
 {
 	EventEditorPrivate *priv;
 
-	priv = EVENT_EDITOR (editor)->priv;
+	priv = EVENT_EDITOR_GET_PRIVATE (editor);
 
 	event_page_set_view_rsvp (priv->event_page, visible);
 }
@@ -477,7 +481,7 @@ event_editor_show_status (CompEditor *editor,
 {
 	EventEditorPrivate *priv;
 
-	priv = EVENT_EDITOR (editor)->priv;
+	priv = EVENT_EDITOR_GET_PRIVATE (editor);
 
 	event_page_set_view_status (priv->event_page, visible);
 }
@@ -488,7 +492,7 @@ event_editor_show_time_zone (CompEditor *editor,
 {
 	EventEditorPrivate *priv;
 
-	priv = EVENT_EDITOR (editor)->priv;
+	priv = EVENT_EDITOR_GET_PRIVATE (editor);
 
 	event_page_set_show_timezone (priv->event_page, visible);
 }
@@ -499,7 +503,7 @@ event_editor_show_type (CompEditor *editor,
 {
 	EventEditorPrivate *priv;
 
-	priv = EVENT_EDITOR (editor)->priv;
+	priv = EVENT_EDITOR_GET_PRIVATE (editor);
 
 	event_page_set_view_type (priv->event_page, visible);
 }
@@ -539,8 +543,7 @@ 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 = EVENT_EDITOR_GET_PRIVATE (ee);
 	ee->priv->model = E_MEETING_STORE (e_meeting_store_new ());
 	ee->priv->meeting_shown = TRUE;
 	ee->priv->updating = FALSE;
@@ -607,7 +610,7 @@ event_editor_edit_comp (CompEditor *editor,
 	ECalClient *client;
 	GSList *attendees = NULL;
 
-	priv = EVENT_EDITOR (editor)->priv;
+	priv = EVENT_EDITOR_GET_PRIVATE (editor);
 
 	priv->updating = TRUE;
 	delegate = (comp_editor_get_flags (COMP_EDITOR (editor)) & COMP_EDITOR_DELEGATE);
@@ -717,7 +720,7 @@ event_editor_send_comp (CompEditor *editor,
 	EventEditorPrivate *priv;
 	ECalComponent *comp = NULL;
 
-	priv = EVENT_EDITOR (editor)->priv;
+	priv = EVENT_EDITOR_GET_PRIVATE (editor);
 
 	/* Don't cancel more than once or when just publishing */
 	if (method == E_CAL_COMPONENT_METHOD_PUBLISH ||