diff options
Diffstat (limited to 'addressbook/gui/component')
| -rw-r--r-- | addressbook/gui/component/addressbook-component.c | 12 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook-storage.c | 2 | ||||
| -rw-r--r-- | addressbook/gui/component/select-names/e-select-names-completion.c | 1 |
3 files changed, 7 insertions, 8 deletions
diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c index 5773b5ba94..d727e9ac8e 100644 --- a/addressbook/gui/component/addressbook-component.c +++ b/addressbook/gui/component/addressbook-component.c @@ -161,7 +161,7 @@ remove_folder (EvolutionShellComponent *shell_component, return; } - subdir_path = g_concat_dir_and_file (physical_uri + 7, "subfolders"); + subdir_path = g_build_filename (physical_uri + 7, "subfolders", NULL); rv = stat (subdir_path, &sb); g_free (subdir_path); if (rv != -1) { @@ -172,7 +172,7 @@ remove_folder (EvolutionShellComponent *shell_component, return; } - addressbook_db_path = g_concat_dir_and_file (physical_uri + 7, "addressbook.db"); + addressbook_db_path = g_build_filename (physical_uri + 7, "addressbook.db", NULL); rv = unlink (addressbook_db_path); g_free (addressbook_db_path); if (rv == 0) { @@ -523,7 +523,7 @@ add_creatable_item (EvolutionShellComponent *shell_component, icon_path = NULL; icon = NULL; } else { - icon_path = g_concat_dir_and_file (EVOLUTION_ICONSDIR, icon_name); + icon_path = g_build_filename (EVOLUTION_ICONSDIR, icon_name, NULL); icon = gdk_pixbuf_new_from_file (icon_path, NULL); } @@ -592,7 +592,7 @@ ensure_completion_uris_exist() db = e_book_get_config_database (); - val = e_config_listener_get_string (db, "/Addressbook/Completion/uris"); + val = e_config_listener_get_string (db, "/apps/evolution/addressbook/completion/uris"); if (!val) { EFolderListItem f[2]; @@ -600,7 +600,7 @@ ensure_completion_uris_exist() /* in the case where the user is running for the first time, populate the list with the local contact folder */ - dirname = gnome_util_prepend_user_home("evolution/local/Contacts"); + dirname = g_build_filename (g_get_home_dir (), "evolution/local/Contacts", NULL); uri = g_strdup_printf ("file://%s", dirname); f[0].uri = "evolution:/local/Contacts"; @@ -613,7 +613,7 @@ ensure_completion_uris_exist() g_free (dirname); g_free (uri); - e_config_listener_set_string (db, "/Addressbook/Completion/uris", val); + e_config_listener_set_string (db, "/apps/evolution/addressbook/completion/uris", val); g_free (val); } diff --git a/addressbook/gui/component/addressbook-storage.c b/addressbook/gui/component/addressbook-storage.c index 6924052529..f83ffc4b70 100644 --- a/addressbook/gui/component/addressbook-storage.c +++ b/addressbook/gui/component/addressbook-storage.c @@ -97,7 +97,7 @@ addressbook_storage_setup (EvolutionShellComponent *shell_component, if (storage_path) g_free (storage_path); - storage_path = g_concat_dir_and_file (evolution_homedir, ADDRESSBOOK_SOURCES_XML); + storage_path = g_build_filename (evolution_homedir, ADDRESSBOOK_SOURCES_XML, NULL); #ifdef HAVE_LDAP if (!load_source_data (storage_path)) deregister_storage (); diff --git a/addressbook/gui/component/select-names/e-select-names-completion.c b/addressbook/gui/component/select-names/e-select-names-completion.c index 59c91049ad..602d6521b0 100644 --- a/addressbook/gui/component/select-names/e-select-names-completion.c +++ b/addressbook/gui/component/select-names/e-select-names-completion.c @@ -33,7 +33,6 @@ #include <math.h> #include <gtk/gtksignal.h> -#include <libgnome/gnome-util.h> #include <addressbook/backend/ebook/e-book-util.h> #include <addressbook/backend/ebook/e-destination.h> |