diff options
author | Michael Meeks <michael@helixcode.com> | 2000-12-05 01:56:54 +0800 |
---|---|---|
committer | Michael Meeks <mmeeks@src.gnome.org> | 2000-12-05 01:56:54 +0800 |
commit | 042e514a262c922d258ca8f0557500199f7088d9 (patch) | |
tree | f985a0aee46d4c6ff8bc42c2ef3958eba4024c6b /addressbook/gui/component/select-names | |
parent | 0d0f668cecd72010ef87c08829b26abd83e3a252 (diff) | |
download | gsoc2013-evolution-042e514a262c922d258ca8f0557500199f7088d9.tar gsoc2013-evolution-042e514a262c922d258ca8f0557500199f7088d9.tar.gz gsoc2013-evolution-042e514a262c922d258ca8f0557500199f7088d9.tar.bz2 gsoc2013-evolution-042e514a262c922d258ca8f0557500199f7088d9.tar.lz gsoc2013-evolution-042e514a262c922d258ca8f0557500199f7088d9.tar.xz gsoc2013-evolution-042e514a262c922d258ca8f0557500199f7088d9.tar.zst gsoc2013-evolution-042e514a262c922d258ca8f0557500199f7088d9.zip |
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
Diffstat (limited to 'addressbook/gui/component/select-names')
5 files changed, 8 insertions, 37 deletions
diff --git a/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in b/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in index afbeb2a3fd..e3719967b0 100644 --- a/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in +++ b/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in @@ -1,6 +1,6 @@ <oaf_info> -<oaf_server iid="OAFIID:factory:addressbook:select-names:b39eb1a1-f341-4d5a-9a91-e2616e206b2e" +<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_SelectNamesFactory" type="exe" location="evolution-addressbook"> @@ -13,9 +13,9 @@ </oaf_server> -<oaf_server iid="OAFIID:addressbook:select-names:39301deb-174b-40d1-8a6e-5edc300f7b61" +<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_SelectNames" type="factory" - location="OAFIID:factory:addressbook:select-names:b39eb1a1-f341-4d5a-9a91-e2616e206b2e"> + location="OAFIID:GNOME_Evolution_Addressbook_SelectNamesFactory"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/Evolution/Addressbook/SelectNames"/> diff --git a/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oafinfo b/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oafinfo index afbeb2a3fd..e3719967b0 100644 --- a/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oafinfo +++ b/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oafinfo @@ -1,6 +1,6 @@ <oaf_info> -<oaf_server iid="OAFIID:factory:addressbook:select-names:b39eb1a1-f341-4d5a-9a91-e2616e206b2e" +<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_SelectNamesFactory" type="exe" location="evolution-addressbook"> @@ -13,9 +13,9 @@ </oaf_server> -<oaf_server iid="OAFIID:addressbook:select-names:39301deb-174b-40d1-8a6e-5edc300f7b61" +<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_SelectNames" type="factory" - location="OAFIID:factory:addressbook:select-names:b39eb1a1-f341-4d5a-9a91-e2616e206b2e"> + location="OAFIID:GNOME_Evolution_Addressbook_SelectNamesFactory"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/Evolution/Addressbook/SelectNames"/> diff --git a/addressbook/gui/component/select-names/Makefile.am b/addressbook/gui/component/select-names/Makefile.am index b1685f9ef0..9b9c448873 100644 --- a/addressbook/gui/component/select-names/Makefile.am +++ b/addressbook/gui/component/select-names/Makefile.am @@ -16,7 +16,7 @@ $(IDL_GENERATED): $(IDLS) $(srcdir)/Evolution-Addressbook-SelectNames.idl oafdir = $(datadir)/oaf -oaf_DATA = evolution-addressbook-select-names.oafinfo +oaf_DATA = GNOME_Evolution_Addressbook_SelectNames.oafinfo # diff --git a/addressbook/gui/component/select-names/e-select-names-factory.c b/addressbook/gui/component/select-names/e-select-names-factory.c index 9a45692071..1b97172f9e 100644 --- a/addressbook/gui/component/select-names/e-select-names-factory.c +++ b/addressbook/gui/component/select-names/e-select-names-factory.c @@ -32,7 +32,7 @@ #include "e-select-names-factory.h" -#define COMPONENT_FACTORY_ID "OAFIID:factory:addressbook:select-names:b39eb1a1-f341-4d5a-9a91-e2616e206b2e" +#define COMPONENT_FACTORY_ID "OAFIID:GNOME_Evolution_Addressbook_SelectNamesFactory" static BonoboGenericFactory *factory = NULL; diff --git a/addressbook/gui/component/select-names/evolution-addressbook-select-names.oafinfo b/addressbook/gui/component/select-names/evolution-addressbook-select-names.oafinfo deleted file mode 100644 index afbeb2a3fd..0000000000 --- a/addressbook/gui/component/select-names/evolution-addressbook-select-names.oafinfo +++ /dev/null @@ -1,29 +0,0 @@ -<oaf_info> - -<oaf_server iid="OAFIID:factory:addressbook:select-names:b39eb1a1-f341-4d5a-9a91-e2616e206b2e" - type="exe" - location="evolution-addressbook"> - - <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 Addressbook's name selection interface"/> - -</oaf_server> - -<oaf_server iid="OAFIID:addressbook:select-names:39301deb-174b-40d1-8a6e-5edc300f7b61" - type="factory" - location="OAFIID:factory:addressbook:select-names:b39eb1a1-f341-4d5a-9a91-e2616e206b2e"> - - <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/Evolution/Addressbook/SelectNames"/> - </oaf_attribute> - - <oaf_attribute name="description" type="string" - value="Evolution's addressbook name selection interface."/> - -</oaf_server> - -</oaf_info>
\ No newline at end of file |