util function to get address (itip_addresses_get_default): get only the

2001-10-09  JP Rosevear  <jpr@ximian.com>

	* gui/itip-utils.c (get_address): util function to get address
	(itip_addresses_get_default): get only the default address
	(itip_address_free): free single address
	(itip_addresses_free): use above
	(comp_limit_attendees): limit the number of attendees to one, the
	user
	(comp_sentby): set the sentby parameter if the user is not the
	organizer
	(comp_minimal): remove extraneous info for send (for refresh and
	declinecounter)
	(comp_compliant): remove all alarms, do various things to make the
	components comply with itip spec based on method
	(itip_send_comp): use comp_compliant method

	* gui/itip-utils.h: new protos

	* gui/e-itip-control.c: rescan the component when necessary
	(get_next): don't get stuck in infinite loop if there are no
	viewable components
	(e_itip_control_set_data): if there are no viewable components,
	spit an error message

	* gui/dialogs/meeting-page.h: tidy

	* gui/dialogs/meeting-page.c (meeting_page_fill_widgets): use
	organizer's cn if possible
	(other_clicked_cb): no longer doing the sent by stuff directly,
	hide more widgets

	* pcs/query.c: use bonobo exception stuff

	* cal-util/cal-component.c (cal_component_rescan): have the comp
	rescan its libical component (for when you change things directly)
	(free_icalcomponent): take a param on whether to free the
	component or just clean up the mappings
	(cal_component_has_attendees): util function

	* cal-util/cal-component.h: new protos

svn path=/trunk/; revision=13525

2 files changed, 16 insertions, 8 deletions

diff --git a/calendar/gui/dialogs/meeting-page.c b/calendar/gui/dialogs/meeting-page.c
index 3b20831093..22c8f6e05a 100644
--- a/calendar/gui/dialogs/meeting-page.c
+++ b/calendar/gui/dialogs/meeting-page.c
@@ -382,15 +382,21 @@ meeting_page_fill_widgets (CompEditorPage *page, CalComponent *comp)
 
 	if (organizer.value != NULL) {
 		const gchar *strip = itip_strip_mailto (organizer.value);
-		gchar *s = e_utf8_to_gtk_string (priv->existing_organizer, strip);
+		gchar *s, *string;
 
 		gtk_widget_hide (priv->organizer_table);
 		gtk_widget_show (priv->existing_organizer_table);
 		gtk_widget_hide (priv->invite);
 		
+		if (organizer.cn != NULL)
+			string = g_strdup_printf ("%s <%s>", organizer.cn, strip);
+		else
+			string = g_strdup (strip);
+		s = e_utf8_to_gtk_string (priv->existing_organizer, string);
 		gtk_label_set_text (GTK_LABEL (priv->existing_organizer), s);
 		g_free (s);
-		
+		g_free (string);
+
 		priv->existing = TRUE;
 	} else {
 		gtk_widget_hide (priv->other_organizer_lbl);
@@ -655,11 +661,12 @@ other_clicked_cb (GtkWidget *widget, gpointer data)
 	mpage = MEETING_PAGE (data);
 	priv = mpage->priv;
 
+	gtk_widget_hide (priv->organizer_lbl);
+	gtk_widget_hide (priv->organizer);
+	gtk_widget_hide (priv->other_organizer_btn);
 	gtk_widget_show (priv->other_organizer_lbl);
 	gtk_widget_show (priv->other_organizer);
 
-	gtk_label_set_text (GTK_LABEL (priv->organizer_lbl), _("Sent By:"));
-
 	priv->other = TRUE;
 }
 
diff --git a/calendar/gui/dialogs/meeting-page.h b/calendar/gui/dialogs/meeting-page.h
index 206ee90bb8..b2503f7018 100644
--- a/calendar/gui/dialogs/meeting-page.h
+++ b/calendar/gui/dialogs/meeting-page.h
@@ -52,10 +52,11 @@ typedef struct {
 } MeetingPageClass;
 
 
-GtkType      meeting_page_get_type  (void);
-MeetingPage *meeting_page_construct (MeetingPage *mpage, EMeetingModel *emm);
-MeetingPage *meeting_page_new       (EMeetingModel *emm);
-CalComponent *meeting_page_get_cancel_comp (MeetingPage *mpage);
+GtkType       meeting_page_get_type          (void);
+MeetingPage  *meeting_page_construct         (MeetingPage   *mpage,
+					      EMeetingModel *emm);
+MeetingPage  *meeting_page_new               (EMeetingModel *emm);
+CalComponent *meeting_page_get_cancel_comp   (MeetingPage   *mpage);