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/folder-browser-factory.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'mail/folder-browser-factory.c') diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c index 568d1cfaf5..a7c45d822d 100644 --- a/mail/folder-browser-factory.c +++ b/mail/folder-browser-factory.c @@ -166,23 +166,18 @@ folder_browser_factory_new_control (const char *uri, BonoboControl *control; GtkWidget *folder_browser; - folder_browser = folder_browser_new (shell); + folder_browser = folder_browser_new (shell, uri); if (folder_browser == NULL) return NULL; FOLDER_BROWSER (folder_browser)->pref_master = TRUE; /* save UI settings changed in this FB */ - if (!folder_browser_set_uri (FOLDER_BROWSER (folder_browser), uri)) { - gtk_object_sink (GTK_OBJECT (folder_browser)); - return NULL; - } - gtk_widget_show (folder_browser); control = bonobo_control_new (folder_browser); if (control == NULL) { - gtk_object_destroy (GTK_OBJECT (folder_browser)); + gtk_object_unref (GTK_OBJECT (folder_browser)); return NULL; } -- cgit v1.2.3