aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodrigo Moya <rodrigo@ximian.com>2002-10-23 07:26:26 +0800
committerRodrigo Moya <rodrigo@src.gnome.org>2002-10-23 07:26:26 +0800
commit54722bf66dd7f0c05e3077bd7d057b347bafbfe7 (patch)
tree6d42f30e4d51be6d651748d3e6dfc8f2a9433ce0
parent08af37f5686c80bad8b3ec88ab3f130d0827f977 (diff)
downloadgsoc2013-evolution-54722bf66dd7f0c05e3077bd7d057b347bafbfe7.tar
gsoc2013-evolution-54722bf66dd7f0c05e3077bd7d057b347bafbfe7.tar.gz
gsoc2013-evolution-54722bf66dd7f0c05e3077bd7d057b347bafbfe7.tar.bz2
gsoc2013-evolution-54722bf66dd7f0c05e3077bd7d057b347bafbfe7.tar.lz
gsoc2013-evolution-54722bf66dd7f0c05e3077bd7d057b347bafbfe7.tar.xz
gsoc2013-evolution-54722bf66dd7f0c05e3077bd7d057b347bafbfe7.tar.zst
gsoc2013-evolution-54722bf66dd7f0c05e3077bd7d057b347bafbfe7.zip
Fixes #32371
2002-10-22 Rodrigo Moya <rodrigo@ximian.com> Fixes #32371 * pcs/query.c (start_cached_query_cb): CORBA_exception_init the CORBA_Environment before using it. svn path=/trunk/; revision=18413
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/pcs/query.c8
2 files changed, 12 insertions, 3 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index d0a839ba79..02c40758a4 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,12 @@
2002-10-22 Rodrigo Moya <rodrigo@ximian.com>
+ Fixes #32371
+
+ * pcs/query.c (start_cached_query_cb): CORBA_exception_init the
+ CORBA_Environment before using it.
+
+2002-10-22 Rodrigo Moya <rodrigo@ximian.com>
+
* pcs/cal-factory.c (lookup_backend): use NULL for pointer instead of
FALSE.
diff --git a/calendar/pcs/query.c b/calendar/pcs/query.c
index 1ec802318b..ca22ab38dd 100644
--- a/calendar/pcs/query.c
+++ b/calendar/pcs/query.c
@@ -1496,6 +1496,8 @@ start_cached_query_cb (gpointer data)
int len;
GList *uid_list = NULL, *l;
+ CORBA_exception_init (&ev);
+
/* if the query is done, then we just notify the listener of all the
* UIDS we've got so far, all at once */
g_hash_table_foreach (priv->uids, (GHFunc) add_uid_cb, &uid_list);
@@ -1506,9 +1508,10 @@ start_cached_query_cb (gpointer data)
GNOME_Evolution_Calendar_CalObjUIDSeq *corba_uids;
corba_uids = GNOME_Evolution_Calendar_CalObjUIDSeq__alloc ();
- CORBA_sequence_set_release (corba_uids, TRUE);
- corba_uids->_buffer = CORBA_sequence_GNOME_Evolution_Calendar_CalObjUID_allocbuf (len);
corba_uids->_length = len;
+ corba_uids->_maximum = len;
+ corba_uids->_buffer = CORBA_sequence_GNOME_Evolution_Calendar_CalObjUID_allocbuf (len);
+ CORBA_sequence_set_release (corba_uids, TRUE);
for (l = uid_list, n = 0; l != NULL; l = l->next, n++)
corba_uids->_buffer[n] = CORBA_string_dup ((CORBA_char *) l->data);
@@ -1536,7 +1539,6 @@ start_cached_query_cb (gpointer data)
gtk_signal_connect (GTK_OBJECT (cl), "component_died",
GTK_SIGNAL_FUNC (listener_died_cb), info->query);
- CORBA_exception_init (&ev);
GNOME_Evolution_Calendar_QueryListener_notifyQueryDone (
info->ql,
GNOME_Evolution_Calendar_QueryListener_SUCCESS,