From 70398dd9e66a5b78c847ad45e42a168e99b5893a Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Thu, 7 Feb 2002 19:35:18 +0000 Subject: pass meeting boolean for gnome_calendar_edit_object and 2002-02-07 JP Rosevear * gui/e-day-view.c: pass meeting boolean for gnome_calendar_edit_object and gnome_calendar_new_appointment_for * gui/e-week-view-event-item.c: ditto * gui/e-week-view.c: ditto * gui/tasks-control.c (confirm_expunge): kill warning * gui/calendar-commands.c (new_meeting_cb): show a new meeting dialog (new_event_cb): pass new param * gui/gnome-cal.c (gnome_calendar_edit_object): take meeting boolean and show meeting page if true (gnome_calendar_new_appointment_for): takeing meeting param and pass to above (gnome_calendar_new_appointment): add new param * gui/gnome-cal.h: update proto * gui/component-factory.c (create_component): take a comp editor mode, determine vtype (sc_user_create_new_item_cb): check for meeting user creatable item (create_object): add meeting as user creatable item * gui/comp-editor-factory.c (edit_new): get a comp editor mode now, determine vtype and show meeting page if required (queue_edit_new): get comp editor mode (impl_editNew): ditto, plus queue the mode directly instead of determining the vtype * gui/dialogs/event-editor.c (show_meeting): new internal util function to show meeting page (event_editor_show_meeting): show the meeting (schedule_meeting_cmd): use show_meeting * gui/dialogs/event-editor.h: new proto * idl/evolution-calendar.idl: editNew takes a mode rather than a type now * cal-util/Makefile.am: fix includes svn path=/trunk/; revision=15595 --- calendar/gui/dialogs/event-editor.c | 21 +++++++++++++++++++-- calendar/gui/dialogs/event-editor.h | 7 ++++--- 2 files changed, 23 insertions(+), 5 deletions(-) (limited to 'calendar/gui/dialogs') diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c index 1c70b36858..9e6f501efe 100644 --- a/calendar/gui/dialogs/event-editor.c +++ b/calendar/gui/dialogs/event-editor.c @@ -350,9 +350,8 @@ event_editor_new (void) } static void -schedule_meeting_cmd (GtkWidget *widget, gpointer data) +show_meeting (EventEditor *ee) { - EventEditor *ee = EVENT_EDITOR (data); EventEditorPrivate *priv; priv = ee->priv; @@ -375,6 +374,24 @@ schedule_meeting_cmd (GtkWidget *widget, gpointer data) COMP_EDITOR_PAGE (priv->meet_page)); } +void +event_editor_show_meeting (EventEditor *ee) +{ + g_return_if_fail (ee != NULL); + g_return_if_fail (IS_EVENT_EDITOR (ee)); + + + show_meeting (ee); +} + +static void +schedule_meeting_cmd (GtkWidget *widget, gpointer data) +{ + EventEditor *ee = EVENT_EDITOR (data); + + show_meeting (ee); +} + static void refresh_meeting_cmd (GtkWidget *widget, gpointer data) { diff --git a/calendar/gui/dialogs/event-editor.h b/calendar/gui/dialogs/event-editor.h index f32877c864..d27bb8e52d 100644 --- a/calendar/gui/dialogs/event-editor.h +++ b/calendar/gui/dialogs/event-editor.h @@ -51,9 +51,10 @@ struct _EventEditorClass { CompEditorClass parent_class; }; -GtkType event_editor_get_type (void); -EventEditor *event_editor_construct (EventEditor *ee); -EventEditor *event_editor_new (void); +GtkType event_editor_get_type (void); +EventEditor *event_editor_construct (EventEditor *ee); +EventEditor *event_editor_new (void); +void event_editor_show_meeting (EventEditor *ee); -- cgit