diff options
-rw-r--r-- | calendar/ChangeLog | 13 | ||||
-rw-r--r-- | calendar/cal-client/cal-client.c | 3 | ||||
-rw-r--r-- | calendar/gui/dialogs/task-editor.c | 17 |
3 files changed, 33 insertions, 0 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 5ecfa5a67a..90c885c78c 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,16 @@ +2003-07-07 Rodrigo Moya <rodrigo@ximian.com> + + Fixes #45910 + + * gui/dialogs/task-editor.c (task_editor_class_init): set up the + handler for the set_cal_client virtual method. + (task_editor_set_cal_client): added missing virtual method. + +2003-07-07 Jack Jia <jack.jia@sun.com> + + * cal-client/cal-client.c (cal_client_get_static_capability): add + g_return_val_if_fail to check the input param. + 2003-07-03 Rodrigo Moya <rodrigo@ximian.com> * gui/e-tasks.c (setup_widgets): added a paned widget to contain diff --git a/calendar/cal-client/cal-client.c b/calendar/cal-client/cal-client.c index 25e40322bb..0854d75b61 100644 --- a/calendar/cal-client/cal-client.c +++ b/calendar/cal-client/cal-client.c @@ -1254,6 +1254,9 @@ cal_client_get_organizer_must_attend (CalClient *client) gboolean cal_client_get_static_capability (CalClient *client, const char *cap) { + g_return_val_if_fail (client != NULL, FALSE); + g_return_val_if_fail (IS_CAL_CLIENT (client), FALSE); + return check_capability (client, cap); } diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c index 202bd5dee1..eaf4c2eaca 100644 --- a/calendar/gui/dialogs/task-editor.c +++ b/calendar/gui/dialogs/task-editor.c @@ -50,6 +50,7 @@ struct _TaskEditorPrivate { static void task_editor_class_init (TaskEditorClass *class); static void task_editor_init (TaskEditor *te); +static void task_editor_set_cal_client (CompEditor *editor, CalClient *client); static void task_editor_edit_comp (CompEditor *editor, CalComponent *comp); static gboolean task_editor_send_comp (CompEditor *editor, CalComponentItipMethod method); static void task_editor_finalize (GObject *object); @@ -99,6 +100,7 @@ task_editor_class_init (TaskEditorClass *klass) parent_class = g_type_class_ref(TYPE_COMP_EDITOR); + editor_class->set_cal_client = task_editor_set_cal_client; editor_class->edit_comp = task_editor_edit_comp; editor_class->send_comp = task_editor_send_comp; @@ -214,6 +216,21 @@ task_editor_construct (TaskEditor *te, CalClient *client) } static void +task_editor_set_cal_client (CompEditor *editor, CalClient *client) +{ + TaskEditor *te; + TaskEditorPrivate *priv; + + te = TASK_EDITOR (editor); + priv = te->priv; + + e_meeting_model_set_cal_client (priv->model, client); + + if (parent_class->set_cal_client) + parent_class->set_cal_client (editor, client); +} + +static void task_editor_edit_comp (CompEditor *editor, CalComponent *comp) { TaskEditor *te; |