From 989f36ec0e0a0a835c30d521ffe77d70dd7fa321 Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Sat, 6 May 2000 21:31:45 +0000 Subject: Mostly finished ECardSimple. 2000-05-06 Christopher James Lahey * backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h: Mostly finished ECardSimple. * contact-editor/e-contact-editor.c: Changed this to match with some of the changes to ECardSimple. * gui/component/addressbook.c: Changed this to look for "addressbook.db" in the given directory if it doesn't find the file "uri". * gui/minicard/e-minicard.c, gui/minicard/e-minicard.h: Changed this to use ECardSimple. svn path=/trunk/; revision=2839 --- addressbook/gui/component/addressbook.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c index 72bd8967ba..f86a58a005 100644 --- a/addressbook/gui/component/addressbook.c +++ b/addressbook/gui/component/addressbook.c @@ -442,7 +442,6 @@ set_prop (BonoboPropertyBag *bag, EBook *book; char *uri_file; char *uri_data; - char *uri; switch (arg_id) { @@ -461,12 +460,11 @@ set_prop (BonoboPropertyBag *bag, uri_file = g_concat_dir_and_file(view->uri + 7, "uri"); uri_data = e_read_file(uri_file); - if (uri_data) - uri = uri_data; - else - uri = view->uri; + + if (!uri_data) + uri_data = g_concat_dir_and_file(view->uri + 7, "addressbook.db"); - if (! e_book_load_uri (book, uri, book_open_cb, view)) + if (! e_book_load_uri (book, uri_data, book_open_cb, view)) { printf ("error calling load_uri!\n"); } -- cgit v1.2.3