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

5 files changed, 16 insertions, 68 deletions

diff --git a/notes/GNOME_Evolution_Notes.oaf.in b/notes/GNOME_Evolution_Notes.oaf.in
index cfe67d7337..8bf763e546 100644
--- a/notes/GNOME_Evolution_Notes.oaf.in
+++ b/notes/GNOME_Evolution_Notes.oaf.in
@@ -1,6 +1,6 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:control-factory:evolution-notes:e2471f2d-0589-4861-a25d-c21818f531d5"
+<oaf_server iid="OAFIID:GNOME_Evolution_Notes_controlFactory"
             type="exe"
             location="evolution-notes">
 
@@ -13,9 +13,9 @@
 
 </oaf_server>
 
-<oaf_server iid="OAFIID:control:evolution-notes:8e3fb723-aada-4112-99db-d51779e35a2a"
+<oaf_server iid="OAFIID:GNOME_Evolution_Notes_control"
 	type="factory"
-	location="OAFIID:control-factory:evolution-notes:e2471f2d-0589-4861-a25d-c21818f531d5">
+	location="OAFIID:GNOME_Evolution_Notes_controlFactory">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/Control:1.0"/>
@@ -26,7 +26,7 @@
 
 </oaf_server>
 
-<oaf_server iid="OAFIID:evolution-shell-component-factory:evolution-notes:f2f0f57f-27d9-4498-b54b-248f223ee772"
+<oaf_server iid="OAFIID:GNOME_Evolution_Notes_shellComponentFactory"
 	type="exe"
 	location="evolution-notes">
 	
@@ -39,9 +39,9 @@
 
 </oaf_server>
 
-<oaf_server iid="OAFIID:evolution-shell-component:evolution-notes:92d95b91-3655-4746-ac68-01b21e2c5e44"
+<oaf_server iid="OAFIID:GNOME_Evolution_Notes_shellComponent"
 	type="factory"
-	location="OAFIID:evolution-shell-component-factory:evolution-notes:f2f0f57f-27d9-4498-b54b-248f223ee772">
+	location="OAFIID:GNOME_Evolution_Notes_shellComponentFactory">
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
 	</oaf_attribute>
diff --git a/notes/GNOME_Evolution_Notes.oafinfo b/notes/GNOME_Evolution_Notes.oafinfo
index cfe67d7337..8bf763e546 100644
--- a/notes/GNOME_Evolution_Notes.oafinfo
+++ b/notes/GNOME_Evolution_Notes.oafinfo
@@ -1,6 +1,6 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:control-factory:evolution-notes:e2471f2d-0589-4861-a25d-c21818f531d5"
+<oaf_server iid="OAFIID:GNOME_Evolution_Notes_controlFactory"
             type="exe"
             location="evolution-notes">
 
@@ -13,9 +13,9 @@
 
 </oaf_server>
 
-<oaf_server iid="OAFIID:control:evolution-notes:8e3fb723-aada-4112-99db-d51779e35a2a"
+<oaf_server iid="OAFIID:GNOME_Evolution_Notes_control"
 	type="factory"
-	location="OAFIID:control-factory:evolution-notes:e2471f2d-0589-4861-a25d-c21818f531d5">
+	location="OAFIID:GNOME_Evolution_Notes_controlFactory">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/Control:1.0"/>
@@ -26,7 +26,7 @@
 
 </oaf_server>
 
-<oaf_server iid="OAFIID:evolution-shell-component-factory:evolution-notes:f2f0f57f-27d9-4498-b54b-248f223ee772"
+<oaf_server iid="OAFIID:GNOME_Evolution_Notes_shellComponentFactory"
 	type="exe"
 	location="evolution-notes">
 	
@@ -39,9 +39,9 @@
 
 </oaf_server>
 
-<oaf_server iid="OAFIID:evolution-shell-component:evolution-notes:92d95b91-3655-4746-ac68-01b21e2c5e44"
+<oaf_server iid="OAFIID:GNOME_Evolution_Notes_shellComponent"
 	type="factory"
-	location="OAFIID:evolution-shell-component-factory:evolution-notes:f2f0f57f-27d9-4498-b54b-248f223ee772">
+	location="OAFIID:GNOME_Evolution_Notes_shellComponentFactory">
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
 	</oaf_attribute>
diff --git a/notes/Makefile.am b/notes/Makefile.am
index c57e4202c2..a5935c2d8f 100644
--- a/notes/Makefile.am
+++ b/notes/Makefile.am
@@ -23,8 +23,10 @@ notes_test_SOURCES = 			\
 	test-notes.c
 
 oafdir = $(datadir)/oaf
-oaf_DATA = evolution-notes.oafinfo
+oaf_DATA = GNOME_Evolution_Notes.oafinfo
 
 notes_test_LDADD =					\
 	$(BONOBO_HTML_GNOME_LIBS)			\
 	$(EXTRA_GNOME_LIBS)
+
+EXTRA_DIST= $(oaf_DATA)
\ No newline at end of file
diff --git a/notes/component-factory.c b/notes/component-factory.c
index 58ebdf8c8d..48b81f4071 100644
--- a/notes/component-factory.c
+++ b/notes/component-factory.c
@@ -10,7 +10,7 @@
 
 #include "e-util/e-gui-utils.h"
 
-#define COMPONENT_FACTORY_ID "OAFIID:evolution-shell-component-factory:evolution-notes:f2f0f57f-27d9-4498-b54b-248f223ee772"
+#define COMPONENT_FACTORY_ID "OAFIID:GNOME_Evolution_Notes_shellComponentFactory"
 
 static const EvolutionShellComponentFolderType folder_types[] = {
 	{ "notes", "evolution-notes.png" },
diff --git a/notes/evolution-notes.oafinfo b/notes/evolution-notes.oafinfo
deleted file mode 100644
index cfe67d7337..0000000000
--- a/notes/evolution-notes.oafinfo
+++ /dev/null
@@ -1,54 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:control-factory:evolution-notes:e2471f2d-0589-4861-a25d-c21818f531d5"
-            type="exe"
-            location="evolution-notes">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the Notes control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:control:evolution-notes:8e3fb723-aada-4112-99db-d51779e35a2a"
-	type="factory"
-	location="OAFIID:control-factory:evolution-notes:e2471f2d-0589-4861-a25d-c21818f531d5">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Control:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="A sample Bonobo control which displays an addressbook."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component-factory:evolution-notes:f2f0f57f-27d9-4498-b54b-248f223ee772"
-	type="exe"
-	location="evolution-notes">
-	
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Factory for the Evolution notes component."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component:evolution-notes:92d95b91-3655-4746-ac68-01b21e2c5e44"
-	type="factory"
-	location="OAFIID:evolution-shell-component-factory:evolution-notes:f2f0f57f-27d9-4498-b54b-248f223ee772">
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Evolution component for handling mail."/>
-
-</oaf_server>
-
-</oaf_info>