init new members (get_current_account): get a matching account for the

2003-03-28  JP Rosevear  <jpr@ximian.com>

	* gui/dialogs/meeting-page.c (meeting_page_init): init new members
	(get_current_account): get a matching account for the currently
	selected user in the combo
	(meeting_page_finalize): unref the meeting attendee if there is
	one
	(meeting_page_fill_widgets): don't set the combo list here
	(clear_widgets): set the default organizer here and if we don't
	have an organizer, add the default organizer as an attendee
	(meeting_page_fill_component): use get_current_account
	(org_changed_cb): if this is a new meeting and the organizer
	changes, change the attendee
	(change_clicked_cb): no need to set the default here
	(init_widgets): reflect changed callback name
	(meeting_page_construct): set the combo strings here
	(popup_delete_cb): remove the organizer attendee if the user
	explicitly deletes it

	* gui/e-meeting-model.c (attendee_changed_cb): set row properly

	* gui/itip-utils.c (comp_to_list): skip the user themselves if
	cancelling or requesting

svn path=/trunk/; revision=20557

1 files changed, 11 insertions, 2 deletions

diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index 831e76a2a9..be94e9fe87 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -303,13 +303,22 @@ comp_to_list (CalComponentItipMethod method, CalComponent *comp, GList *users)
 		to_list->_maximum = len;
 		to_list->_length = 0;
 		to_list->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (len);
-		
+
+		cal_component_get_organizer (comp, &organizer);
+		if (organizer.value == NULL) {
+			e_notice (NULL, GTK_MESSAGE_ERROR,
+				  _("An organizer must be set."));
+			return NULL;
+		}
+
 		for (l = attendees; l != NULL; l = l->next) {
 			CalComponentAttendee *att = l->data;
 
 			if (users_has_attendee (users, att->value))
 				continue;
-
+			else if (!g_strcasecmp (att->value, organizer.value))
+				continue;
+			
 			recipient = &(to_list->_buffer[to_list->_length]);
 			if (att->cn)
 				recipient->name = CORBA_string_dup (att->cn);