aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNot Zed <NotZed@Ximian.com>2003-03-03 14:39:38 +0800
committerMichael Zucci <zucchi@src.gnome.org>2003-03-03 14:39:38 +0800
commit65f1aefe075ecd0ba7bc19094bcb683ea4d7e5c1 (patch)
treefb0bf180797caa27e12d98c3fa5cd2206b9a94d5
parent819f5057c5a061f4b93ffb5e61c76c9938661b1c (diff)
downloadgsoc2013-evolution-65f1aefe075ecd0ba7bc19094bcb683ea4d7e5c1.tar.gz
gsoc2013-evolution-65f1aefe075ecd0ba7bc19094bcb683ea4d7e5c1.tar.zst
gsoc2013-evolution-65f1aefe075ecd0ba7bc19094bcb683ea4d7e5c1.zip
Do similar folder != NULL checking as for delete_folder before passing a
2003-03-03 Not Zed <NotZed@Ximian.com> * camel-store.c (camel_store_unsubscribe_folder): Do similar folder != NULL checking as for delete_folder before passing a NULL to object_bag_remove. svn path=/trunk/; revision=20121
-rw-r--r--camel/ChangeLog6
-rw-r--r--camel/camel-store.c7
2 files changed, 10 insertions, 3 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index b3409df56c..c3fb16e43e 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,9 @@
+2003-03-03 Not Zed <NotZed@Ximian.com>
+
+ * camel-store.c (camel_store_unsubscribe_folder): Do similar
+ folder != NULL checking as for delete_folder before passing a NULL
+ to object_bag_remove.
+
2003-02-28 Jeffrey Stedfast <fejj@ximian.com>
* camel-http-stream.c (http_connect): Here too.
diff --git a/camel/camel-store.c b/camel/camel-store.c
index 35adf8c6cd..852851f51b 100644
--- a/camel/camel-store.c
+++ b/camel/camel-store.c
@@ -1021,11 +1021,12 @@ camel_store_unsubscribe_folder (CamelStore *store,
CS_CLASS (store)->unsubscribe_folder (store, folder_name, ex);
- if (store->folders)
- camel_object_bag_remove(store->folders, folder);
+ if (folder) {
+ if (store->folders)
+ camel_object_bag_remove(store->folders, folder);
- if (folder)
camel_object_unref(folder);
+ }
CAMEL_STORE_UNLOCK(store, folder_lock);
}