return NULL if we can't create a view.

2000-12-04  Michael Meeks  <michael@helixcode.com>

	* e-shell-view.c (get_control_for_uri): return NULL if we can't
	create a view.
	(setup_evolution_shell_view_interface): add precondition.

+

	lots of cleans.

svn path=/trunk/; revision=6778

6 files changed, 9 insertions, 37 deletions

diff --git a/wombat/GNOME_Evolution_Wombat.oaf.in b/wombat/GNOME_Evolution_Wombat.oaf.in
index 466443d1ab..8f74e35512 100644
--- a/wombat/GNOME_Evolution_Wombat.oaf.in
+++ b/wombat/GNOME_Evolution_Wombat.oaf.in
@@ -1,6 +1,6 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:evolution:addressbook-server:0fbc844d-c721-4615-98d0-d67eacf42d80"
+<oaf_server iid="OAFIID:GNOME_Evolution_Wombat_ServerFactory"
             type="exe"
             location="wombat">
 
@@ -13,7 +13,7 @@
                        value="The Personal Addressbook Server"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:evolution:calendar-factory:1c915858-ece3-4a6f-9d81-ea0f108a9554"
+<oaf_server iid="OAFIID:GNOME_Evolution_Wombat_CalendarFactory"
             type="exe"
             location="wombat">
 
diff --git a/wombat/GNOME_Evolution_Wombat.oafinfo b/wombat/GNOME_Evolution_Wombat.oafinfo
index 466443d1ab..8f74e35512 100644
--- a/wombat/GNOME_Evolution_Wombat.oafinfo
+++ b/wombat/GNOME_Evolution_Wombat.oafinfo
@@ -1,6 +1,6 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:evolution:addressbook-server:0fbc844d-c721-4615-98d0-d67eacf42d80"
+<oaf_server iid="OAFIID:GNOME_Evolution_Wombat_ServerFactory"
             type="exe"
             location="wombat">
 
@@ -13,7 +13,7 @@
                        value="The Personal Addressbook Server"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:evolution:calendar-factory:1c915858-ece3-4a6f-9d81-ea0f108a9554"
+<oaf_server iid="OAFIID:GNOME_Evolution_Wombat_CalendarFactory"
             type="exe"
             location="wombat">
 
diff --git a/wombat/Makefile.am b/wombat/Makefile.am
index 89ea9f2d69..a8ce0dcfb2 100644
--- a/wombat/Makefile.am
+++ b/wombat/Makefile.am
@@ -34,9 +34,9 @@ wombat_LDADD =							\
 wombat_LDFLAGS = `gnome-config --libs gnorba` 
 
 oafdir = $(datadir)/oaf
-oaf_DATA = wombat.oafinfo
+oaf_DATA = GNOME_Evolution_Wombat.oafinfo
 
-EXTRA_DIST = wombat.oafinfo
+EXTRA_DIST = $(oaf_DATA)
 
 if ENABLE_PURIFY
 PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
diff --git a/wombat/wombat.c b/wombat/wombat.c
index d5f350e6dd..d0e78bf374 100644
--- a/wombat/wombat.c
+++ b/wombat/wombat.c
@@ -108,7 +108,7 @@ register_pcs (CORBA_Object obj)
 	OAF_RegistrationResult result;
 
 	result = oaf_active_server_register
-		("OAFIID:evolution:calendar-factory:1c915858-ece3-4a6f-9d81-ea0f108a9554",
+		("OAFIID:GNOME_Evolution_Wombat_CalendarFactory",
 		 obj);
 
 	switch (result) {
diff --git a/wombat/wombat.idl b/wombat/wombat.idl
index ab13b2cabf..7a7f43bbc3 100644
--- a/wombat/wombat.idl
+++ b/wombat/wombat.idl
@@ -4,9 +4,11 @@
  * Copyright 2000, Helix Code, Inc.
  */
 
+module GNOME {
 module Evolution {
 
 	interface Config {
 
 	};
 };
+};
diff --git a/wombat/wombat.oafinfo b/wombat/wombat.oafinfo
deleted file mode 100644
index 466443d1ab..0000000000
--- a/wombat/wombat.oafinfo
+++ /dev/null
@@ -1,30 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:evolution:addressbook-server:0fbc844d-c721-4615-98d0-d67eacf42d80"
-            type="exe"
-            location="wombat">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/BookFactory:1.0"/>
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="The Personal Addressbook Server"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution:calendar-factory:1c915858-ece3-4a6f-9d81-ea0f108a9554"
-            type="exe"
-            location="wombat">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Calendar/CalFactory:1.0"/>
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="The Personal Calendar Server; calendar factory"/>
-
-</oaf_server>
-
-</oaf_info>