From c003c99a75587ba39a45d164272760c33f9666b5 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Fri, 25 Feb 2011 16:20:41 +0100
Subject: Bug #614480 - Avoid using G_TYPE_INSTANCE_GET_PRIVATE repeatedly

---
 calendar/gui/dialogs/task-editor.c | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

(limited to 'calendar/gui/dialogs/task-editor.c')

diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index 933299feb0..1d8bec3ea7 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -40,10 +40,6 @@
 #include "cancel-comp.h"
 #include "task-editor.h"
 
-#define TASK_EDITOR_GET_PRIVATE(obj) \
-	(G_TYPE_INSTANCE_GET_PRIVATE \
-	((obj), TYPE_TASK_EDITOR, TaskEditorPrivate))
-
 struct _TaskEditorPrivate {
 	TaskPage *task_page;
 	TaskDetailsPage *task_details_page;
@@ -156,7 +152,7 @@ task_editor_constructor (GType type,
 		type, n_construct_properties, construct_properties);
 
 	editor = COMP_EDITOR (object);
-	priv = TASK_EDITOR_GET_PRIVATE (object);
+	priv = TASK_EDITOR (object)->priv;
 
 	client = comp_editor_get_client (editor);
 	flags = comp_editor_get_flags (editor);
@@ -181,7 +177,7 @@ task_editor_dispose (GObject *object)
 {
 	TaskEditorPrivate *priv;
 
-	priv = TASK_EDITOR_GET_PRIVATE (object);
+	priv = TASK_EDITOR (object)->priv;
 
 	if (priv->task_page) {
 		g_object_unref (priv->task_page);
@@ -207,7 +203,7 @@ task_editor_constructed (GObject *object)
 {
 	TaskEditorPrivate *priv;
 
-	priv = TASK_EDITOR_GET_PRIVATE (object);
+	priv = TASK_EDITOR (object)->priv;
 
 	g_object_bind_property (
 		object, "client",
@@ -224,7 +220,7 @@ task_editor_show_categories (CompEditor *editor,
 {
 	TaskEditorPrivate *priv;
 
-	priv = TASK_EDITOR_GET_PRIVATE (editor);
+	priv = TASK_EDITOR (editor)->priv;
 
 	task_page_set_show_categories (priv->task_page, visible);
 }
@@ -235,7 +231,7 @@ task_editor_show_role (CompEditor *editor,
 {
 	TaskEditorPrivate *priv;
 
-	priv = TASK_EDITOR_GET_PRIVATE (editor);
+	priv = TASK_EDITOR (editor)->priv;
 
 	task_page_set_view_role (priv->task_page, visible);
 }
@@ -246,7 +242,7 @@ task_editor_show_rsvp (CompEditor *editor,
 {
 	TaskEditorPrivate *priv;
 
-	priv = TASK_EDITOR_GET_PRIVATE (editor);
+	priv = TASK_EDITOR (editor)->priv;
 
 	task_page_set_view_rsvp (priv->task_page, visible);
 }
@@ -257,7 +253,7 @@ task_editor_show_status (CompEditor *editor,
 {
 	TaskEditorPrivate *priv;
 
-	priv = TASK_EDITOR_GET_PRIVATE (editor);
+	priv = TASK_EDITOR (editor)->priv;
 
 	task_page_set_view_status (priv->task_page, visible);
 }
@@ -268,7 +264,7 @@ task_editor_show_time_zone (CompEditor *editor,
 {
 	TaskEditorPrivate *priv;
 
-	priv = TASK_EDITOR_GET_PRIVATE (editor);
+	priv = TASK_EDITOR (editor)->priv;
 
 	task_page_set_show_timezone (priv->task_page, visible);
 }
@@ -279,7 +275,7 @@ task_editor_show_type (CompEditor *editor,
 {
 	TaskEditorPrivate *priv;
 
-	priv = TASK_EDITOR_GET_PRIVATE (editor);
+	priv = TASK_EDITOR (editor)->priv;
 
 	task_page_set_view_type (priv->task_page, visible);
 }
@@ -320,7 +316,7 @@ task_editor_init (TaskEditor *te)
 	const gchar *id;
 	GError *error = NULL;
 
-	te->priv = TASK_EDITOR_GET_PRIVATE (te);
+	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;
@@ -394,7 +390,7 @@ task_editor_edit_comp (CompEditor *editor, ECalComponent *comp)
 	ECal *client;
 	GSList *attendees = NULL;
 
-	priv = TASK_EDITOR_GET_PRIVATE (editor);
+	priv = TASK_EDITOR (editor)->priv;
 
 	priv->updating = TRUE;
 
@@ -477,7 +473,7 @@ task_editor_send_comp (CompEditor *editor,
 	TaskEditorPrivate *priv;
 	ECalComponent *comp = NULL;
 
-	priv = TASK_EDITOR_GET_PRIVATE (editor);
+	priv = TASK_EDITOR (editor)->priv;
 
 	/* Don't cancel more than once or when just publishing */
 	if (method == E_CAL_COMPONENT_METHOD_PUBLISH ||
-- 
cgit v1.2.3