aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/pcs/cal.c7
2 files changed, 13 insertions, 1 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 75f604f402..5e29e80909 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2001-10-26 Federico Mena Quintero <federico@ximian.com>
+
+ * pcs/cal.c (cal_construct): Get a fresh CORBA_Environment for
+ every CORBA call. Hopefully will fix #11978, but I'm not sure
+ about what else could be happening.
+ (cal_get_password): Free the exception.
+
2001-10-25 Damon Chaplin <damon@ximian.com>
* gui/e-itip-control.c: used functions to get PUBLISH_OPTIONS etc.,
diff --git a/calendar/pcs/cal.c b/calendar/pcs/cal.c
index cee41fd6d9..f493c4a4fc 100644
--- a/calendar/pcs/cal.c
+++ b/calendar/pcs/cal.c
@@ -52,7 +52,7 @@ impl_Cal_get_uri (PortableServer_Servant servant,
{
Cal *cal;
CalPrivate *priv;
- char *str_uri;
+ const char *str_uri;
CORBA_char *str_uri_copy;
cal = CAL (bonobo_object_from_servant (servant));
@@ -532,7 +532,10 @@ cal_construct (Cal *cal,
return NULL;
}
+ CORBA_exception_free (&ev);
+
/* obtain the WombatClient interface */
+ CORBA_exception_init (&ev);
priv->wombat_client = Bonobo_Unknown_queryInterface (
priv->listener,
"IDL:GNOME/Evolution/WombatClient:1.0",
@@ -819,6 +822,8 @@ cal_get_password (Cal *cal, const char *prompt, const char *key)
return NULL;
}
+ CORBA_exception_free (&ev);
+
return pwd;
}