diff options
| -rw-r--r-- | calendar/ChangeLog | 9 | ||||
| -rw-r--r-- | calendar/pcs/cal-factory.c | 54 |
2 files changed, 49 insertions, 14 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index ca2e79701c..ae63b9f855 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,12 @@ +2000-07-11 Federico Mena Quintero <federico@helixcode.com> + + * pcs/cal-factory.c (queue_load_create_job): Removed unneeded + check for the URI. + (load_fn): Be more paranoid about the URI and notify the listener + if we got passed a bad URI. Simplify the termination code a bit. + (create_fn): Likewise. + (queue_load_create_job): Be more paranoid about the URI. + 2000-07-10 Ettore Perazzoli <ettore@helixcode.com> * gui/Makefile.am: Remove pilot stuff for now. diff --git a/calendar/pcs/cal-factory.c b/calendar/pcs/cal-factory.c index 83ebd272a3..9e663690db 100644 --- a/calendar/pcs/cal-factory.c +++ b/calendar/pcs/cal-factory.c @@ -215,8 +215,7 @@ queue_load_create_job (CalFactory *factory, const char *uri, Evolution_Calendar_ Evolution_Calendar_Listener listener_copy; gboolean result; - if ((!uri) || (!*uri)) - return; + g_assert (uri != NULL); CORBA_exception_init (&ev); result = CORBA_Object_is_nil (listener, &ev); @@ -493,8 +492,9 @@ load_fn (gpointer data) CORBA_Environment ev; jd = data; + g_assert (jd->uri != NULL); - /* Look up the calendar */ + /* Check the URI */ uri = gnome_vfs_uri_new (jd->uri); g_free (jd->uri); @@ -503,6 +503,20 @@ load_fn (gpointer data) listener = jd->listener; g_free (jd); + if (!uri) { + CORBA_exception_init (&ev); + Evolution_Calendar_Listener_cal_loaded (listener, + Evolution_Calendar_Listener_ERROR, + CORBA_OBJECT_NIL, + &ev); + + if (ev._major != CORBA_NO_EXCEPTION) + g_message ("load_fn(): Could not notify the listener!"); + + CORBA_exception_free (&ev); + goto out; + } + /* Look up the backend and create it if needed */ backend = lookup_backend (factory, uri); @@ -510,15 +524,13 @@ load_fn (gpointer data) if (!backend) backend = load_backend (factory, uri, listener); - if (!backend) - goto out; + gnome_vfs_uri_unref (uri); - add_calendar_client (factory, backend, listener); + if (backend) + add_calendar_client (factory, backend, listener); out: - gnome_vfs_uri_unref (uri); - CORBA_exception_init (&ev); CORBA_Object_release (listener, &ev); @@ -540,7 +552,9 @@ create_fn (gpointer data) CORBA_Environment ev; jd = data; - factory = jd->factory; + g_assert (jd->uri != NULL); + + /* Check the URI */ uri = gnome_vfs_uri_new (jd->uri); g_free (jd->uri); @@ -549,6 +563,20 @@ create_fn (gpointer data) listener = jd->listener; g_free (jd); + if (!uri) { + CORBA_exception_init (&ev); + Evolution_Calendar_Listener_cal_loaded (listener, + Evolution_Calendar_Listener_ERROR, + CORBA_OBJECT_NIL, + &ev); + + if (ev._major != CORBA_NO_EXCEPTION) + g_message ("create_fn(): Could not notify the listener!"); + + CORBA_exception_free (&ev); + goto out; + } + /* Check that the backend is not in use */ backend = lookup_backend (factory, uri); @@ -571,15 +599,13 @@ create_fn (gpointer data) backend = create_backend (factory, uri, listener); - if (!backend) - goto out; + if (backend) + add_calendar_client (factory, backend, listener); - add_calendar_client (factory, backend, listener); + gnome_vfs_uri_unref (uri); out: - gnome_vfs_uri_unref (uri); - CORBA_exception_init (&ev); CORBA_Object_release (listener, &ev); |