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

1 files changed, 9 insertions, 8 deletions

diff --git a/calendar/pcs/query.c b/calendar/pcs/query.c
index 3efd2bde50..8ae9cfa697 100644
--- a/calendar/pcs/query.c
+++ b/calendar/pcs/query.c
@@ -28,6 +28,7 @@
 #include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-i18n.h>
 #include <gtk/gtksignal.h>
+#include <bonobo/bonobo-exception.h>
 #include <gal/widgets/e-unicode.h>
 #include <e-util/e-sexp.h>
 #include <cal-util/cal-recur.h>
@@ -163,7 +164,7 @@ query_destroy (GtkObject *object)
 		CORBA_exception_init (&ev);
 		bonobo_object_release_unref (priv->ql, &ev);
 
-		if (ev._major != CORBA_NO_EXCEPTION)
+		if (BONOBO_EX (&ev))
 			g_message ("query_destroy(): Could not unref the listener\n");
 
 		CORBA_exception_free (&ev);
@@ -930,7 +931,7 @@ add_component (Query *query, const char *uid, gboolean query_in_progress, int n_
 		total,
 		&ev);
 
-	if (ev._major != CORBA_NO_EXCEPTION)
+	if (BONOBO_EX (&ev))
 		g_message ("add_component(): Could not notify the listener of an "
 			   "updated component");
 
@@ -963,7 +964,7 @@ remove_component (Query *query, const char *uid)
 		(char *) uid,
 		&ev);
 
-	if (ev._major != CORBA_NO_EXCEPTION)
+	if (BONOBO_EX (&ev))
 		g_message ("remove_component(): Could not notify the listener of a "
 			   "removed component");
 
@@ -1081,7 +1082,7 @@ ensure_sexp (Query *query)
 			error_str,
 			&ev);
 
-		if (ev._major != CORBA_NO_EXCEPTION)
+		if (BONOBO_EX (&ev))
 			g_message ("ensure_sexp(): Could not notify the listener of "
 				   "a parse error");
 
@@ -1140,7 +1141,7 @@ match_component (Query *query, const char *uid,
 			error_str,
 			&ev);
 
-		if (ev._major != CORBA_NO_EXCEPTION)
+		if (BONOBO_EX (&ev))
 			g_message ("match_component(): Could not notify the listener of "
 				   "an evaluation error");
 
@@ -1155,7 +1156,7 @@ match_component (Query *query, const char *uid,
 			_("Evaluation of the search expression did not yield a boolean value"),
 			&ev);
 
-		if (ev._major != CORBA_NO_EXCEPTION)
+		if (BONOBO_EX (&ev))
 			g_message ("match_component(): Could not notify the listener of "
 				   "an unexpected result value type when evaluating the "
 				   "search expression");
@@ -1202,7 +1203,7 @@ process_component_cb (gpointer data)
 			"",
 			&ev);
 
-		if (ev._major != CORBA_NO_EXCEPTION)
+		if (BONOBO_EX (&ev))
 			g_message ("process_component_cb(): Could not notify the listener of "
 				   "a finished query");
 
@@ -1371,7 +1372,7 @@ query_construct (Query *query,
 
 	CORBA_exception_init (&ev);
 	priv->ql = CORBA_Object_duplicate (ql, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
+	if (BONOBO_EX (&ev)) {
 		g_message ("query_construct(): Could not duplicate the listener");
 		priv->ql = CORBA_OBJECT_NIL;
 		CORBA_exception_free (&ev);