aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2002-03-06 05:17:46 +0800
committerDan Winship <danw@src.gnome.org>2002-03-06 05:17:46 +0800
commit4db8df6b4da45e503aea556f7b3342cffa1f6e4c (patch)
tree1af9acb563d96b10e3b97d010f434365498b0d86
parentf6f3d8d543e149f1e6db5994d8ca5288909d07a3 (diff)
downloadgsoc2013-evolution-4db8df6b4da45e503aea556f7b3342cffa1f6e4c.tar.gz
gsoc2013-evolution-4db8df6b4da45e503aea556f7b3342cffa1f6e4c.tar.zst
gsoc2013-evolution-4db8df6b4da45e503aea556f7b3342cffa1f6e4c.zip
Pull up assertion change from evolution-1-0-branch to allow external
* mail-folder-cache.c (mail_note_store): Pull up assertion change from evolution-1-0-branch to allow external storages. svn path=/trunk/; revision=15928
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/mail-folder-cache.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index e8202074bd..8acab32d73 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-05 Dan Winship <danw@ximian.com>
+
+ * mail-folder-cache.c (mail_note_store): Pull up assertion change
+ from evolution-1-0-branch to allow external storages.
+
2002-03-04 Jeffrey Stedfast <fejj@ximian.com>
* mail-accounts.c (mail_unselect): If the clicked column was
diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c
index c43a093a5a..c7bd808369 100644
--- a/mail/mail-folder-cache.c
+++ b/mail/mail-folder-cache.c
@@ -733,7 +733,7 @@ mail_note_store(CamelStore *store, EvolutionStorage *storage, GNOME_Evolution_St
g_assert(CAMEL_IS_STORE(store));
g_assert(pthread_self() == mail_gui_thread);
- g_assert(storage != NULL || corba_storage != CORBA_OBJECT_NIL);
+ g_assert(storage == NULL || corba_storage == CORBA_OBJECT_NIL);
LOCK(info_lock);