From f6dfb498619f36e5038b305318c2db657362ca79 Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Thu, 18 Oct 2001 21:34:04 +0000 Subject: call the invite others dialog in the model 2001-10-18 JP Rosevear * gui/e-meeting-time-sel.c (e_meeting_time_selector_on_invite_others_button_clicked): call the invite others dialog in the model * gui/e-meeting-attendee.c (e_meeting_attendee_get_atype): pick attendee type based on role and cutype * gui/e-meeting-attendee.h: remove proto * gui/Makefile.am: compile select names idl * gui/e-meeting-model.h: new proto * gui/dialogs/meeting-page.c: remove invite others dialogs bits from here * gui/e-meeting-model.c (e_meeting_model_invite_others_dialog): and put them here * gui/dialogs/Makefile.am: compile corba bits in parent dir * gui/dialogs/comp-editor-util.h: reflect above in includes * gui/dialogs/e-delegate-dialog.c: ditto * gui/dialogs/schedule-page.c: ditto and clean includes svn path=/trunk/; revision=13775 --- calendar/gui/e-meeting-attendee.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) (limited to 'calendar/gui/e-meeting-attendee.c') diff --git a/calendar/gui/e-meeting-attendee.c b/calendar/gui/e-meeting-attendee.c index 08ec9a1152..02d550fa2a 100644 --- a/calendar/gui/e-meeting-attendee.c +++ b/calendar/gui/e-meeting-attendee.c @@ -30,8 +30,6 @@ #include "e-meeting-attendee.h" struct _EMeetingAttendeePrivate { - EMeetingAttendeeType type; - gchar *address; gchar *member; @@ -153,8 +151,6 @@ init (EMeetingAttendee *ia) ia->priv = priv; - priv->type = E_MEETING_ATTENDEE_REQUIRED_PERSON; - priv->address = string_test (NULL); priv->member = string_test (NULL); @@ -609,20 +605,17 @@ e_meeting_attendee_get_atype (EMeetingAttendee *ia) priv = ia->priv; - return priv->type; -} + if (priv->cutype == ICAL_CUTYPE_ROOM + || priv->cutype == ICAL_CUTYPE_RESOURCE) + return E_MEETING_ATTENDEE_RESOURCE; -void -e_meeting_attendee_set_atype (EMeetingAttendee *ia, EMeetingAttendeeType type) -{ - EMeetingAttendeePrivate *priv; + if (priv->role == ICAL_ROLE_CHAIR + || priv->role == ICAL_ROLE_REQPARTICIPANT) + return E_MEETING_ATTENDEE_REQUIRED_PERSON; - priv = ia->priv; - - priv->type = type; + return E_MEETING_ATTENDEE_OPTIONAL_PERSON; } - static gint compare_times (EMeetingTime *time1, EMeetingTime *time2) -- cgit v1.2.3