From d097ac6883dab98ffe326299f7293062573433f8 Mon Sep 17 00:00:00 2001 From: Chenthill Palanisamy Date: Thu, 29 Sep 2005 13:02:56 +0000 Subject: Fixes #317014 svn path=/trunk/; revision=30418 --- calendar/gui/dialogs/comp-editor-page.h | 1 + calendar/gui/dialogs/comp-editor.h | 1 + calendar/gui/dialogs/task-editor.c | 10 ++++++---- calendar/gui/dialogs/task-editor.h | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) (limited to 'calendar/gui/dialogs') diff --git a/calendar/gui/dialogs/comp-editor-page.h b/calendar/gui/dialogs/comp-editor-page.h index 72a8f057a2..9da69da076 100644 --- a/calendar/gui/dialogs/comp-editor-page.h +++ b/calendar/gui/dialogs/comp-editor-page.h @@ -48,6 +48,7 @@ typedef enum { COMP_EDITOR_PAGE_MEETING = 1<<1, COMP_EDITOR_PAGE_DELEGATE = 1<<2, COMP_EDITOR_PAGE_USER_ORG = 1<<3, + COMP_EDITOR_PAGE_IS_ASSIGNED = 1<<4, } CompEditorPageFlags; typedef struct { diff --git a/calendar/gui/dialogs/comp-editor.h b/calendar/gui/dialogs/comp-editor.h index 3ce43fa825..31f977e3ff 100644 --- a/calendar/gui/dialogs/comp-editor.h +++ b/calendar/gui/dialogs/comp-editor.h @@ -59,6 +59,7 @@ typedef enum { COMP_EDITOR_MEETING = 1<<1, COMP_EDITOR_DELEGATE = 1<<2, COMP_EDITOR_USER_ORG = 1<<3, + COMP_EDITOR_IS_ASSIGNED = 1<<4, } CompEditorFlags; GtkType comp_editor_get_type (void); diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c index 4a393f6bf8..85ddbabbc4 100644 --- a/calendar/gui/dialogs/task-editor.c +++ b/calendar/gui/dialogs/task-editor.c @@ -122,14 +122,13 @@ task_editor_init (TaskEditor *te) } TaskEditor * -task_editor_construct (TaskEditor *te, ECal *client, gboolean is_assigned) +task_editor_construct (TaskEditor *te, ECal *client) { TaskEditorPrivate *priv; gboolean read_only = FALSE; priv = te->priv; - priv->is_assigned = is_assigned; priv->task_page = task_page_new (); g_object_ref (priv->task_page); gtk_object_sink (GTK_OBJECT (priv->task_page)); @@ -356,12 +355,15 @@ task_editor_finalize (GObject *object) * editor could not be created. **/ TaskEditor * -task_editor_new (ECal *client, gboolean is_assigned) +task_editor_new (ECal *client, CompEditorFlags flags) { TaskEditor *te; te = g_object_new (TYPE_TASK_EDITOR, NULL); - return task_editor_construct (te, client, is_assigned); + te->priv->is_assigned = flags & COMP_EDITOR_IS_ASSIGNED; + comp_editor_set_flags (COMP_EDITOR (te), flags); + + return task_editor_construct (te, client); } static void diff --git a/calendar/gui/dialogs/task-editor.h b/calendar/gui/dialogs/task-editor.h index d1b8b327d5..a8134829ae 100644 --- a/calendar/gui/dialogs/task-editor.h +++ b/calendar/gui/dialogs/task-editor.h @@ -53,8 +53,8 @@ struct _TaskEditorClass { GtkType task_editor_get_type (void); TaskEditor *task_editor_construct (TaskEditor *te, - ECal *client, gboolean is_assigned); -TaskEditor *task_editor_new (ECal *client, gboolean is_assigned); + ECal *client); +TaskEditor *task_editor_new (ECal *client, CompEditorFlags flags); void task_editor_show_assignment(TaskEditor *te); -- cgit v1.2.3