aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/mail-config.c2
-rw-r--r--mail/message-list.c3
3 files changed, 11 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 454477cfe6..1137e8d964 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,12 @@
2003-12-12 Not Zed <NotZed@Ximian.com>
+ * mail-config.c (config_write_style): put the style in .evolution.
+
+ ** See bug #52023.
+
+ * message-list.c (message_list_select_uid): noop if we've been
+ destroyed (foldre == NULL).
+
** See bug #52108.
* em-format.c (em_format_is_attachment): also recognise
diff --git a/mail/mail-config.c b/mail/mail-config.c
index 6fa378e25b..c63632374b 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -448,7 +448,7 @@ config_write_style (void)
*
* EPFIXME this kludge needs to go away.
*/
- filename = g_build_filename (g_get_home_dir (), "evolution", MAIL_CONFIG_RC, NULL);
+ filename = g_build_filename (g_get_home_dir (), ".evolution/mail/config", MAIL_CONFIG_RC, NULL);
rc = fopen (filename, "w");
diff --git a/mail/message-list.c b/mail/message-list.c
index c1fb66c39e..02ebc4a853 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -522,6 +522,9 @@ message_list_select_uid (MessageList *message_list, const char *uid)
{
ETreePath node;
+ if (message_list->folder == NULL)
+ return;
+
if (message_list->regen) {
g_free(message_list->pending_select_uid);
message_list->pending_select_uid = g_strdup(uid);