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/gnome-cal.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'calendar/gui/gnome-cal.c') diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index 1590117672..8d75a39c75 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -2123,7 +2123,8 @@ editor_closed_cb (GtkWidget *widget, gpointer data) } void -gnome_calendar_edit_object (GnomeCalendar *gcal, CalComponent *comp) +gnome_calendar_edit_object (GnomeCalendar *gcal, CalComponent *comp, + gboolean meeting) { GnomeCalendarPrivate *priv; EventEditor *ee; @@ -2147,7 +2148,6 @@ gnome_calendar_edit_object (GnomeCalendar *gcal, CalComponent *comp) g_message ("gnome_calendar_edit_object(): Could not create the event editor"); return; } - ec->gcal = gcal; ec->uid = g_strdup (uid); @@ -2159,6 +2159,8 @@ gnome_calendar_edit_object (GnomeCalendar *gcal, CalComponent *comp) comp_editor_set_cal_client (COMP_EDITOR (ee), priv->client); comp_editor_edit_comp (COMP_EDITOR (ee), comp); + if (meeting) + event_editor_show_meeting (ee); } comp_editor_focus (COMP_EDITOR (ee)); @@ -2178,7 +2180,8 @@ gnome_calendar_edit_object (GnomeCalendar *gcal, CalComponent *comp) void gnome_calendar_new_appointment_for (GnomeCalendar *cal, time_t dtstart, time_t dtend, - gboolean all_day) + gboolean all_day, + gboolean meeting) { GnomeCalendarPrivate *priv; struct icaltimetype itt; @@ -2235,7 +2238,7 @@ gnome_calendar_new_appointment_for (GnomeCalendar *cal, cal_component_commit_sequence (comp); - gnome_calendar_edit_object (cal, comp); + gnome_calendar_edit_object (cal, comp, meeting); gtk_object_unref (GTK_OBJECT (comp)); } @@ -2256,7 +2259,7 @@ gnome_calendar_new_appointment (GnomeCalendar *gcal) g_return_if_fail (GNOME_IS_CALENDAR (gcal)); gnome_calendar_get_current_time_range (gcal, &dtstart, &dtend); - gnome_calendar_new_appointment_for (gcal, dtstart, dtend, FALSE); + gnome_calendar_new_appointment_for (gcal, dtstart, dtend, FALSE, FALSE); } /** -- cgit