diff options
| author | Chris Toshok <toshok@helixcode.com> | 2000-07-06 02:26:05 +0800 |
|---|---|---|
| committer | Chris Toshok <toshok@src.gnome.org> | 2000-07-06 02:26:05 +0800 |
| commit | ca5704f99607dc1adf3d45387eb432a98500d3ab (patch) | |
| tree | 0f450f01e659e4d6c6f7efdc49c1ff72967e54bb /addressbook/gui/component/addressbook.c | |
| parent | 6cfd18ee1c0ac3ba06fdf1341e97bc8a6acd05ad (diff) | |
| download | gsoc2013-evolution-ca5704f99607dc1adf3d45387eb432a98500d3ab.tar.gz gsoc2013-evolution-ca5704f99607dc1adf3d45387eb432a98500d3ab.tar.zst gsoc2013-evolution-ca5704f99607dc1adf3d45387eb432a98500d3ab.zip | |
remove hack to read "uri" file from local directory.
2000-07-05 Chris Toshok <toshok@helixcode.com>
* gui/component/addressbook.c (set_prop): remove hack to read
"uri" file from local directory.
* gui/component/Makefile.am (evolution_addressbook_SOURCES): add
e-ldap-storage.{c,h}
* gui/component/addressbook-component.c (owner_set_cb): call
setup_ldap_storage.
* gui/component/e-ldap-storage.c (setup_ldap_storage): Register
the LDAP storage and load the .xml file.
(load_ldap_data): function to load our xml file.
(save_ldap_data): function to save our xml file.
svn path=/trunk/; revision=3890
Diffstat (limited to 'addressbook/gui/component/addressbook.c')
| -rw-r--r-- | addressbook/gui/component/addressbook.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c index 710a3b756d..97cdb04b53 100644 --- a/addressbook/gui/component/addressbook.c +++ b/addressbook/gui/component/addressbook.c @@ -706,7 +706,6 @@ set_prop (BonoboPropertyBag *bag, { AddressbookView *view = user_data; - char *uri_file; char *uri_data; switch (arg_id) { @@ -720,21 +719,19 @@ set_prop (BonoboPropertyBag *bag, view->uri = g_strdup(BONOBO_ARG_GET_STRING (arg)); - uri_file = g_concat_dir_and_file(view->uri + 7, "uri"); - - uri_data = e_read_file(uri_file); - - if (!uri_data) { + if (!strncmp (view->uri, "file:", 5)) { char *file_name = g_concat_dir_and_file(view->uri + 7, "addressbook.db"); uri_data = g_strdup_printf("file://%s", file_name); g_free(file_name); } + else { + uri_data = g_strdup (view->uri); + } + if (! e_book_load_uri (view->book, uri_data, book_open_cb, view)) printf ("error calling load_uri!\n"); - g_free(uri_data); - g_free(uri_file); break; |