aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2012-07-03 00:32:00 +0800
committerMilan Crha <mcrha@redhat.com>2012-07-03 00:32:00 +0800
commit56333d439bb9bf225d413a6308d2077288207315 (patch)
tree8989d461e1d13504dffd37188fbbb6438761154d
parent8b7bd45b7cfcfa5c7002d88a933758c78661d1b4 (diff)
downloadgsoc2013-evolution-56333d439bb9bf225d413a6308d2077288207315.tar
gsoc2013-evolution-56333d439bb9bf225d413a6308d2077288207315.tar.gz
gsoc2013-evolution-56333d439bb9bf225d413a6308d2077288207315.tar.bz2
gsoc2013-evolution-56333d439bb9bf225d413a6308d2077288207315.tar.lz
gsoc2013-evolution-56333d439bb9bf225d413a6308d2077288207315.tar.xz
gsoc2013-evolution-56333d439bb9bf225d413a6308d2077288207315.tar.zst
gsoc2013-evolution-56333d439bb9bf225d413a6308d2077288207315.zip
Bug #677604 - Critical warnings on evolution start
-rw-r--r--libemail-engine/e-mail-session.c5
-rw-r--r--mail/e-mail-ui-session.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/libemail-engine/e-mail-session.c b/libemail-engine/e-mail-session.c
index 4b4cdf2122..881f6801a8 100644
--- a/libemail-engine/e-mail-session.c
+++ b/libemail-engine/e-mail-session.c
@@ -505,7 +505,10 @@ mail_session_add_from_source (EMailSession *session,
/* Sanity checks. */
g_return_if_fail (uid != NULL);
- g_return_if_fail (backend_name != NULL);
+
+ /* send-only accounts */
+ if (!backend_name)
+ return;
/* Our own CamelSession.add_service() method will handle the
* resulting CamelService, so we don't need the return value. */
diff --git a/mail/e-mail-ui-session.c b/mail/e-mail-ui-session.c
index efbcd8fcc4..ce21c9688b 100644
--- a/mail/e-mail-ui-session.c
+++ b/mail/e-mail-ui-session.c
@@ -492,7 +492,10 @@ mail_ui_session_source_changed_cb (ESourceRegistry *registry,
/* There should be a CamelStore with the same UID. */
service = camel_session_get_service (CAMEL_SESSION (session), uid);
- g_return_if_fail (CAMEL_IS_STORE (service));
+
+ /* send-only accounts */
+ if (!CAMEL_IS_STORE (service))
+ return;
/* Remove the store from the folder tree model and, if the
* source is still enabled, re-add it. Easier than trying