aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/em-folder-view.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 6f1b5ee551..175fbd6b01 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-02 Jeffrey Stedfast <fejj@novell.com>
+
+ * em-folder-view.c (emfv_list_done_message_selected): Check for
+ NULL messages (happens if the message isn't available).
+
2004-11-02 Radek Doulik <rodo@ximian.com>
* em-format-html.c: replace 3 nested html tables used to create
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index 2349fd9d91..8d7d218ff5 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -1997,7 +1997,7 @@ emfv_list_done_message_selected(CamelFolder *folder, const char *uid, CamelMimeM
EMEvent *eme;
EMEventTargetMessage *target;
- if (emfv->preview == NULL) {
+ if (emfv->preview == NULL || msg == NULL) {
emfv->priv->nomarkseen = FALSE;
g_object_unref (emfv);
emfv_enable_menus(emfv);
@@ -2023,11 +2023,11 @@ emfv_list_done_message_selected(CamelFolder *folder, const char *uid, CamelMimeM
if (msg && emfv->mark_seen && !emfv->priv->nomarkseen) {
if (emfv->mark_seen_timeout > 0) {
struct mst_t *mst;
-
+
mst = g_new (struct mst_t, 1);
mst->emfv = emfv;
mst->uid = g_strdup (uid);
-
+
emfv->priv->seen_id = g_timeout_add_full(G_PRIORITY_DEFAULT_IDLE, emfv->mark_seen_timeout,
(GSourceFunc)do_mark_seen, mst, (GDestroyNotify)mst_free);
} else {