From 042e514a262c922d258ca8f0557500199f7088d9 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Mon, 4 Dec 2000 17:56:54 +0000 Subject: return NULL if we can't create a view. 2000-12-04 Michael Meeks * 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 --- executive-summary/GNOME_Evolution_Summary.oaf.in | 6 +-- executive-summary/GNOME_Evolution_Summary.oafinfo | 6 +-- executive-summary/Makefile.am | 2 +- executive-summary/component/component-factory.c | 2 +- executive-summary/component/e-summary-url.c | 2 +- .../evolution-executive-summary.oafinfo | 29 ------------ .../GNOME_Evolution_Summary_rdf.oaf.in | 6 +-- .../GNOME_Evolution_Summary_rdf.oafinfo | 6 +-- .../GNOME_Evolution_Summary_test.oaf.in | 6 +-- .../GNOME_Evolution_Summary_test.oafinfo | 6 +-- executive-summary/test-service/Makefile.am | 5 +- executive-summary/test-service/main.c | 2 +- executive-summary/test-service/rdf-summary.c | 2 +- executive-summary/test-service/rdf-summary.oafinfo | 27 ----------- .../test-service/test-service.oafinfo | 53 ---------------------- 15 files changed, 26 insertions(+), 134 deletions(-) delete mode 100644 executive-summary/evolution-executive-summary.oafinfo delete mode 100644 executive-summary/test-service/rdf-summary.oafinfo delete mode 100644 executive-summary/test-service/test-service.oafinfo (limited to 'executive-summary') diff --git a/executive-summary/GNOME_Evolution_Summary.oaf.in b/executive-summary/GNOME_Evolution_Summary.oaf.in index f9d198ff35..c5119bccd1 100644 --- a/executive-summary/GNOME_Evolution_Summary.oaf.in +++ b/executive-summary/GNOME_Evolution_Summary.oaf.in @@ -1,6 +1,6 @@ - @@ -11,9 +11,9 @@ value="Factory for the Evolution executive summary component."/> - + location="OAFIID:GNOME_Evolution_Summary_ShellComponentFactory"> diff --git a/executive-summary/GNOME_Evolution_Summary.oafinfo b/executive-summary/GNOME_Evolution_Summary.oafinfo index f9d198ff35..c5119bccd1 100644 --- a/executive-summary/GNOME_Evolution_Summary.oafinfo +++ b/executive-summary/GNOME_Evolution_Summary.oafinfo @@ -1,6 +1,6 @@ - @@ -11,9 +11,9 @@ value="Factory for the Evolution executive summary component."/> - + location="OAFIID:GNOME_Evolution_Summary_ShellComponentFactory"> diff --git a/executive-summary/Makefile.am b/executive-summary/Makefile.am index a938c0ed18..c1996cc419 100644 --- a/executive-summary/Makefile.am +++ b/executive-summary/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = idl evolution-services component test-service oafdir = $(datadir)/oaf -oaf_DATA = evolution-executive-summary.oafinfo +oaf_DATA = GNOME_Evolution_Summary.oafinfo EXTRA_DIST = $(oaf_DATA) diff --git a/executive-summary/component/component-factory.c b/executive-summary/component/component-factory.c index ad381fb51a..2597ff2ae6 100644 --- a/executive-summary/component/component-factory.c +++ b/executive-summary/component/component-factory.c @@ -38,7 +38,7 @@ #include "component-factory.h" #include "e-summary-factory.h" -#define COMPONENT_FACTORY_IID "OAFIID:evolution-shell-component-factory:evolution-executive-summary:e030e71d-0c53-4118-8d48-28757f0a8504" +#define COMPONENT_FACTORY_IID "OAFIID:GNOME_Evolution_Summary_ShellComponentFactory" static BonoboGenericFactory *factory = NULL; static gint running_objects = 0; diff --git a/executive-summary/component/e-summary-url.c b/executive-summary/component/e-summary-url.c index f99db8b42e..f7dd863a26 100644 --- a/executive-summary/component/e-summary-url.c +++ b/executive-summary/component/e-summary-url.c @@ -73,7 +73,7 @@ static char *descriptions[] = { N_("Open %s with the default GNOME application") }; -#define COMPOSER_IID "OAFIID:evolution-composer:evolution-mail:cd8618ea-53e1-4b9e-88cf-ec578bdb903b" +#define COMPOSER_IID "OAFIID:GNOME_Evolution_Mail_Composer" gboolean e_summary_url_mail_compose (ESummary *esummary, const char *url); diff --git a/executive-summary/evolution-executive-summary.oafinfo b/executive-summary/evolution-executive-summary.oafinfo deleted file mode 100644 index f9d198ff35..0000000000 --- a/executive-summary/evolution-executive-summary.oafinfo +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in b/executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in index 327fd8de72..702a099dcc 100644 --- a/executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in +++ b/executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in @@ -1,6 +1,6 @@ - @@ -12,9 +12,9 @@ value="Factory for the RDF summary."/> - + location="OAFIID:GNOME_Evolution_Summary_rdf_SummaryComponentFactory"> diff --git a/executive-summary/test-service/GNOME_Evolution_Summary_rdf.oafinfo b/executive-summary/test-service/GNOME_Evolution_Summary_rdf.oafinfo index 327fd8de72..702a099dcc 100644 --- a/executive-summary/test-service/GNOME_Evolution_Summary_rdf.oafinfo +++ b/executive-summary/test-service/GNOME_Evolution_Summary_rdf.oafinfo @@ -1,6 +1,6 @@ - @@ -12,9 +12,9 @@ value="Factory for the RDF summary."/> - + location="OAFIID:GNOME_Evolution_Summary_rdf_SummaryComponentFactory"> diff --git a/executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in b/executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in index 37fbbe9642..098da5e393 100644 --- a/executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in +++ b/executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in @@ -1,6 +1,6 @@ - @@ -12,9 +12,9 @@ value="Factory for the test component."/> - + location="OAFIID:GNOME_Evolution_Summary_test_ComponentFactory"> diff --git a/executive-summary/test-service/GNOME_Evolution_Summary_test.oafinfo b/executive-summary/test-service/GNOME_Evolution_Summary_test.oafinfo index 37fbbe9642..098da5e393 100644 --- a/executive-summary/test-service/GNOME_Evolution_Summary_test.oafinfo +++ b/executive-summary/test-service/GNOME_Evolution_Summary_test.oafinfo @@ -1,6 +1,6 @@ - @@ -12,9 +12,9 @@ value="Factory for the test component."/> - + location="OAFIID:GNOME_Evolution_Summary_test_ComponentFactory"> diff --git a/executive-summary/test-service/Makefile.am b/executive-summary/test-service/Makefile.am index 56333302d7..22c1307380 100644 --- a/executive-summary/test-service/Makefile.am +++ b/executive-summary/test-service/Makefile.am @@ -33,7 +33,8 @@ test_service_LDADD = \ # $(EXTRA_GNOME_LIBS) oafdir = $(datadir)/oaf -oaf_DATA = test-service.oafinfo \ - rdf-summary.oafinfo +oaf_DATA = \ + GNOME_Evolution_Summary_test.oafinfo \ + GNOME_Evolution_Summary_rdf.oafinfo EXTRA_DIST = $(oaf_DATA) diff --git a/executive-summary/test-service/main.c b/executive-summary/test-service/main.c index 6a646adecd..5b8fdd7b85 100644 --- a/executive-summary/test-service/main.c +++ b/executive-summary/test-service/main.c @@ -47,7 +47,7 @@ typedef struct _UserData UserData; static int running_views = 0; -#define TEST_SERVICE_ID "OAFIID:evolution-summary-component-factory:test-service:0ea887d5-622b-4b8c-b525-18aa1cbe18a6" +#define TEST_SERVICE_ID "OAFIID:GNOME_Evolution_Summary_test_ComponentFactory" static BonoboGenericFactory *factory = NULL; diff --git a/executive-summary/test-service/rdf-summary.c b/executive-summary/test-service/rdf-summary.c index b87c20a3c3..ee01c13dcc 100644 --- a/executive-summary/test-service/rdf-summary.c +++ b/executive-summary/test-service/rdf-summary.c @@ -30,7 +30,7 @@ static int wipe_trackers = FALSE; static int running_views = 0; static BonoboGenericFactory *factory = NULL; -#define RDF_SUMMARY_ID "OAFIID:evolution-summary-component-factory:rdf-summary:8d7a395c-1036-4e54-8aa6-bd30fb5a1379" +#define RDF_SUMMARY_ID "OAFIID:GNOME_Evolution_Summary_rdf_SummaryComponentFactory" /************ RDF Parser *******************/ diff --git a/executive-summary/test-service/rdf-summary.oafinfo b/executive-summary/test-service/rdf-summary.oafinfo deleted file mode 100644 index 327fd8de72..0000000000 --- a/executive-summary/test-service/rdf-summary.oafinfo +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/executive-summary/test-service/test-service.oafinfo b/executive-summary/test-service/test-service.oafinfo deleted file mode 100644 index 37fbbe9642..0000000000 --- a/executive-summary/test-service/test-service.oafinfo +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3