diff options
| -rw-r--r-- | mail/ChangeLog | 10 | ||||
| -rw-r--r-- | mail/mail-component.c | 4 |
2 files changed, 12 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 307651ea64..ae58656df8 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,15 @@ 2004-01-09 Not Zed <NotZed@Ximian.com> + ** See bug 52696. + + * mail-component.c (setup_search_context): move the searches to + ~/.evolution/mail/searches.xml (migration?). + (setup_search_context): fix a merge error, + vfoldertypes.xml->searchtypes.xml since it includes the system + searches now. + +2004-01-09 Not Zed <NotZed@Ximian.com> + * em-folder-tree.c (emft_popup_properties_got_folder): add total + unread counts to properties page. diff --git a/mail/mail-component.c b/mail/mail-component.c index af9add5a80..00715d7970 100644 --- a/mail/mail-component.c +++ b/mail/mail-component.c @@ -162,8 +162,8 @@ static void setup_search_context (MailComponent *component) { MailComponentPrivate *priv = component->priv; - char *user = g_strdup_printf ("%s/evolution/searches.xml", g_get_home_dir ()); /* EPFIXME should be somewhere else. */ - char *system = g_strdup (EVOLUTION_PRIVDATADIR "/vfoldertypes.xml"); + char *user = g_build_filename(component->priv->base_directory, "mail/searches.xml", NULL); + char *system = g_strdup (EVOLUTION_PRIVDATADIR "/searchtypes.xml"); priv->search_context = rule_context_new (); g_object_set_data_full (G_OBJECT (priv->search_context), "user", user, g_free); |