From 4db8df6b4da45e503aea556f7b3342cffa1f6e4c Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Tue, 5 Mar 2002 21:17:46 +0000 Subject: 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 --- mail/ChangeLog | 5 +++++ mail/mail-folder-cache.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) 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 + + * 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 * 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); -- cgit