diff options
| author | Dan Winship <danw@src.gnome.org> | 2000-06-13 03:29:17 +0800 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2000-06-13 03:29:17 +0800 |
| commit | 860fb187ffb12a9373394b063826a9a3b01cf9b0 (patch) | |
| tree | fa888ed69c56994497fcfda8d226039e42c93d78 /mail/component-factory.c | |
| parent | 0931d27d61aa9f0ccc579be8d4c7b3c56bdd684f (diff) | |
| download | gsoc2013-evolution-860fb187ffb12a9373394b063826a9a3b01cf9b0.tar gsoc2013-evolution-860fb187ffb12a9373394b063826a9a3b01cf9b0.tar.gz gsoc2013-evolution-860fb187ffb12a9373394b063826a9a3b01cf9b0.tar.bz2 gsoc2013-evolution-860fb187ffb12a9373394b063826a9a3b01cf9b0.tar.lz gsoc2013-evolution-860fb187ffb12a9373394b063826a9a3b01cf9b0.tar.xz gsoc2013-evolution-860fb187ffb12a9373394b063826a9a3b01cf9b0.tar.zst gsoc2013-evolution-860fb187ffb12a9373394b063826a9a3b01cf9b0.zip | |
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
Diffstat (limited to 'mail/component-factory.c')
| -rw-r--r-- | mail/component-factory.c | 7 |
1 files changed, 3 insertions, 4 deletions
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; |