aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/backend/ebook
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook/backend/ebook')
-rw-r--r--addressbook/backend/ebook/e-book.c3
-rw-r--r--addressbook/backend/ebook/test-card.c12
2 files changed, 13 insertions, 2 deletions
diff --git a/addressbook/backend/ebook/e-book.c b/addressbook/backend/ebook/e-book.c
index c260f3402a..d787ee8e01 100644
--- a/addressbook/backend/ebook/e-book.c
+++ b/addressbook/backend/ebook/e-book.c
@@ -643,6 +643,8 @@ activate_factories_for_uri (EBook *book, const char *uri)
if (info_list->_length == 0) {
g_warning ("Can't find installed BookFactory that handles protocol '%s'.", protocol);
+ g_free (protocol);
+ g_free (query);
CORBA_exception_free (&ev);
goto shutdown;
}
@@ -766,7 +768,6 @@ e_book_unload_uri (EBook *book)
CORBA_exception_init (&ev);
bonobo_object_release_unref (book->priv->corba_book, &ev);
-
if (ev._major != CORBA_NO_EXCEPTION) {
g_warning ("e_book_unload_uri: Exception releasing "
"remote book interface!\n");
diff --git a/addressbook/backend/ebook/test-card.c b/addressbook/backend/ebook/test-card.c
index dd591d6c51..b17dc62174 100644
--- a/addressbook/backend/ebook/test-card.c
+++ b/addressbook/backend/ebook/test-card.c
@@ -78,6 +78,7 @@ main (int argc, char **argv)
EList *address;
EList *phone;
EList *email;
+ EList *arbitrary;
EIterator *iterator;
ECardDate *bday;
@@ -112,6 +113,7 @@ main (int argc, char **argv)
"role", &role,
"nickname", &nickname,
"fburl", &fburl,
+ "arbitrary", &arbitrary,
"birth_date", &bday,
NULL);
if ( fname ) {
@@ -148,7 +150,15 @@ main (int argc, char **argv)
}
if ( fburl ) {
printf("Free Busy URL : %s\n", fburl);
- }
+ }
+ if ( arbitrary ) {
+ iterator = e_list_get_iterator(arbitrary);
+ for (; e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
+ ECardArbitrary *arbitrary = (ECardArbitrary *) e_iterator_get(iterator);
+ printf("Arbitrary : %s, %s\n", arbitrary->key, arbitrary->value);
+ }
+ gtk_object_unref(GTK_OBJECT(iterator));
+ }
if ( bday ) {
printf("BDay : %4d-%02d-%02d\n", bday->year, bday->month, bday->day);
}