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, 28 insertions, 133 deletions

diff --git a/mail/GNOME_Evolution_Mail.oaf.in b/mail/GNOME_Evolution_Mail.oaf.in
index eba585cca8..000c44b7c0 100644
--- a/mail/GNOME_Evolution_Mail.oaf.in
+++ b/mail/GNOME_Evolution_Mail.oaf.in
@@ -1,6 +1,6 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:control-factory:evolution-mail:25902062-543b-4f44-8702-d90145fcdbf2"
+<oaf_server iid="OAFIID:GNOME_Evolution_Mail_ControlFactory"
             type="exe"
             location="evolution-mail">
 
@@ -12,9 +12,9 @@
                        value="Evolution mail folder factory component."/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:control:evolution-mail:833d5a71-a201-4a0e-b7e6-5475c5c4cb45"
+<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Control"
             type="factory"
-            location="OAFIID:control-factory:evolution-mail:25902062-543b-4f44-8702-d90145fcdbf2">
+            location="OAFIID:GNOME_Evolution_Mail_ControlFactory">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:BonoboControl/evolution-mail:1.0"/>
@@ -25,7 +25,7 @@
                        value="Evolution mail folder display component."/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:evolution-shell-component-factory:evolution-mail:0ea887d5-622b-4b8c-b525-18aa1cbe18a6"
+<oaf_server iid="OAFIID:GNOME_Evolution_Mail_ShellComponentFactory"
             type="exe"
             location="evolution-mail">
 
@@ -38,9 +38,9 @@
 
 </oaf_server>
 
-<oaf_server iid="OAFIID:evolution-shell-component:evolution-mail:d3cb3ed6-a654-4337-8aa0-f443751d6d1b"
+<oaf_server iid="OAFIID:GNOME_Evolution_Mail_ShellComponent"
             type="factory"
-            location="OAFIID:evolution-shell-component-factory:evolution-mail:0ea887d5-622b-4b8c-b525-18aa1cbe18a6">
+            location="OAFIID:GNOME_Evolution_Mail_ShellComponentFactory">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
@@ -53,7 +53,7 @@
 		       value="evolution-inbox.png"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:evolution-executive-summary-component-factory:evolution-mail:be210cba-0eee-4def-84fa-643d50321217"
+<oaf_server iid="OAFIID:GNOME_Evolution_Mail_ExecutiveSummaryComponentFactory"
 	    type="exe"
 	    location="evolution-mail">
 
@@ -65,9 +65,9 @@
 		       value="Factory for the Mail Summary component."/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:evolution-executive-summary-component:evolution-mail:157f86b4-ff6a-4618-86b8-4789024c4043"
+<oaf_server iid="OAFIID:GNOME_Evolution_Mail_ExecutiveSummaryComponent"
 	    type="factory"
-	    location="OAFIID:evolution-executive-summary-component-factory:evolution-mail:be210cba-0eee-4def-84fa-643d50321217">
+	    location="OAFIID:GNOME_Evolution_Mail_ExecutiveSummaryComponentFactory">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/Evolution:Summary:ComponentFactory:1.0"/>
@@ -77,7 +77,7 @@
 		       value="Evolution mail executive summary component."/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:evolution-composer-factory:evolution-mail:fcfda393-60ee-485f-b782-e9323434bff3"
+<oaf_server iid="OAFIID:GNOME_Evolution_Mail_ComposerFactory"
 	    type="exe"
 	    location="evolution-mail">
 
@@ -89,9 +89,9 @@
 		       value="Factory for the Evolution composer."/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:evolution-composer:evolution-mail:cd8618ea-53e1-4b9e-88cf-ec578bdb903b"
+<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Composer"
 	    type="factory"
-	    location="OAFIID:evolution-composer-factory:evolution-mail:fcfda393-60ee-485f-b782-e9323434bff3">
+	    location="OAFIID:GNOME_Evolution_Mail_ComposerFactory">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/Evolution:Composer:1.0"/>
diff --git a/mail/GNOME_Evolution_Mail.oafinfo b/mail/GNOME_Evolution_Mail.oafinfo
index eba585cca8..000c44b7c0 100644
--- a/mail/GNOME_Evolution_Mail.oafinfo
+++ b/mail/GNOME_Evolution_Mail.oafinfo
@@ -1,6 +1,6 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:control-factory:evolution-mail:25902062-543b-4f44-8702-d90145fcdbf2"
+<oaf_server iid="OAFIID:GNOME_Evolution_Mail_ControlFactory"
             type="exe"
             location="evolution-mail">
 
@@ -12,9 +12,9 @@
                        value="Evolution mail folder factory component."/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:control:evolution-mail:833d5a71-a201-4a0e-b7e6-5475c5c4cb45"
+<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Control"
             type="factory"
-            location="OAFIID:control-factory:evolution-mail:25902062-543b-4f44-8702-d90145fcdbf2">
+            location="OAFIID:GNOME_Evolution_Mail_ControlFactory">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:BonoboControl/evolution-mail:1.0"/>
@@ -25,7 +25,7 @@
                        value="Evolution mail folder display component."/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:evolution-shell-component-factory:evolution-mail:0ea887d5-622b-4b8c-b525-18aa1cbe18a6"
+<oaf_server iid="OAFIID:GNOME_Evolution_Mail_ShellComponentFactory"
             type="exe"
             location="evolution-mail">
 
@@ -38,9 +38,9 @@
 
 </oaf_server>
 
-<oaf_server iid="OAFIID:evolution-shell-component:evolution-mail:d3cb3ed6-a654-4337-8aa0-f443751d6d1b"
+<oaf_server iid="OAFIID:GNOME_Evolution_Mail_ShellComponent"
             type="factory"
-            location="OAFIID:evolution-shell-component-factory:evolution-mail:0ea887d5-622b-4b8c-b525-18aa1cbe18a6">
+            location="OAFIID:GNOME_Evolution_Mail_ShellComponentFactory">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
@@ -53,7 +53,7 @@
 		       value="evolution-inbox.png"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:evolution-executive-summary-component-factory:evolution-mail:be210cba-0eee-4def-84fa-643d50321217"
+<oaf_server iid="OAFIID:GNOME_Evolution_Mail_ExecutiveSummaryComponentFactory"
 	    type="exe"
 	    location="evolution-mail">
 
@@ -65,9 +65,9 @@
 		       value="Factory for the Mail Summary component."/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:evolution-executive-summary-component:evolution-mail:157f86b4-ff6a-4618-86b8-4789024c4043"
+<oaf_server iid="OAFIID:GNOME_Evolution_Mail_ExecutiveSummaryComponent"
 	    type="factory"
-	    location="OAFIID:evolution-executive-summary-component-factory:evolution-mail:be210cba-0eee-4def-84fa-643d50321217">
+	    location="OAFIID:GNOME_Evolution_Mail_ExecutiveSummaryComponentFactory">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/Evolution:Summary:ComponentFactory:1.0"/>
@@ -77,7 +77,7 @@
 		       value="Evolution mail executive summary component."/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:evolution-composer-factory:evolution-mail:fcfda393-60ee-485f-b782-e9323434bff3"
+<oaf_server iid="OAFIID:GNOME_Evolution_Mail_ComposerFactory"
 	    type="exe"
 	    location="evolution-mail">
 
@@ -89,9 +89,9 @@
 		       value="Factory for the Evolution composer."/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:evolution-composer:evolution-mail:cd8618ea-53e1-4b9e-88cf-ec578bdb903b"
+<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Composer"
 	    type="factory"
-	    location="OAFIID:evolution-composer-factory:evolution-mail:fcfda393-60ee-485f-b782-e9323434bff3">
+	    location="OAFIID:GNOME_Evolution_Mail_ComposerFactory">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/Evolution:Composer:1.0"/>
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 8c2dc6146d..ceb3e957ca 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -131,7 +131,7 @@ test_mail_LDADD = \
 #test_thread_CFLAGS = -g $(THREADS_CFLAGS)
 
 oafdir = $(datadir)/oaf
-oaf_DATA = evolution-mail.oafinfo
+oaf_DATA = GNOME_Evolution_Mail.oafinfo
 
 gladedir   = $(datadir)/evolution/glade
 glade_DATA = mail-config.glade mail-config-druid.glade local-config.glade
diff --git a/mail/component-factory.c b/mail/component-factory.c
index 8ccfda4954..a5915e3cf2 100644
--- a/mail/component-factory.c
+++ b/mail/component-factory.c
@@ -53,8 +53,8 @@ char *evolution_dir;
 
 static void create_vfolder_storage (EvolutionShellComponent *shell_component);
 
-#define COMPONENT_FACTORY_ID "OAFIID:evolution-shell-component-factory:evolution-mail:0ea887d5-622b-4b8c-b525-18aa1cbe18a6"
-#define SUMMARY_FACTORY_ID "OAFIID:evolution-executive-summary-component-factory:evolution-mail:be210cba-0eee-4def-84fa-643d50321217"
+#define COMPONENT_FACTORY_ID "OAFIID:GNOME_Evolution_Mail_ShellComponentFactory"
+#define SUMMARY_FACTORY_ID   "OAFIID:GNOME_Evolution_Mail_ExecutiveSummaryComponentFactory"
 
 static BonoboGenericFactory *factory = NULL;
 static BonoboGenericFactory *summary_factory = NULL;
diff --git a/mail/evolution-mail.oafinfo b/mail/evolution-mail.oafinfo
deleted file mode 100644
index eba585cca8..0000000000
--- a/mail/evolution-mail.oafinfo
+++ /dev/null
@@ -1,105 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:control-factory:evolution-mail:25902062-543b-4f44-8702-d90145fcdbf2"
-            type="exe"
-            location="evolution-mail">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Evolution mail folder factory component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:control:evolution-mail:833d5a71-a201-4a0e-b7e6-5475c5c4cb45"
-            type="factory"
-            location="OAFIID:control-factory:evolution-mail:25902062-543b-4f44-8702-d90145fcdbf2">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:BonoboControl/evolution-mail:1.0"/>
-		<item value="IDL:GNOME/Control:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Evolution mail folder display component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component-factory:evolution-mail:0ea887d5-622b-4b8c-b525-18aa1cbe18a6"
-            type="exe"
-            location="evolution-mail">
-
-	<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 mail component."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component:evolution-mail:d3cb3ed6-a654-4337-8aa0-f443751d6d1b"
-            type="factory"
-            location="OAFIID:evolution-shell-component-factory:evolution-mail:0ea887d5-622b-4b8c-b525-18aa1cbe18a6">
-
-	<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_attribute name="evolution:shell-component-icon" type="string"
-		       value="evolution-inbox.png"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-executive-summary-component-factory:evolution-mail:be210cba-0eee-4def-84fa-643d50321217"
-	    type="exe"
-	    location="evolution-mail">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       value="Factory for the Mail Summary component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-executive-summary-component:evolution-mail:157f86b4-ff6a-4618-86b8-4789024c4043"
-	    type="factory"
-	    location="OAFIID:evolution-executive-summary-component-factory:evolution-mail:be210cba-0eee-4def-84fa-643d50321217">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution:Summary:ComponentFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       value="Evolution mail executive summary component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-composer-factory:evolution-mail:fcfda393-60ee-485f-b782-e9323434bff3"
-	    type="exe"
-	    location="evolution-mail">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME:GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       value="Factory for the Evolution composer."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-composer:evolution-mail:cd8618ea-53e1-4b9e-88cf-ec578bdb903b"
-	    type="factory"
-	    location="OAFIID:evolution-composer-factory:evolution-mail:fcfda393-60ee-485f-b782-e9323434bff3">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution:Composer:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       value="Evolution mail composer."/>
-</oaf_server>
-
-
-</oaf_info>
diff --git a/mail/test-mail.c b/mail/test-mail.c
index 48bfbd507a..6e240199cd 100644
--- a/mail/test-mail.c
+++ b/mail/test-mail.c
@@ -32,7 +32,7 @@ create_container (void)
 	bonobo_ui_container_set_win (container, BONOBO_WINDOW (window));
 
 	control = bonobo_widget_new_control (
-		"OAFIID:control:evolution-mail:833d5a71-a201-4a0e-b7e6-5475c5c4cb45",
+		"OAFIID:GNOME_Evolution_Mail_Control",
 		bonobo_object_corba_objref (BONOBO_OBJECT (container)));
 	
 	if (control == NULL){