From e73fea5ecfc8b1840eaff2b3c4d88fa9bd46df87 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Tue, 18 Sep 2001 21:12:37 +0000 Subject: Merged into folder_browser_new: nothing ever changes the URI of an * folder-browser.c (folder_browser_set_uri): Merged into folder_browser_new: nothing ever changes the URI of an existing folder browser any more. (folder_browser_new): Make this take a uri argument and do the work folder_browser_set_uri used to do, except that we set fb->uri right away, so that if the folder browser's control is activated before got_folder() gets called, then folder_browser_ui_add_list() will have access to the correct uri for purposes of setting ViewThreaded, etc. Fixes #4913. (got_folder): Don't set fb->uri here since it will already have been set. Don't call message_list_set_threaded, since it should be a noop now (and if it's not, it would make the message list not match the menu item). * folder-browser-ui.c (folder_browser_ui_add_list): Remove some code that was failing to work around the problems above. * message-browser.c (message_browser_new): Pass uri to folder_browser_new, remove call to set_uri. * folder-browser-factory.c (folder_browser_factory_new_control): Likewise. Also fix a s/destroy/unref/ in an error cleanup. svn path=/trunk/; revision=12954 --- mail/message-browser.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'mail/message-browser.c') diff --git a/mail/message-browser.c b/mail/message-browser.c index 87255efefe..6d7ef49398 100644 --- a/mail/message-browser.c +++ b/mail/message-browser.c @@ -222,7 +222,7 @@ message_browser_new (const GNOME_Evolution_Shell shell, const char *uri, const c gtk_object_set_data_full (GTK_OBJECT (new), "uid", g_strdup (uid), g_free); - fb = FOLDER_BROWSER (folder_browser_new (shell)); + fb = FOLDER_BROWSER (folder_browser_new (shell, uri)); new->fb = fb; set_bonobo_ui (GTK_WIDGET (new), fb); @@ -253,8 +253,6 @@ message_browser_new (const GNOME_Evolution_Shell shell, const char *uri, const c gtk_signal_connect (GTK_OBJECT (fb), "message_loaded", message_browser_message_loaded, new); - folder_browser_set_uri (fb, uri); - return GTK_WIDGET (new); } -- cgit v1.2.3