diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2009-01-18 07:46:45 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2009-01-18 07:46:45 +0800 |
| commit | 8e546420df08f5fe243aa4227be44915fd79b86b (patch) | |
| tree | 9475c4be3cf2eedceaa0122f5071a6f2914f3dd4 /mail/e-mail-reader.c | |
| parent | c22126d54f0cf0637e3d5ddd5d78b3ff5d111582 (diff) | |
| download | gsoc2013-evolution-8e546420df08f5fe243aa4227be44915fd79b86b.tar gsoc2013-evolution-8e546420df08f5fe243aa4227be44915fd79b86b.tar.gz gsoc2013-evolution-8e546420df08f5fe243aa4227be44915fd79b86b.tar.bz2 gsoc2013-evolution-8e546420df08f5fe243aa4227be44915fd79b86b.tar.lz gsoc2013-evolution-8e546420df08f5fe243aa4227be44915fd79b86b.tar.xz gsoc2013-evolution-8e546420df08f5fe243aa4227be44915fd79b86b.tar.zst gsoc2013-evolution-8e546420df08f5fe243aa4227be44915fd79b86b.zip | |
Fix a runtime warning.
svn path=/branches/kill-bonobo/; revision=37094
Diffstat (limited to 'mail/e-mail-reader.c')
| -rw-r--r-- | mail/e-mail-reader.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c index 7260dcd47e..697142aa6d 100644 --- a/mail/e-mail-reader.c +++ b/mail/e-mail-reader.c @@ -1941,9 +1941,10 @@ mail_reader_set_folder (EMailReader *reader, html_display = e_mail_reader_get_html_display (reader); message_list = e_mail_reader_get_message_list (reader); - outgoing = em_utils_folder_is_drafts (folder, folder_uri) || + outgoing = folder != NULL && folder_uri != NULL && ( + em_utils_folder_is_drafts (folder, folder_uri) || em_utils_folder_is_outbox (folder, folder_uri) || - em_utils_folder_is_sent (folder, folder_uri); + em_utils_folder_is_sent (folder, folder_uri)); if (message_list->folder != NULL) mail_sync_folder (message_list->folder, NULL, NULL); @@ -2232,8 +2233,6 @@ e_mail_reader_set_folder (EMailReader *reader, EMailReaderIface *iface; g_return_if_fail (E_IS_MAIL_READER (reader)); - g_return_if_fail (CAMEL_IS_FOLDER (folder)); - g_return_if_fail (folder_uri != NULL); iface = E_MAIL_READER_GET_IFACE (reader); g_return_if_fail (iface->set_folder != NULL); |