From 860fb187ffb12a9373394b063826a9a3b01cf9b0 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Mon, 12 Jun 2000 19:29:17 +0000 Subject: Return the result of folder_browser_load_folder. (get_prop, set_prop, * folder-browser.c (folder_browser_set_uri): Return the result of folder_browser_load_folder. (get_prop, set_prop, folder_browser_properties_init): Remove. No longer needed. * folder-browser-factory.c (folder_browser_factory_new_control): Add a "uri" argument, return NULL if setting it fails. (folder_browser_factory_new_control): Remove property bag stuff. (folder_browser_factory_init, folder_browser_factory): Remove this, since we're using the component factory now. * component-factory.c (create_view): Update for folder_browser_factory_new_control change and return NOTFOUND as appropriate. * main.c (main): Don't call folder_browser_factory_init. svn path=/trunk/; revision=3532 --- mail/component-factory.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'mail/component-factory.c') diff --git a/mail/component-factory.c b/mail/component-factory.c index ee69f0da84..605789854f 100644 --- a/mail/component-factory.c +++ b/mail/component-factory.c @@ -72,7 +72,9 @@ create_view (EvolutionShellComponent *shell_component, if (g_strcasecmp (folder_type, "mail") != 0) return EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE; - control = folder_browser_factory_new_control (); + control = folder_browser_factory_new_control (physical_uri); + if (!control) + return EVOLUTION_SHELL_COMPONENT_NOTFOUND; folder_browser_widget = bonobo_control_get_widget (control); @@ -85,9 +87,6 @@ create_view (EvolutionShellComponent *shell_component, gtk_object_set_data((GtkObject *)folder_browser_widget, "e-storage", gtk_object_get_data((GtkObject *)shell_component, "e-storage")); - /* FIXME: This never fails. :-/ */ - folder_browser_set_uri (FOLDER_BROWSER (folder_browser_widget), physical_uri); - *control_return = control; return EVOLUTION_SHELL_COMPONENT_OK; -- cgit