aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher James Lahey <clahey@helixcode.com>2000-03-30 07:01:04 +0800
committerChris Lahey <clahey@src.gnome.org>2000-03-30 07:01:04 +0800
commitb36ddcbdd5cd0cc57dd7f15931a699bda6499297 (patch)
tree7fe5c08d39ad166aca7dd2f936a93bbdcccc007b
parent96fd9a95558ba087b980bc5bb9a567fe7b02e0a8 (diff)
downloadgsoc2013-evolution-b36ddcbdd5cd0cc57dd7f15931a699bda6499297.tar.gz
gsoc2013-evolution-b36ddcbdd5cd0cc57dd7f15931a699bda6499297.tar.zst
gsoc2013-evolution-b36ddcbdd5cd0cc57dd7f15931a699bda6499297.zip
Fixed management of the corba-cursor object by calling
2000-03-29 Christopher James Lahey <clahey@helixcode.com> * addressbook/backend/ebook/e-card-cursor.c: Fixed management of the corba-cursor object by calling CORBA_Object_duplicate on it on e-card-cursor creation and calling CORBA_Object_release on e-card-cursor destruction. Also, properly free string returned from Evolution_CardCursor_get_nth function. svn path=/trunk/; revision=2249
-rw-r--r--ChangeLog8
-rw-r--r--addressbook/backend/ebook/e-card-cursor.c49
2 files changed, 37 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog
index f0bf809122..409b4ffd54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-03-29 Christopher James Lahey <clahey@helixcode.com>
+
+ * addressbook/backend/ebook/e-card-cursor.c: Fixed management of
+ the corba-cursor object by calling CORBA_Object_duplicate on it on
+ e-card-cursor creation and calling CORBA_Object_release on
+ e-card-cursor destruction. Also, properly free string returned
+ from Evolution_CardCursor_get_nth function.
+
2000-03-29 Matt Loper <matt@helixcode.com>
* addressbook/backend/ebook/test-client.c (get_cursor_cb): Added
diff --git a/addressbook/backend/ebook/e-card-cursor.c b/addressbook/backend/ebook/e-card-cursor.c
index 5638041251..1618a6ddee 100644
--- a/addressbook/backend/ebook/e-card-cursor.c
+++ b/addressbook/backend/ebook/e-card-cursor.c
@@ -36,6 +36,15 @@ e_card_cursor_destroy (GtkObject *object)
if (ev._major != CORBA_NO_EXCEPTION) {
g_warning("e_card_cursor_destroy: Exception unreffing "
"corba cursor.\n");
+ CORBA_exception_free (&ev);
+ CORBA_exception_init (&ev);
+ }
+
+ CORBA_Object_release (cursor->priv->corba_cursor, &ev);
+
+ if (ev._major != CORBA_NO_EXCEPTION) {
+ g_warning("e_card_cursor_destroy: Exception releasing "
+ "corba cursor.\n");
}
CORBA_exception_free (&ev);
@@ -92,31 +101,24 @@ e_card_cursor_get_nth (ECardCursor *cursor,
const long n)
{
if ( cursor->priv->corba_cursor != CORBA_OBJECT_NIL ) {
- CORBA_Environment ev;
- CORBA_char * ret_val;
+ CORBA_Environment en;
+ CORBA_char *vcard;
ECard *card;
- CORBA_exception_init (&ev);
+ CORBA_exception_init (&en);
- ret_val = Evolution_CardCursor_get_nth(cursor->priv->corba_cursor, n, &ev);
+ vcard = Evolution_CardCursor_get_nth(cursor->priv->corba_cursor, n, &en);
- if (ev._major != CORBA_NO_EXCEPTION) {
+ if (en._major != CORBA_NO_EXCEPTION) {
g_warning("e_card_cursor_get_nth: Exception during "
"get_nth corba call.\n");
- CORBA_exception_free (&ev);
- CORBA_exception_init (&ev);
}
-
- card = e_card_new (ret_val);
-#if 0
- CORBA_string__free(ret_val, &ev);
- if (ev._major != CORBA_NO_EXCEPTION) {
- g_warning("e_card_cursor_get_nth: Exception freeing "
- "string.\n");
- }
-#endif
- CORBA_exception_free (&ev);
+ CORBA_exception_free (&en);
+
+ card = e_card_new (vcard);
+
+ CORBA_free(vcard);
return card;
}
@@ -183,14 +185,21 @@ e_card_cursor_construct (ECardCursor *cursor,
g_return_val_if_fail (E_IS_CARD_CURSOR (cursor), NULL);
g_return_val_if_fail (corba_cursor != CORBA_OBJECT_NIL, NULL);
+ CORBA_exception_init (&ev);
+
/*
* Initialize cursor
*/
- cursor->priv->corba_cursor = corba_cursor;
+ cursor->priv->corba_cursor = CORBA_Object_duplicate(corba_cursor, &ev);
- CORBA_exception_init (&ev);
+ if (ev._major != CORBA_NO_EXCEPTION) {
+ g_warning("e_card_cursor_construct: Exception duplicating "
+ "corba cursor.\n");
+ CORBA_exception_free (&ev);
+ CORBA_exception_init (&ev);
+ }
- Evolution_CardCursor_ref(corba_cursor, &ev);
+ Evolution_CardCursor_ref(cursor->priv->corba_cursor, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_warning("e_card_cursor_construct: Exception reffing "