aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog5
-rw-r--r--calendar/pcs/cal-factory.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 6b862dea88..507bf06faf 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-09 Christopher James Lahey <clahey@helixcode.com>
+
+ * pcs/cal-factory.c: Removed double free of method_string in
+ uri->method_string.
+
2000-05-08 Ettore Perazzoli <ettore@helixcode.com>
* pcs/cal.h: Include "calendar/pcs/evolution-calendar.h" instead
diff --git a/calendar/pcs/cal-factory.c b/calendar/pcs/cal-factory.c
index 1112245184..9e60815805 100644
--- a/calendar/pcs/cal-factory.c
+++ b/calendar/pcs/cal-factory.c
@@ -215,6 +215,9 @@ queue_load_create_job (CalFactory *factory, const char *uri, Evolution_Calendar_
Evolution_Calendar_Listener listener_copy;
gboolean result;
+ if ((!uri) || (!*uri))
+ return;
+
CORBA_exception_init (&ev);
result = CORBA_Object_is_nil (listener, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
@@ -329,7 +332,6 @@ launch_backend_for_uri (CalFactory *factory, GnomeVFSURI *uri, Evolution_Calenda
method = uri->method_string;
type = g_hash_table_lookup (priv->methods, method);
- g_free (method);
if (!type) {
CORBA_Environment ev;