diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 8 | ||||
| -rw-r--r-- | mail/Makefile.am | 1 | ||||
| -rw-r--r-- | mail/folder-browser-factory.c | 51 |
3 files changed, 8 insertions, 52 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index d167dbc7b2..d795771850 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,11 @@ +2000-05-23 Ettore Perazzoli <ettore@helixcode.com> + + * Makefile.am: Don't link to `evolution-service-repository.o' + anymore. + + * folder-browser-factory.c: Don't use crufty service-repository + anymore. + 2000-05-21 Ettore Perazzoli <ettore@helixcode.com> * message-list.c (get_message_info): Made static. diff --git a/mail/Makefile.am b/mail/Makefile.am index 700fb60eb6..1fdb0d3e73 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -51,7 +51,6 @@ evolution_mail_LDADD = \ ../shell/Evolution-common.o \ ../shell/Evolution-stubs.o \ ../shell/Evolution-skels.o \ - ../shell/evolution-service-repository.o \ ../composer/libcomposer.la \ ../widgets/e-table/libetable.a \ ../widgets/e-text/libetext.a \ diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c index e46e51df52..de9d9ff06e 100644 --- a/mail/folder-browser-factory.c +++ b/mail/folder-browser-factory.c @@ -18,7 +18,6 @@ #include "folder-browser.h" #include "mail.h" #include "shell/Evolution.h" -#include "shell/evolution-service-repository.h" #ifdef USING_OAF #define CONTROL_FACTORY_ID "OAFIID:control-factory:evolution-mail:25902062-543b-4f44-8702-d90145fcdbf2" @@ -27,49 +26,6 @@ #endif static void -folder_browser_set_shell (EvolutionServiceRepository *sr, - Evolution_Shell shell, - void *closure) -{ - FolderBrowser *folder_browser; - CORBA_Environment ev; - - g_return_if_fail (closure); - g_return_if_fail (IS_FOLDER_BROWSER (closure)); - g_return_if_fail (shell != CORBA_OBJECT_NIL); - - CORBA_exception_init (&ev); - - folder_browser = FOLDER_BROWSER (closure); - - folder_browser->shell = shell; - - /* test the component->shell registration */ - Evolution_Shell_register_service (shell, Evolution_Shell_MAIL_STORE, "a_service", &ev); - - CORBA_exception_free (&ev); -} - -static void -folder_browser_control_add_service_repository_interface (BonoboControl *control, - GtkWidget *folder_browser) -{ - EvolutionServiceRepository *sr; - - /* - * create an implementation for the Evolution::ServiceRepository - * interface - */ - sr = evolution_service_repository_new (folder_browser_set_shell, - (void *)folder_browser); - - /* add the interface to the control */ - bonobo_object_add_interface (BONOBO_OBJECT (control), - BONOBO_OBJECT (sr)); -} - - -static void random_cb (GtkWidget *button, gpointer user_data) { printf ("Yow! I am called back!\n"); @@ -204,13 +160,6 @@ folder_browser_factory (BonoboGenericFactory *factory, void *closure) 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. - * - * 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); return BONOBO_OBJECT (control); } |