From afd87cea9aef33bdd7241cd27eabb417e3587d7a Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Fri, 8 Nov 2002 09:35:05 +0000 Subject: prepend /apps/Evolution to config db paths. 2002-11-08 Chris Toshok * backend/ebook/e-book-util.c (set_default_book_uri_from_config_db): prepend /apps/Evolution to config db paths. * gui/component/select-names/e-select-names-manager.c (read_completion_books_from_db): same. (uris_listener): same. svn path=/trunk/; revision=18664 --- addressbook/ChangeLog | 9 +++++++++ addressbook/backend/ebook/e-book-util.c | 2 +- addressbook/gui/component/select-names/e-select-names-manager.c | 6 +++--- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index ed7cab9054..e09f0787a2 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,12 @@ +2002-11-08 Chris Toshok + + * backend/ebook/e-book-util.c + (set_default_book_uri_from_config_db): prepend /apps/Evolution to + config db paths. + + * gui/component/select-names/e-select-names-manager.c (read_completion_books_from_db): same. + (uris_listener): same. + 2002-11-08 Chris Toshok * gui/contact-editor/e-contact-editor.c: more porting work. diff --git a/addressbook/backend/ebook/e-book-util.c b/addressbook/backend/ebook/e-book-util.c index 46fe732f25..e84d0a144d 100644 --- a/addressbook/backend/ebook/e-book-util.c +++ b/addressbook/backend/ebook/e-book-util.c @@ -208,7 +208,7 @@ set_default_book_uri_from_config_db (void) EConfigListener* config_db; config_db = e_book_get_config_database (); - val = e_config_listener_get_string_with_default (config_db, "/DefaultFolders/contacts_uri", NULL, NULL); + val = e_config_listener_get_string_with_default (config_db, "/apps/Evolution/DefaultFolders/contacts_uri", NULL, NULL); if (val) { default_book_uri = e_book_expand_uri (val); diff --git a/addressbook/gui/component/select-names/e-select-names-manager.c b/addressbook/gui/component/select-names/e-select-names-manager.c index ff142ec45c..a4d6a0c1a8 100644 --- a/addressbook/gui/component/select-names/e-select-names-manager.c +++ b/addressbook/gui/component/select-names/e-select-names-manager.c @@ -410,7 +410,7 @@ read_completion_books_from_db (ESelectNamesManager *manager, EConfigListener *db { char *val; - val = e_config_listener_get_string (db, "/Addressbook/Completion/uris"); + val = e_config_listener_get_string (db, "/apps/Evolution/Addressbook/Completion/uris"); if (val) { g_free (manager->cached_folder_list); @@ -427,10 +427,10 @@ uris_listener (EConfigListener *db, const char *key, char *val; /* return if it's not the key we're interested in */ - if (!strcmp (key, "/Addressbook/Completion/uris")) + if (!strcmp (key, "/apps/Evolution/Addressbook/Completion/uris")) return; - val = e_config_listener_get_string (db, "/Addressbook/Completion/uris"); + val = e_config_listener_get_string (db, "/apps/Evolution/Addressbook/Completion/uris"); if (val) { if (!manager->cached_folder_list || strcmp (val, manager->cached_folder_list)) { -- cgit v1.2.3