[evolution] Avoid a runtime warning in mail_reader_message_seen_cb().
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Avoid a runtime warning in mail_reader_message_seen_cb().
- Date: Tue, 29 Nov 2011 06:20:20 +0000 (UTC)
commit f325283cc3c8360d4ec2e191a579ecb238501c23
Author: Matthew Barnes <mbarnes redhat com>
Date: Mon Nov 28 23:52:39 2011 -0600
Avoid a runtime warning in mail_reader_message_seen_cb().
mail/e-mail-reader.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index 27af0d2..a0c9688 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -2471,7 +2471,6 @@ mail_reader_message_seen_cb (EMailReaderClosure *closure)
EMailReader *reader;
GtkWidget *message_list;
EMFormatHTML *formatter;
- CamelMimeMessage *message;
const gchar *current_uid;
const gchar *message_uid;
gboolean uid_is_current = TRUE;
@@ -2488,13 +2487,16 @@ mail_reader_message_seen_cb (EMailReaderClosure *closure)
current_uid = MESSAGE_LIST (message_list)->cursor_uid;
uid_is_current &= (g_strcmp0 (current_uid, message_uid) == 0);
- message = EM_FORMAT (formatter)->message;
- g_return_val_if_fail (CAMEL_IS_MIME_MESSAGE (message), FALSE);
+ if (uid_is_current) {
+ CamelMimeMessage *message;
+
+ message = EM_FORMAT (formatter)->message;
+ g_return_val_if_fail (message != NULL, FALSE);
- if (uid_is_current)
g_signal_emit (
reader, signals[MESSAGE_SEEN], 0,
message_uid, message);
+ }
return FALSE;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]