aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog6
-rw-r--r--calendar/cal-client/cal-client.c5
2 files changed, 7 insertions, 4 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index e22a493141..eadead579e 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,9 @@
+2003-06-22 Rodrigo Moya <rodrigo@ximian.com>
+
+ * cal-client/cal-client.c (get_factories): don't use a static GList,
+ since the value returned is freed in destroy_factories, making several
+ clients use a buggy GList if one of them happen to be destroyed.
+
2003-06-22 Hans Petter Jansson <hpj@ximian.com>
* gui/print.c (get_font_for_size): Remove debug output.
diff --git a/calendar/cal-client/cal-client.c b/calendar/cal-client/cal-client.c
index 5021d50166..9e96c78d0e 100644
--- a/calendar/cal-client/cal-client.c
+++ b/calendar/cal-client/cal-client.c
@@ -729,15 +729,12 @@ client_forget_password_cb (WombatClient *w_client,
static GList *
get_factories (void)
{
- static GList *factories = NULL;
+ GList *factories = NULL;
GNOME_Evolution_Calendar_CalFactory factory;
Bonobo_ServerInfoList *servers;
CORBA_Environment ev;
int i;
- if (factories != NULL)
- return factories;
-
CORBA_exception_init (&ev);
servers = bonobo_activation_query ("repo_ids.has ('IDL:GNOME/Evolution/Calendar/CalFactory:1.0')", NULL, &ev);