aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/folder-browser-factory.c7
-rw-r--r--shell/e-shell.c16
4 files changed, 32 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 164ebe4407..282a22023f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2000-03-13 bertrand <bertrand@helixcode.com>
+ * shell/e-shell.c (EShell_register_service):
+ test implementation. Show the uri and the type
+ of service that has just been registered.
+
* shell/e-shell-view.c (get_view):
once we have the bonobo control widget,
disable the autoactivation and activate
diff --git a/mail/ChangeLog b/mail/ChangeLog
index ce3e7bb60c..4bba22d4b3 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2000-03-13 bertrand <bertrand@helixcode.com>
+
+ * folder-browser-factory.c (folder_browser_set_shell):
+ for testing and demonstration purpose, immediately
+ register a fake service.
+
+
2000-03-12 bertrand <bertrand@helixcode.com>
* folder-browser-factory.c (folder_browser_factory_init):
diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c
index fb8ed18aa1..17b0f16325 100644
--- a/mail/folder-browser-factory.c
+++ b/mail/folder-browser-factory.c
@@ -33,16 +33,21 @@ folder_browser_set_shell (EvolutionServiceRepository *sr,
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);
printf ("I AM A FOLDER BROWSER AND I AM STORING THE SHELL\n");
/* FIXME : ref the shell here */
folder_browser->shell = shell;
-
+
+ /* test the component->shell registration */
+ Evolution_Shell_register_service (shell, Evolution_Shell_MAIL_STORE, "a_service", &ev);
}
static void
diff --git a/shell/e-shell.c b/shell/e-shell.c
index ec383746f0..f706723f37 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -132,7 +132,21 @@ EShell_register_service (PortableServer_Servant servant,
const CORBA_char *uri,
CORBA_Environment *ev)
{
- printf ("toto\n");
+ char *service_type_desc = NULL;
+
+ switch (type) {
+
+ case Evolution_Shell_MAIL_STORE :
+ service_type_desc = "store";
+ break;
+ case Evolution_Shell_MAIL_TRANSPORT :
+ service_type_desc = "transport";
+ break;
+ default :
+ service_type_desc = "service of unknown type";
+ }
+
+ printf ("A component has registered a %s with uri \"%s\"\n", service_type_desc, uri);
}