aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2000-07-14 08:25:01 +0800
committerDan Winship <danw@src.gnome.org>2000-07-14 08:25:01 +0800
commitdb5378100389017aed128c0aefbb9029ab1e8014 (patch)
treedf7ec1d8bcfd98aa8aa5395851447578890419b8
parenta7cdc29a08b9b55c71ced639147e7caf4bd3c608 (diff)
downloadgsoc2013-evolution-db5378100389017aed128c0aefbb9029ab1e8014.tar
gsoc2013-evolution-db5378100389017aed128c0aefbb9029ab1e8014.tar.gz
gsoc2013-evolution-db5378100389017aed128c0aefbb9029ab1e8014.tar.bz2
gsoc2013-evolution-db5378100389017aed128c0aefbb9029ab1e8014.tar.lz
gsoc2013-evolution-db5378100389017aed128c0aefbb9029ab1e8014.tar.xz
gsoc2013-evolution-db5378100389017aed128c0aefbb9029ab1e8014.tar.zst
gsoc2013-evolution-db5378100389017aed128c0aefbb9029ab1e8014.zip
Only unref the folder if it's been set.
* message-list.c (message_list_destroy): Only unref the folder if it's been set. * folder-browser.c (folder_browser_destroy): Only sync the folder if it's been set. svn path=/trunk/; revision=4162
-rw-r--r--mail/ChangeLog11
-rw-r--r--mail/folder-browser.c6
-rw-r--r--mail/message-list.c3
3 files changed, 15 insertions, 5 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 822d6fd16c..2a1566da89 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,6 +1,15 @@
+2000-07-13 Dan Winship <danw@helixcode.com>
+
+ * message-list.c (message_list_destroy): Only unref the folder if
+ it's been set.
+
+ * folder-browser.c (folder_browser_destroy): Only sync the folder
+ if it's been set.
+
2000-07-13 Jonathan Blandford <jrb@redhat.com>
- * mail-config.c (create_transport): s/CAMEL_SERVICE_NEED_HOST/CAMEL_SERVICE_URL_NEED_HOST.
+ * mail-config.c (create_transport):
+ s/CAMEL_SERVICE_NEED_HOST/CAMEL_SERVICE_URL_NEED_HOST.
2000-07-13 Dan Winship <danw@helixcode.com>
diff --git a/mail/folder-browser.c b/mail/folder-browser.c
index d8c5b4a39b..925feb4303 100644
--- a/mail/folder-browser.c
+++ b/mail/folder-browser.c
@@ -27,8 +27,6 @@ folder_browser_destroy (GtkObject *object)
{
FolderBrowser *folder_browser = FOLDER_BROWSER (object);
- camel_folder_sync (folder_browser->folder, FALSE, NULL);
-
if (folder_browser->shell) {
CORBA_Environment ev;
@@ -40,8 +38,10 @@ folder_browser_destroy (GtkObject *object)
if (folder_browser->uri)
g_free (folder_browser->uri);
- if (folder_browser->folder)
+ if (folder_browser->folder) {
+ camel_folder_sync (folder_browser->folder, FALSE, NULL);
gtk_object_unref (GTK_OBJECT (folder_browser->folder));
+ }
if (folder_browser->message_list)
bonobo_object_unref (BONOBO_OBJECT (folder_browser->message_list));
diff --git a/mail/message-list.c b/mail/message-list.c
index 73ac39d608..0bac0259e0 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -634,7 +634,8 @@ message_list_destroy (GtkObject *object)
if (message_list->idle_id != 0)
g_source_remove(message_list->idle_id);
- gtk_object_unref (GTK_OBJECT (message_list->folder));
+ if (message_list->folder)
+ gtk_object_unref (GTK_OBJECT (message_list->folder));
GTK_OBJECT_CLASS (message_list_parent_class)->destroy (object);
}