aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--addressbook/backend/ebook/e-book.c2
-rw-r--r--addressbook/backend/ebook/test-client.c6
3 files changed, 15 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f0d4a528eb..02ae6656e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2000-03-26 Christopher James Lahey <clahey@helixcode.com>
+
+ * addressbook/backend/ebook/test-client.c: Load an ECard instead
+ of a VCard and then get the VCard from that ECard. Just tests
+ ECard and the client stuff at the same time. Also, replaces
+ carriage returns with newlines.
+
+ * addressbook/backend/ebook/e-book.c: Fixed a small parity error.
+
2000-03-25 Chris Toshok <toshok@laptoph.xtoph.org>
* addressbook/backend/ebook/test-client.c: create a card and then
diff --git a/addressbook/backend/ebook/e-book.c b/addressbook/backend/ebook/e-book.c
index 16819c334a..b3c2e12b57 100644
--- a/addressbook/backend/ebook/e-book.c
+++ b/addressbook/backend/ebook/e-book.c
@@ -400,7 +400,7 @@ e_book_get_card (EBook *book,
g_return_val_if_fail (book != NULL, NULL);
g_return_val_if_fail (E_IS_BOOK (book), NULL);
- if (! book->priv->load_state != URILoaded) {
+ if (book->priv->load_state != URILoaded) {
g_warning ("e_book_get_card: No URI loaded!\n");
return NULL;
}
diff --git a/addressbook/backend/ebook/test-client.c b/addressbook/backend/ebook/test-client.c
index dce7e7fc87..365019f7bd 100644
--- a/addressbook/backend/ebook/test-client.c
+++ b/addressbook/backend/ebook/test-client.c
@@ -51,17 +51,21 @@ static void
add_card_cb (EBook *book, EBookStatus status, gpointer closure)
{
char *vcard;
+ ECard *card;
GTimer *timer;
printf ("Status: %d\n", status);
timer = g_timer_new ();
g_timer_start (timer);
- vcard = e_book_get_vcard (book, "foo");
+ card = e_book_get_card (book, "foo");
g_timer_stop (timer);
+ vcard = e_card_get_vcard(card);
printf ("%g\n", g_timer_elapsed (timer, NULL));
printf ("[%s]\n", vcard);
+ g_free(vcard);
+ gtk_object_unref(GTK_OBJECT(card));
}
static void