diff options
| author | Christopher James Lahey <clahey@helixcode.com> | 2000-05-07 05:31:45 +0800 |
|---|---|---|
| committer | Chris Lahey <clahey@src.gnome.org> | 2000-05-07 05:31:45 +0800 |
| commit | 989f36ec0e0a0a835c30d521ffe77d70dd7fa321 (patch) | |
| tree | cab36b6ea38ce3fd57cffc6a44470101902536f4 /addressbook/gui/component | |
| parent | 073f72e4f3827d51331cecf6800ae811b4776a08 (diff) | |
| download | gsoc2013-evolution-989f36ec0e0a0a835c30d521ffe77d70dd7fa321.tar gsoc2013-evolution-989f36ec0e0a0a835c30d521ffe77d70dd7fa321.tar.gz gsoc2013-evolution-989f36ec0e0a0a835c30d521ffe77d70dd7fa321.tar.bz2 gsoc2013-evolution-989f36ec0e0a0a835c30d521ffe77d70dd7fa321.tar.lz gsoc2013-evolution-989f36ec0e0a0a835c30d521ffe77d70dd7fa321.tar.xz gsoc2013-evolution-989f36ec0e0a0a835c30d521ffe77d70dd7fa321.tar.zst gsoc2013-evolution-989f36ec0e0a0a835c30d521ffe77d70dd7fa321.zip | |
Mostly finished ECardSimple.
2000-05-06 Christopher James Lahey <clahey@helixcode.com>
* 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
Diffstat (limited to 'addressbook/gui/component')
| -rw-r--r-- | addressbook/gui/component/addressbook.c | 10 |
1 files changed, 4 insertions, 6 deletions
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"); } |