From 7ec32a220b4dd1ea5e789d6e48e57b29d4f086c1 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Tue, 12 Sep 2000 18:11:27 +0000 Subject: set folder_tree before adding the listener, since that will eventually * mail-local-storage.c (mail_local_storage_startup): set folder_tree before adding the listener, since that will eventually invoke callbacks that will look at it. svn path=/trunk/; revision=5374 --- mail/ChangeLog | 4 ++++ mail/mail-local-storage.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mail/ChangeLog b/mail/ChangeLog index 461f5ed8c6..ccf356f681 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,9 @@ 2000-09-12 Dan Winship + * mail-local-storage.c (mail_local_storage_startup): set + folder_tree before adding the listener, since that will eventually + invoke callbacks that will look at it. + * folder-browser-factory.c (control_deactivate): sync the folder on deactivate. diff --git a/mail/mail-local-storage.c b/mail/mail-local-storage.c index 90bd32a081..ea343c41b0 100644 --- a/mail/mail-local-storage.c +++ b/mail/mail-local-storage.c @@ -147,6 +147,8 @@ mail_local_storage_startup (EvolutionShellClient *shell_client) gtk_signal_connect (GTK_OBJECT (local_storage_listener), "removed_folder", GTK_SIGNAL_FUNC (local_storage_removed_folder_cb), NULL); + folder_tree = e_folder_tree_new (folder_tree_folder_notify_cb, NULL); + Evolution_Storage_add_listener (corba_local_storage, corba_local_storage_listener, &ev); if (ev._major != CORBA_NO_EXCEPTION) { g_warning ("%s -- Cannot add a listener to the Local Storage.", __FILE__); @@ -162,8 +164,6 @@ mail_local_storage_startup (EvolutionShellClient *shell_client) CORBA_exception_free (&ev); - folder_tree = e_folder_tree_new (folder_tree_folder_notify_cb, NULL); - return TRUE; } -- cgit