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 --- notes/GNOME_Evolution_Notes.oaf.in | 12 ++++----- notes/GNOME_Evolution_Notes.oafinfo | 12 ++++----- notes/Makefile.am | 4 ++- notes/component-factory.c | 2 +- notes/evolution-notes.oafinfo | 54 ------------------------------------- 5 files changed, 16 insertions(+), 68 deletions(-) delete mode 100644 notes/evolution-notes.oafinfo (limited to 'notes') 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 @@ - @@ -13,9 +13,9 @@ - + location="OAFIID:GNOME_Evolution_Notes_controlFactory"> @@ -26,7 +26,7 @@ - @@ -39,9 +39,9 @@ - + location="OAFIID:GNOME_Evolution_Notes_shellComponentFactory"> 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 @@ - @@ -13,9 +13,9 @@ - + location="OAFIID:GNOME_Evolution_Notes_controlFactory"> @@ -26,7 +26,7 @@ - @@ -39,9 +39,9 @@ - + location="OAFIID:GNOME_Evolution_Notes_shellComponentFactory"> 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit