diff options
| -rw-r--r-- | calendar/ChangeLog | 6 | ||||
| -rw-r--r-- | calendar/cal-client/cal-client.c | 2 | ||||
| -rw-r--r-- | calendar/gui/gnome-cal.c | 2 | ||||
| -rw-r--r-- | calendar/pcs/cal-factory.c | 5 |
4 files changed, 7 insertions, 8 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index f5ff4469cd..1888c9ed6c 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,9 @@ +2001-10-01 Rodrigo Moya <rodrigo@ximian.com> + + * gui/gnome-cal.c (gnome_calendar_open): don't use + gnome_vfs_uri_is_local on URIs created with + gnome_vfs_uri_new_private + 2001-09-28 Damon Chaplin <damon@ximian.com> * gui/print.c (print_comp_item): use bound_text to print the summary, diff --git a/calendar/cal-client/cal-client.c b/calendar/cal-client/cal-client.c index 2e82dcbfe0..bea4ed6eea 100644 --- a/calendar/cal-client/cal-client.c +++ b/calendar/cal-client/cal-client.c @@ -748,8 +748,6 @@ cal_client_open_calendar (CalClient *client, const char *str_uri, gboolean only_ BONOBO_OBJECT (priv->w_client)); corba_listener = (GNOME_Evolution_Calendar_Listener) (BONOBO_OBJREF (priv->listener)); - - CORBA_exception_init (&ev); priv->load_state = CAL_CLIENT_LOAD_LOADING; priv->uri = g_strdup (str_uri); diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index bed5b0e3e9..44bf54ec61 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -1691,7 +1691,7 @@ gnome_calendar_open (GnomeCalendar *gcal, const char *str_uri) g_free (tasks_uri); } else { - if (gnome_vfs_uri_is_local (uri)) { + if (!g_strcasecmp (uri->method_string, "file")) { tasks_uri = g_strdup_printf ("%s/local/Tasks/tasks.ics", evolution_dir); success = cal_client_open_calendar (priv->task_pad_client, tasks_uri, FALSE); diff --git a/calendar/pcs/cal-factory.c b/calendar/pcs/cal-factory.c index e7a7316193..32786861bd 100644 --- a/calendar/pcs/cal-factory.c +++ b/calendar/pcs/cal-factory.c @@ -436,14 +436,12 @@ impl_CalFactory_open (PortableServer_Servant servant, priv = factory->priv; /* check URI to see if we support it */ - CORBA_exception_init (&ev2); uri = gnome_vfs_uri_new_private (str_uri, TRUE, TRUE, TRUE); if (!uri) { CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Calendar_CalFactory_InvalidURI, NULL); - CORBA_exception_free (&ev2); return; } @@ -455,11 +453,8 @@ impl_CalFactory_open (PortableServer_Servant servant, CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Calendar_CalFactory_UnsupportedMethod, NULL); - CORBA_exception_free (&ev2); return; } - - CORBA_exception_free (&ev2); /* duplicate the listener object */ CORBA_exception_init (&ev2); |