From 53f2bd4158829c34dbe88b90b78a154cdf9e46df Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Mon, 19 Jan 2004 16:21:26 +0000 Subject: path to gtkhtml's rc file (config_write_style): use MAIL_CONFIG_RC_DIR 2004-01-19 Radek Doulik * mail-config.c (MAIL_CONFIG_RC_DIR): path to gtkhtml's rc file (config_write_style): use MAIL_CONFIG_RC_DIR (mail_config_init): ditto svn path=/trunk/; revision=24307 --- mail/ChangeLog | 6 ++++++ mail/mail-config.c | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'mail') diff --git a/mail/ChangeLog b/mail/ChangeLog index 2de489db80..4a437b658f 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,9 @@ +2004-01-19 Radek Doulik + + * mail-config.c (MAIL_CONFIG_RC_DIR): path to gtkhtml's rc file + (config_write_style): use MAIL_CONFIG_RC_DIR + (mail_config_init): ditto + 2004-01-19 Not Zed * mail-ops.c (add_vjunk_info, add_vtrash_info): removed this like diff --git a/mail/mail-config.c b/mail/mail-config.c index c63632374b..a14fad42a3 100644 --- a/mail/mail-config.c +++ b/mail/mail-config.c @@ -92,6 +92,7 @@ static MailConfig *config = NULL; static guint config_write_timeout = 0; #define MAIL_CONFIG_RC "/gtkrc-mail-fonts" +#define MAIL_CONFIG_RC_DIR ".evolution/mail/config" /* signatures */ MailConfigSignature * @@ -448,7 +449,7 @@ config_write_style (void) * * EPFIXME this kludge needs to go away. */ - filename = g_build_filename (g_get_home_dir (), ".evolution/mail/config", MAIL_CONFIG_RC, NULL); + filename = g_build_filename (g_get_home_dir (), MAIL_CONFIG_RC_DIR, MAIL_CONFIG_RC, NULL); rc = fopen (filename, "w"); @@ -530,7 +531,7 @@ mail_config_init (void) EPFIXME: This kludge needs to go away. filename = g_build_filename (evolution_dir, MAIL_CONFIG_RC, NULL); */ - filename = g_build_filename (g_get_home_dir (), "evolution", MAIL_CONFIG_RC, NULL); + filename = g_build_filename (g_get_home_dir (), MAIL_CONFIG_RC_DIR, MAIL_CONFIG_RC, NULL); gtk_rc_parse (filename); g_free (filename); -- cgit