callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use bonobo-exception for exceptions (cal_client_open_calendar): likewise

Browse Source 
2001-09-28  Rodrigo Moya <rodrigo@ximian.com>

	* cal-client/cal-client.c (cal_client_construct): use bonobo-exception
	for exceptions
	(cal_client_open_calendar): likewise

svn path=/trunk/; revision=13211
This commit is contained in:
Rodrigo Moya
2001-09-28 09:49:26 +00:00
committed by Rodrigo Moya
parent cf95717637
commit e09413bd27
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
calendar/ChangeLog
View File

@ -1,3 +1,9 @@
2001-09-28 Rodrigo Moya <rodrigo@ximian.com>
* cal-client/cal-client.c (cal_client_construct): use bonobo-exception
for exceptions
(cal_client_open_calendar): likewise
2001-09-27 Ettore Perazzoli <ettore@ximian.com>
* gui/calendar-commands.c (pixmaps): Update pixmap menu paths;

11
calendar/cal-client/cal-client.c
View File

@ -632,7 +632,7 @@ cal_client_construct (CalClient *client)
factory = (GNOME_Evolution_Calendar_CalFactory)
oaf_activate_from_id (info->iid, 0, NULL, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
if (BONOBO_EX (&ev)) {
g_warning ("cal_client_construct: Could not activate calendar server %s", info->iid);
CORBA_free (servers);
CORBA_exception_free (&ev);
@ -759,14 +759,19 @@ cal_client_open_calendar (CalClient *client, const char *str_uri, gboolean only_
GNOME_Evolution_Calendar_CalFactory_open (f->data, str_uri,
only_if_exists,
corba_listener, &ev);
if (ev._major == CORBA_NO_EXCEPTION)
if (!BONOBO_EX (&ev))
break;
}
if (BONOBO_EX (&ev)) {
CORBA_exception_free (&ev);
g_message ("cal_client_open_calendar(): open request failed");
if (BONOBO_USER_EX (&ev, ex_GNOME_Evolution_Calendar_CalFactory_InvalidURI))
g_message ("cal_client_open_calendar: invalid URI");
else if (BONOBO_USER_EX (&ev, ex_GNOME_Evolution_Calendar_CalFactory_UnsupportedMethod))
g_message ("cal_client_open_calendar: unsupported method");
else
g_message ("cal_client_open_calendar(): open request failed");
bonobo_object_unref (BONOBO_OBJECT (priv->listener));
priv->listener = NULL;
priv->load_state = CAL_CLIENT_LOAD_NOT_LOADED;