diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2008-03-12 20:25:24 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-03-12 20:25:24 +0800 |
| commit | cc692562f528115284d338dea12f8809d1efd17f (patch) | |
| tree | 07150f4269ee1125a5c867fbd7dc72de81520873 /mail/em-utils.c | |
| parent | da53bb3e1f23f696e1245676b71fe617a5f4a48a (diff) | |
| download | gsoc2013-evolution-cc692562f528115284d338dea12f8809d1efd17f.tar gsoc2013-evolution-cc692562f528115284d338dea12f8809d1efd17f.tar.gz gsoc2013-evolution-cc692562f528115284d338dea12f8809d1efd17f.tar.bz2 gsoc2013-evolution-cc692562f528115284d338dea12f8809d1efd17f.tar.lz gsoc2013-evolution-cc692562f528115284d338dea12f8809d1efd17f.tar.xz gsoc2013-evolution-cc692562f528115284d338dea12f8809d1efd17f.tar.zst gsoc2013-evolution-cc692562f528115284d338dea12f8809d1efd17f.zip | |
** Fixes breakage caused by bug #513951
2008-03-12 Matthew Barnes <mbarnes@redhat.com>
** Fixes breakage caused by bug #513951
* mail-autofilter.c (filter_gui_add_from_message),
(mail_filter_rename_uri), (mail_filter_delete_uri):
* mail-tools.c (mail_tool_get_local_movemail_path):
* mail-vfolder.c (mail_vfolder_delete_uri), (mail_vfolder_rename_uri),
(store_folder_deleted), (store_folder_renamed),
(vfolder_load_storage), (vfolder_revert),
(em_vfolder_editor_response), (edit_rule_response),
(new_rule_clicked):
* em-folder-browser.c (emfb_search_search_activated):
* em-folder-tree.c (em_folder_tree_new):
* mail-ops.c (uid_cachename_hack), (empty_trash_exec):
* em-folder-view.c (emfv_setup_view_instance):
* em-utils.c (em_filter_editor_response), (em_utils_edit_filters):
* importers/mail-importer.c (import_folders_rec):
* mail-folder-cache.c (rename_folders):
* em-format-html.c (em_format_html_get_type):
* mail-session.c (main_get_filter_driver):
* mail-config.c (gconf_mime_types_changed), (uri_to_evname),
(mail_config_folder_to_cachename), (get_new_signature_filename):
Adapt to new meaning of mail_component_peek_base_directory().
* mail-component.c (mail_component_init):
Add back initialization of priv->base_directory. Accidentally
removed it somehow in last commit.
svn path=/trunk/; revision=35179
Diffstat (limited to 'mail/em-utils.c')
| -rw-r--r-- | mail/em-utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mail/em-utils.c b/mail/em-utils.c index 1e41708afa..0c81fbe8bd 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -255,7 +255,7 @@ em_filter_editor_response (GtkWidget *dialog, int button, gpointer user_data) char *user; fc = g_object_get_data ((GObject *) dialog, "context"); - user = g_strdup_printf ("%s/mail/filters.xml", + user = g_strdup_printf ("%s/filters.xml", mail_component_peek_base_directory (mail_component_peek ())); rule_context_save ((RuleContext *) fc, user); g_free (user); @@ -293,7 +293,7 @@ em_utils_edit_filters (GtkWidget *parent) } fc = em_filter_context_new (); - user = g_strdup_printf ("%s/mail/filters.xml", base_directory); + user = g_strdup_printf ("%s/filters.xml", base_directory); system = g_build_filename (EVOLUTION_PRIVDATADIR, "filtertypes.xml", NULL); rule_context_load ((RuleContext *) fc, system, user); g_free (user); |