diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | mail/ChangeLog | 6 | ||||
| -rw-r--r-- | mail/evolution-mail.gnorba | 10 | ||||
| -rw-r--r-- | mail/folder-browser-factory.c | 18 | ||||
| -rw-r--r-- | shell/e-shell-view.c | 2 |
5 files changed, 24 insertions, 15 deletions
@@ -1,5 +1,8 @@ 2000-03-12 bertrand <bertrand@helixcode.com> + * shell/e-shell-view.c (get_view): name change + + * shell/e-folder.c (e_folder_get_folder_type): added the get_e_folder_type function. diff --git a/mail/ChangeLog b/mail/ChangeLog index afff7a2efd..5ff4a78035 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,11 @@ 2000-03-12 bertrand <bertrand@helixcode.com> + * folder-browser-factory.c (folder_browser_factory_init): + name change. + + * evolution-mail.gnorba: + name changes + * folder-browser.h: added a reference to an Evolution::Shell object. diff --git a/mail/evolution-mail.gnorba b/mail/evolution-mail.gnorba index 278c480384..7eb90dbc8a 100644 --- a/mail/evolution-mail.gnorba +++ b/mail/evolution-mail.gnorba @@ -1,13 +1,13 @@ -[GOADID:Evolution:FolderBrowserFactory:1.0] +[control-factory:evolution-mail] type=exe -repo_id=IDL:GNOME/GenericFactory:1.0 IDL:Bonobo/GenericFactory:1.0 +repo_id=IDL:GNOME/GenericFactory:1.0 description=Evolution mail folder factory component. location_info=evolution-mail -[GOADID:Evolution:FolderBrowser:1.0] +[control:evolution-mail] type=factory -repo_id=IDL:Evolution/Mail:1.0 +repo_id=IDL:BonoboControl/evolution-mail:1.0 IDL:GNOME/Control:1.0 description=Evolution mail folder display component. -location_info=GOADID:Evolution:FolderBrowserFactory:1.0 +location_info=control-factory:evolution-mail diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c index 213e1408ad..197cb833ed 100644 --- a/mail/folder-browser-factory.c +++ b/mail/folder-browser-factory.c @@ -127,10 +127,9 @@ folder_browser_factory (BonoboGenericFactory *factory, void *closure) return NULL; } - if (!warning_result) - bonobo_control_set_property_bag ( - control, - FOLDER_BROWSER (folder_browser)->properties); + + bonobo_control_set_property_bag (control, + FOLDER_BROWSER (folder_browser)->properties); /* for the moment, the control has the ability to register * some services itself, but this should not last. @@ -138,9 +137,9 @@ folder_browser_factory (BonoboGenericFactory *factory, void *closure) * It's not the way to do it, but we don't have the * correct infrastructure in the shell now. */ - folder_browser_control_add_service_repository_interface (control, folder_browser); - - + folder_browser_control_add_service_repository_interface (control, folder_browser); + + return BONOBO_OBJECT (control); } @@ -149,13 +148,14 @@ void folder_browser_factory_init (void) { static BonoboGenericFactory *bonobo_folder_browser_factory = NULL; - + + if (bonobo_folder_browser_factory != NULL) return; bonobo_folder_browser_factory = bonobo_generic_factory_new ( - "GOADID:Evolution:FolderBrowserFactory:1.0", + "control-factory:evolution-mail", folder_browser_factory, NULL); if (bonobo_folder_browser_factory == NULL){ diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index 10ce194af5..caea4bb6d6 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -94,7 +94,7 @@ get_view (EFolder *efolder) switch (e_folder_type) { case E_FOLDER_MAIL : - w = bonobo_widget_new_control ("GOADID:Evolution:FolderBrowser:1.0", + w = bonobo_widget_new_control ("control:evolution-mail", NULL); break; |