diff options
| -rw-r--r-- | calendar/ChangeLog | 4 | ||||
| -rw-r--r-- | calendar/cal-client/cal-query.c | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index d4644fad33..7f195ac2fd 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,5 +1,9 @@ 2001-10-02 JP Rosevear <jpr@ximian.com> + * cal-client/cal-query.c: use bonobo-exception to tidy + +2001-10-02 JP Rosevear <jpr@ximian.com> + * conduits/calendar/calendar-conduit.c (nth_weekday): handle -1 as well (comp_from_remote_record): fix monthly by day recurrences and diff --git a/calendar/cal-client/cal-query.c b/calendar/cal-client/cal-query.c index 958bad9f52..d1c29fbb9a 100644 --- a/calendar/cal-client/cal-query.c +++ b/calendar/cal-client/cal-query.c @@ -24,6 +24,7 @@ #endif #include <gtk/gtksignal.h> +#include <bonobo/bonobo-exception.h> #include "cal-query.h" #include "query-listener.h" @@ -190,7 +191,7 @@ cal_query_destroy (GtkObject *object) CORBA_exception_init (&ev); bonobo_object_release_unref (priv->corba_query, &ev); - if (ev._major != CORBA_NO_EXCEPTION) + if (BONOBO_EX (&ev)) g_message ("cal_query_destroy(): Could not release/unref the query"); CORBA_exception_free (&ev); @@ -357,12 +358,10 @@ cal_query_construct (CalQuery *query, CORBA_exception_init (&ev); priv->corba_query = GNOME_Evolution_Calendar_Cal_getQuery (cal, sexp, corba_ql, &ev); - if (ev._major == CORBA_USER_EXCEPTION - && strcmp (CORBA_exception_id (&ev), - ex_GNOME_Evolution_Calendar_Cal_CouldNotCreate) == 0) { + if (BONOBO_USER_EX (&ev, ex_GNOME_Evolution_Calendar_Cal_CouldNotCreate)) { g_message ("cal_query_construct(): The server could not create the query"); goto error; - } else if (ev._major != CORBA_NO_EXCEPTION) { + } else if (BONOBO_EX (&ev)) { g_message ("cal_query_construct(): Could not issue the getQuery() request"); goto error; } |