diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2008-03-11 23:20:59 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-03-11 23:20:59 +0800 |
| commit | e0d5ae3e97f318fb60674de189c8eff91477bac9 (patch) | |
| tree | df85497e700d8794604fe7730369fe93b16829db /smime | |
| parent | 9427d2336925fd6cfd0bff849b6d9ac69411c09f (diff) | |
| download | gsoc2013-evolution-e0d5ae3e97f318fb60674de189c8eff91477bac9.tar gsoc2013-evolution-e0d5ae3e97f318fb60674de189c8eff91477bac9.tar.gz gsoc2013-evolution-e0d5ae3e97f318fb60674de189c8eff91477bac9.tar.bz2 gsoc2013-evolution-e0d5ae3e97f318fb60674de189c8eff91477bac9.tar.lz gsoc2013-evolution-e0d5ae3e97f318fb60674de189c8eff91477bac9.tar.xz gsoc2013-evolution-e0d5ae3e97f318fb60674de189c8eff91477bac9.tar.zst gsoc2013-evolution-e0d5ae3e97f318fb60674de189c8eff91477bac9.zip | |
** Fixes bug #513951
2008-03-11 Matthew Barnes <mbarnes@redhat.com>
** Fixes bug #513951
* addressbook/gui/component/addressbook-component.c (ensure_sources):
* addressbook/gui/component/addressbook-migrate.c (addressbook_migrate):
* calendar/gui/cal-search-bar.c (cal_search_bar_construct):
* calendar/gui/migration.c (create_calendar_sources),
(create_task_sources), (migrate_calendars), (migrate_tasks),
(create_memo_sources):
* calendar/gui/e-memos.c (e_memos_setup_view_menus):
* calendar/gui/tasks-component.c (ensure_sources):
* calendar/gui/gnome-cal.c (gnome_calendar_setup_view_menus):
* calendar/gui/calendar-component.c (ensure_sources):
* calendar/gui/memos-component.c (ensure_sources):
* mail/mail-config.c (gconf_mime_types_changed):
Adapt to new meaning of xxx_component_peek_base_directory().
* addressbook/gui/component/addressbook-component.c
(addressbook_component_init):
* addressbook/gui/component/addressbook-migrate.c (create_groups):
* calendar/gui/tasks-component.c (tasks_component_init):
* calendar/gui/calendar-component.c (calendar_component_init):
* calendar/gui/memos-component.c (memos_component_init):
* composer/e-msg-composer.c (autosave_manager_query_load_orphans),
(autosave_init_file):
* e-util/e-mktemp.c (get_dir):
* e-util/e-util.c (get_lock_filename):
* mail/mail-component.c:
* plugins/face/face.c (org_gnome_composer_face):
* smime/lib/e-cert-db.c (initialize_nss):
Use e_get_user_data_dir() instead of constructing the full path.
* calendar/gui/migration.c (add_gw_esource):
* composer/e-msg-composer.c (e_msg-composer_unrealize),
(e_msg_composer_set_view_from), (e_msg_composer_set_view_replyto),
(e_msg_composer_set_view_to), (e_msg_composer_set_view_postto),
(e_msg_composer_set_view_cc), (e_msg_composer_set_view_bcc):
* e-util/e-util.c (e_file_update_save_path), (e_file_get_save_path):
Emit warnings if saving to GConf fails.
* e-util/e-util.c (e_get_user_data_dir):
New function returns the base directory for Evolution user data.
This should be the /only/ place in the application where this
directory is hard-coded.
svn path=/trunk/; revision=35175
Diffstat (limited to 'smime')
| -rw-r--r-- | smime/ChangeLog | 7 | ||||
| -rw-r--r-- | smime/lib/e-cert-db.c | 14 |
2 files changed, 11 insertions, 10 deletions
diff --git a/smime/ChangeLog b/smime/ChangeLog index d9703c0efa..ce7e36dd7b 100644 --- a/smime/ChangeLog +++ b/smime/ChangeLog @@ -1,3 +1,10 @@ +2008-03-11 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #513951 + + * lib/e-cert-db.c (initialize_nss): + Use e_get_user_data_dir() instead of constructing the full path. + 2007-10-09 Matthew Barnes <mbarnes@redhat.com> ** Fixes part of bug #437579 diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c index 91301052af..a224026335 100644 --- a/smime/lib/e-cert-db.c +++ b/smime/lib/e-cert-db.c @@ -87,6 +87,7 @@ #include "plstr.h" #include "prprf.h" #include "prmem.h" +#include "e-util/e-util.h" #include "e-util/e-dialog-utils.h" #include "e-util/e-util-private.h" #include <gtk/gtkmessagedialog.h> @@ -177,18 +178,11 @@ initialize_nss (void) char *evolution_dir_path; gboolean success; - evolution_dir_path = g_build_filename (g_get_home_dir (), ".evolution", NULL); - #ifdef G_OS_WIN32 /* NSS wants filenames in system codepage */ - { - char *cp_path = g_win32_locale_filename_from_utf8 (evolution_dir_path); - - if (cp_path) { - g_free (evolution_dir_path); - evolution_dir_path = cp_path; - } - } + evolution_dir_path = g_win32_locale_filename_from_utf8 (e_get_user_data_dir ()); +#else + evolution_dir_path = g_strdup (e_get_user_data_dir ()); #endif /* we initialize NSS here to make sure it only happens once */ |