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 | |
| 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
72 files changed, 581 insertions, 1190 deletions
diff --git a/addressbook/backend/ebook/e-book.c b/addressbook/backend/ebook/e-book.c index 2e0c6eafef..f6e6b324d9 100644 --- a/addressbook/backend/ebook/e-book.c +++ b/addressbook/backend/ebook/e-book.c @@ -20,7 +20,7 @@ GtkObjectClass *e_book_parent_class; -#define CARDSERVER_OAF_ID "OAFIID:evolution:addressbook-server:0fbc844d-c721-4615-98d0-d67eacf42d80" +#define CARDSERVER_OAF_ID "OAFIID:GNOME_Evolution_Wombat_ServerFactory" typedef enum { URINotLoaded, diff --git a/addressbook/backend/ebook/e-card.c b/addressbook/backend/ebook/e-card.c index e2e4ebcd01..643644ee31 100644 --- a/addressbook/backend/ebook/e-card.c +++ b/addressbook/backend/ebook/e-card.c @@ -3386,7 +3386,7 @@ set_address_flags (VObject *vobj, ECardAddressFlags flags) #include <Evolution-Composer.h> -#define COMPOSER_OAFID "OAFIID:evolution-composer:evolution-mail:cd8618ea-53e1-4b9e-88cf-ec578bdb903b" +#define COMPOSER_OAFID "OAFIID:GNOME_Evolution_Mail_Composer" void e_card_send (ECard *card, ECardDisposition disposition) diff --git a/addressbook/backend/pas/pas-book-factory.c b/addressbook/backend/pas/pas-book-factory.c index c81513de0f..6584bc8589 100644 --- a/addressbook/backend/pas/pas-book-factory.c +++ b/addressbook/backend/pas/pas-book-factory.c @@ -15,7 +15,7 @@ #include "addressbook.h" #include "pas-book-factory.h" -#define PAS_BOOK_FACTORY_OAF_ID "OAFIID:evolution:addressbook-server:0fbc844d-c721-4615-98d0-d67eacf42d80" +#define PAS_BOOK_FACTORY_OAF_ID "OAFIID:GNOME_Evolution_Wombat_ServerFactory" static BonoboObjectClass *pas_book_factory_parent_class; POA_GNOME_Evolution_Addressbook_BookFactory__vepv pas_book_factory_vepv; diff --git a/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in b/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in index 155fa65e92..15d48600f4 100644 --- a/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in +++ b/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in @@ -1,6 +1,6 @@ <oaf_info> -<oaf_server iid="OAFIID:control-factory:e_minicard:16bb7c25-c7d2-46dc-a5f0-a0975d0e0595" +<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_MiniCard_ControlFactory" type="exe" location="evolution-addressbook"> @@ -13,9 +13,9 @@ </oaf_server> -<oaf_server iid="OAFIID:control:e_minicard:f9542709-fb31-4c6a-bc00-d462ba41e4b9" +<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_MiniCard_Control" type="factory" - location="OAFIID:control-factory:e_minicard:16bb7c25-c7d2-46dc-a5f0-a0975d0e0595"> + location="OAFIID:GNOME_Evolution_Addressbook_MiniCard_ControlFactory"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:Bonobo/Control:1.0"/> @@ -34,7 +34,7 @@ </oaf_server> -<oaf_server iid="OAFIID:control-factory:addressbook:3e10597b-0591-4d45-b082-d781b7aa6e17" +<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_ControlFactory" type="exe" location="evolution-addressbook"> @@ -47,9 +47,9 @@ </oaf_server> -<oaf_server iid="OAFIID:control:addressbook:851f883b-2fe7-4c94-a1e3-a1f2a7a03c49" +<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_Control" type="factory" - location="OAFIID:control-factory:addressbook:3e10597b-0591-4d45-b082-d781b7aa6e17"> + location="OAFIID:GNOME_Evolution_Addressbook_ControlFactory"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:BonoboControl/addressbook-control:1.0"/> @@ -61,7 +61,7 @@ </oaf_server> -<oaf_server iid="OAFIID:evolution-shell-component-factory:addressbook:dbf3bba0-4b0a-4f07-899b-1ec56fdf38a0" +<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_ShellComponentFactory" type="exe" location="evolution-addressbook"> @@ -74,9 +74,9 @@ </oaf_server> -<oaf_server iid="OAFIID:evolution-shell-component:addressbook:b7a26547-7014-4bb5-98ab-2bcac2bb55ca" +<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_ShellComponent" type="factory" - location="OAFIID:evolution-shell-component-factory:addressbook:dbf3bba0-4b0a-4f07-899b-1ec56fdf38a0"> + location="OAFIID:GNOME_Evolution_Addressbook_ShellComponentFactory"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/Evolution/ShellComponent:1.0"/> diff --git a/addressbook/gui/component/GNOME_Evolution_Addressbook.oafinfo b/addressbook/gui/component/GNOME_Evolution_Addressbook.oafinfo index 155fa65e92..15d48600f4 100644 --- a/addressbook/gui/component/GNOME_Evolution_Addressbook.oafinfo +++ b/addressbook/gui/component/GNOME_Evolution_Addressbook.oafinfo @@ -1,6 +1,6 @@ <oaf_info> -<oaf_server iid="OAFIID:control-factory:e_minicard:16bb7c25-c7d2-46dc-a5f0-a0975d0e0595" +<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_MiniCard_ControlFactory" type="exe" location="evolution-addressbook"> @@ -13,9 +13,9 @@ </oaf_server> -<oaf_server iid="OAFIID:control:e_minicard:f9542709-fb31-4c6a-bc00-d462ba41e4b9" +<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_MiniCard_Control" type="factory" - location="OAFIID:control-factory:e_minicard:16bb7c25-c7d2-46dc-a5f0-a0975d0e0595"> + location="OAFIID:GNOME_Evolution_Addressbook_MiniCard_ControlFactory"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:Bonobo/Control:1.0"/> @@ -34,7 +34,7 @@ </oaf_server> -<oaf_server iid="OAFIID:control-factory:addressbook:3e10597b-0591-4d45-b082-d781b7aa6e17" +<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_ControlFactory" type="exe" location="evolution-addressbook"> @@ -47,9 +47,9 @@ </oaf_server> -<oaf_server iid="OAFIID:control:addressbook:851f883b-2fe7-4c94-a1e3-a1f2a7a03c49" +<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_Control" type="factory" - location="OAFIID:control-factory:addressbook:3e10597b-0591-4d45-b082-d781b7aa6e17"> + location="OAFIID:GNOME_Evolution_Addressbook_ControlFactory"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:BonoboControl/addressbook-control:1.0"/> @@ -61,7 +61,7 @@ </oaf_server> -<oaf_server iid="OAFIID:evolution-shell-component-factory:addressbook:dbf3bba0-4b0a-4f07-899b-1ec56fdf38a0" +<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_ShellComponentFactory" type="exe" location="evolution-addressbook"> @@ -74,9 +74,9 @@ </oaf_server> -<oaf_server iid="OAFIID:evolution-shell-component:addressbook:b7a26547-7014-4bb5-98ab-2bcac2bb55ca" +<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_ShellComponent" type="factory" - location="OAFIID:evolution-shell-component-factory:addressbook:dbf3bba0-4b0a-4f07-899b-1ec56fdf38a0"> + location="OAFIID:GNOME_Evolution_Addressbook_ShellComponentFactory"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/Evolution/ShellComponent:1.0"/> diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am index 2cc3964458..9ec57dfe6d 100644 --- a/addressbook/gui/component/Makefile.am +++ b/addressbook/gui/component/Makefile.am @@ -58,7 +58,7 @@ evolution_addressbook_LDADD = \ evolution_addressbook_LDFLAGS = `gnome-config --libs gdk_pixbuf` -export-dynamic oafdir = $(datadir)/oaf -oaf_DATA = addressbook.oafinfo +oaf_DATA = GNOME_Evolution_Addressbook.oafinfo gladedir = $(datadir)/evolution/glade glade_DATA = ldap-server-dialog.glade diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c index 59737c5b6e..8e9b506634 100644 --- a/addressbook/gui/component/addressbook-component.c +++ b/addressbook/gui/component/addressbook-component.c @@ -36,7 +36,7 @@ -#define COMPONENT_FACTORY_ID "OAFIID:evolution-shell-component-factory:addressbook:dbf3bba0-4b0a-4f07-899b-1ec56fdf38a0" +#define GNOME_EVOLUTION_ADDRESSBOOK_COMPONENT_FACTORY_ID "OAFIID:GNOME_Evolution_Addressbook_ShellComponentFactory" /* Nasty hack for filters to be able to find folders */ /* Not even used with addressbook??? */ @@ -125,7 +125,7 @@ addressbook_component_factory_init (void) if (factory != NULL) return; - factory = bonobo_generic_factory_new (COMPONENT_FACTORY_ID, factory_fn, NULL); + factory = bonobo_generic_factory_new (GNOME_EVOLUTION_ADDRESSBOOK_COMPONENT_FACTORY_ID, factory_fn, NULL); if (factory == NULL) g_error ("Cannot initialize the Evolution addressbook factory."); diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c index d1ece01596..c57a721249 100644 --- a/addressbook/gui/component/addressbook.c +++ b/addressbook/gui/component/addressbook.c @@ -34,8 +34,6 @@ #include <addressbook/printing/e-contact-print.h> -#define CONTROL_FACTORY_ID "OAFIID:control-factory:addressbook:3e10597b-0591-4d45-b082-d781b7aa6e17" - #define PROPERTY_FOLDER_URI "folder_uri" #define PROPERTY_FOLDER_URI_IDX 1 @@ -651,9 +649,9 @@ addressbook_factory_init (void) if (addressbook_control_factory != NULL) return; - addressbook_control_factory = bonobo_generic_factory_new (CONTROL_FACTORY_ID, - addressbook_factory, - NULL); + addressbook_control_factory = bonobo_generic_factory_new ( + "OAFIID:GNOME_Evolution_Addressbook_ControlFactory", + addressbook_factory, NULL); if (addressbook_control_factory == NULL) { g_error ("I could not register a Addressbook factory."); diff --git a/addressbook/gui/component/addressbook.oafinfo b/addressbook/gui/component/addressbook.oafinfo deleted file mode 100644 index 155fa65e92..0000000000 --- a/addressbook/gui/component/addressbook.oafinfo +++ /dev/null @@ -1,92 +0,0 @@ -<oaf_info> - -<oaf_server iid="OAFIID:control-factory:e_minicard:16bb7c25-c7d2-46dc-a5f0-a0975d0e0595" - 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 Minicard control"/> - -</oaf_server> - -<oaf_server iid="OAFIID:control:e_minicard:f9542709-fb31-4c6a-bc00-d462ba41e4b9" - type="factory" - location="OAFIID:control-factory:e_minicard:16bb7c25-c7d2-46dc-a5f0-a0975d0e0595"> - - <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:Bonobo/Control:1.0"/> - <item value="IDL:Bonobo/PersistStream:1.0"/> - </oaf_attribute> - - <oaf_attribute name="bonobo:supported_mime_types" type="stringv"> - <item value="text/vcard"/> - <item value="text/x-vcard"/> - </oaf_attribute> - - <oaf_attribute name="name" type="string" - value="Evolution Addressbook minicard viewer"/> - <oaf_attribute name="description" type="string" - value="Factory for the Evolution addressbook minicard control."/> - -</oaf_server> - -<oaf_server iid="OAFIID:control-factory:addressbook:3e10597b-0591-4d45-b082-d781b7aa6e17" - 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 sample Addressbook control"/> - -</oaf_server> - -<oaf_server iid="OAFIID:control:addressbook:851f883b-2fe7-4c94-a1e3-a1f2a7a03c49" - type="factory" - location="OAFIID:control-factory:addressbook:3e10597b-0591-4d45-b082-d781b7aa6e17"> - - <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:BonoboControl/addressbook-control:1.0"/> - <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:addressbook:dbf3bba0-4b0a-4f07-899b-1ec56fdf38a0" - 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 Evolution addressbook component."/> - -</oaf_server> - -<oaf_server iid="OAFIID:evolution-shell-component:addressbook:b7a26547-7014-4bb5-98ab-2bcac2bb55ca" - type="factory" - location="OAFIID:evolution-shell-component-factory:addressbook:dbf3bba0-4b0a-4f07-899b-1ec56fdf38a0"> - - <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 contacts."/> - - <oaf_attribute name="evolution:shell-component-icon" type="string" - value="evolution-contacts.png"/> -</oaf_server> - -</oaf_info> 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 diff --git a/addressbook/gui/widgets/e-minicard-control.c b/addressbook/gui/widgets/e-minicard-control.c index d69f422f63..d1f7132f53 100644 --- a/addressbook/gui/widgets/e-minicard-control.c +++ b/addressbook/gui/widgets/e-minicard-control.c @@ -323,7 +323,7 @@ e_minicard_control_factory_init (void) factory = bonobo_generic_factory_new ( - "OAFIID:control-factory:e_minicard:16bb7c25-c7d2-46dc-a5f0-a0975d0e0595", + "OAFIID:GNOME_Evolution_Addressbook_MiniCard_ControlFactory", e_minicard_control_factory, NULL); if (factory == NULL) diff --git a/calendar/cal-client/cal-client.c b/calendar/cal-client/cal-client.c index 39d59defe2..1eca55a2d3 100644 --- a/calendar/cal-client/cal-client.c +++ b/calendar/cal-client/cal-client.c @@ -389,7 +389,7 @@ cal_client_construct (CalClient *client) priv = client->priv; factory = (GNOME_Evolution_Calendar_CalFactory) oaf_activate_from_id ( - "OAFIID:evolution:calendar-factory:1c915858-ece3-4a6f-9d81-ea0f108a9554", + "OAFIID:GNOME_Evolution_Wombat_CalendarFactory", OAF_FLAG_NO_LOCAL, NULL, &ev); result = CORBA_Object_is_nil (factory, &ev); diff --git a/calendar/gui/GNOME_Evolution_Calendar.oaf.in b/calendar/gui/GNOME_Evolution_Calendar.oaf.in index b7eb514f7e..c587055282 100644 --- a/calendar/gui/GNOME_Evolution_Calendar.oaf.in +++ b/calendar/gui/GNOME_Evolution_Calendar.oaf.in @@ -1,6 +1,6 @@ <oaf_info> -<oaf_server iid="OAFIID:control-factory:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a" +<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_iTip_ControlFactory" type="exe" location="evolution-calendar"> @@ -13,9 +13,9 @@ </oaf_server> -<oaf_server iid="OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad" +<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_iTip_Control" type="factory" - location="OAFIID:control-factory:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a"> + location="OAFIID:GNOME_Evolution_Calendar_iTip_ControlFactory"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:Bonobo/Control:1.0"/> @@ -34,7 +34,7 @@ </oaf_server> -<oaf_server iid="OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921" +<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ShellComponentFactory" type="exe" location="evolution-calendar"> @@ -47,9 +47,9 @@ </oaf_server> -<oaf_server iid="OAFIID:evolution-shell-component:evolution-calendar:2eb9eb63-d305-4918-9c35-faae5db19e51" +<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ShellComponent" type="factory" - location="OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921"> + location="OAFIID:GNOME_Evolution_Calendar_ShellComponentFactory"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/Evolution/ShellComponent:1.0"/> @@ -62,7 +62,7 @@ value="evolution-calendar.png"/> </oaf_server> -<oaf_server iid="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af" +<oaf_server iid="OAFIID:GNOME_Evolution_ExecutiveSummaryComponentFactory" type="exe" location="evolution-calendar"> @@ -74,9 +74,9 @@ value="Factory for the Calendar Summary component."/> </oaf_server> -<oaf_server iid="OAFIID:evolution-executive-summary-component:evolution-calendar:c80742c0-c7ae-4f53-9df2-33221864729c" +<oaf_server iid="OAFIID:GNOME_Evolution_ExecutiveSummaryComponent" type="factory" - location="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af"> + location="OAFIID:GNOME_Evolution_ExecutiveSummaryComponentFactory"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/Evolution:SummaryComponent:1.0"/> diff --git a/calendar/gui/GNOME_Evolution_Calendar.oafinfo b/calendar/gui/GNOME_Evolution_Calendar.oafinfo index b7eb514f7e..c587055282 100644 --- a/calendar/gui/GNOME_Evolution_Calendar.oafinfo +++ b/calendar/gui/GNOME_Evolution_Calendar.oafinfo @@ -1,6 +1,6 @@ <oaf_info> -<oaf_server iid="OAFIID:control-factory:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a" +<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_iTip_ControlFactory" type="exe" location="evolution-calendar"> @@ -13,9 +13,9 @@ </oaf_server> -<oaf_server iid="OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad" +<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_iTip_Control" type="factory" - location="OAFIID:control-factory:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a"> + location="OAFIID:GNOME_Evolution_Calendar_iTip_ControlFactory"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:Bonobo/Control:1.0"/> @@ -34,7 +34,7 @@ </oaf_server> -<oaf_server iid="OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921" +<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ShellComponentFactory" type="exe" location="evolution-calendar"> @@ -47,9 +47,9 @@ </oaf_server> -<oaf_server iid="OAFIID:evolution-shell-component:evolution-calendar:2eb9eb63-d305-4918-9c35-faae5db19e51" +<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ShellComponent" type="factory" - location="OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921"> + location="OAFIID:GNOME_Evolution_Calendar_ShellComponentFactory"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/Evolution/ShellComponent:1.0"/> @@ -62,7 +62,7 @@ value="evolution-calendar.png"/> </oaf_server> -<oaf_server iid="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af" +<oaf_server iid="OAFIID:GNOME_Evolution_ExecutiveSummaryComponentFactory" type="exe" location="evolution-calendar"> @@ -74,9 +74,9 @@ value="Factory for the Calendar Summary component."/> </oaf_server> -<oaf_server iid="OAFIID:evolution-executive-summary-component:evolution-calendar:c80742c0-c7ae-4f53-9df2-33221864729c" +<oaf_server iid="OAFIID:GNOME_Evolution_ExecutiveSummaryComponent" type="factory" - location="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af"> + location="OAFIID:GNOME_Evolution_ExecutiveSummaryComponentFactory"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/Evolution:SummaryComponent:1.0"/> diff --git a/calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in b/calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in index f67c8eb416..48cbfa7cbb 100644 --- a/calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in +++ b/calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in @@ -1,6 +1,6 @@ <oaf_info> -<oaf_server iid="OAFIID:control-factory:calendar:f4f90989-0f50-4af2-ad94-8bbdf331f0bc" +<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ControlFactory" type="exe" location="evolution-calendar"> @@ -12,9 +12,9 @@ value="Factory for the sample Calendar control"/> </oaf_server> -<oaf_server iid="OAFIID:control:calendar:dd34ddae-25c6-486b-a8a8-3e8f0286b54c" +<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_Control" type="factory" - location="OAFIID:control-factory:calendar:f4f90989-0f50-4af2-ad94-8bbdf331f0bc"> + location="OAFIID:GNOME_Evolution_Calendar_ControlFactory"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:BonoboControl/calendar-control:1.0"/> diff --git a/calendar/gui/GNOME_Evolution_Calendar_Control.oafinfo b/calendar/gui/GNOME_Evolution_Calendar_Control.oafinfo index f67c8eb416..48cbfa7cbb 100644 --- a/calendar/gui/GNOME_Evolution_Calendar_Control.oafinfo +++ b/calendar/gui/GNOME_Evolution_Calendar_Control.oafinfo @@ -1,6 +1,6 @@ <oaf_info> -<oaf_server iid="OAFIID:control-factory:calendar:f4f90989-0f50-4af2-ad94-8bbdf331f0bc" +<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ControlFactory" type="exe" location="evolution-calendar"> @@ -12,9 +12,9 @@ value="Factory for the sample Calendar control"/> </oaf_server> -<oaf_server iid="OAFIID:control:calendar:dd34ddae-25c6-486b-a8a8-3e8f0286b54c" +<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_Control" type="factory" - location="OAFIID:control-factory:calendar:f4f90989-0f50-4af2-ad94-8bbdf331f0bc"> + location="OAFIID:GNOME_Evolution_Calendar_ControlFactory"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:BonoboControl/calendar-control:1.0"/> diff --git a/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in b/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in index b7eb514f7e..c4b91b9dd8 100644 --- a/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in +++ b/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in @@ -1,89 +1,27 @@ <oaf_info> -<oaf_server iid="OAFIID:control-factory:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a" - type="exe" - location="evolution-calendar"> - - <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 calendar iTip view control"/> - -</oaf_server> - -<oaf_server iid="OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad" +<oaf_server iid="OAFIID:IDL:GNOME:Calendar:Repository:1.0:56989bb6-65a1-430c-86a8-81bbe64bf7ab" type="factory" - location="OAFIID:control-factory:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a"> + location="OAFIID:IDL:GNOME:Calendar:RepositoryLocator:1.0:83b25bb0-b68b-4c6b-86e7-c303e9897c21"> <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:Bonobo/Control:1.0"/> - <item value="IDL:Bonobo/PersistStream:1.0"/> + <item value="IDL:Gnome/Calendar/Repository:1.0"/> </oaf_attribute> - <oaf_attribute name="bonobo:supported_mime_types" type="stringv"> - <item value="text/calendar"/> - <item value="text/x-calendar"/> - </oaf_attribute> - - <oaf_attribute name="name" type="string" - value="Evolution calendar iTip/iMip viewer"/> <oaf_attribute name="description" type="string" - value="Factory for the calendar iTip view control"/> - + value="Calendar Repository"/> </oaf_server> -<oaf_server iid="OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921" +<oaf_server iid="OAFIID:IDL:GNOME:Calendar:RepositoryLocator:1.0:83b25bb0-b68b-4c6b-86e7-c303e9897c21" type="exe" - location="evolution-calendar"> - - <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 calendar component."/> - -</oaf_server> - -<oaf_server iid="OAFIID:evolution-shell-component:evolution-calendar:2eb9eb63-d305-4918-9c35-faae5db19e51" - type="factory" - location="OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921"> - - <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 the calendar."/> - - <oaf_attribute name="evolution:shell-component-icon" type="string" - value="evolution-calendar.png"/> -</oaf_server> - -<oaf_server iid="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af" - type="exe" - location="evolution-calendar"> - - <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 Calendar Summary component."/> -</oaf_server> - -<oaf_server iid="OAFIID:evolution-executive-summary-component:evolution-calendar:c80742c0-c7ae-4f53-9df2-33221864729c" - type="factory" - location="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af"> + location="gnomecal"> <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/Evolution:SummaryComponent:1.0"/> + <item value="IDL:GNOME/GenericFactory:1.0"/> </oaf_attribute> <oaf_attribute name="description" type="string" - value="Evolution calendar executive summary component."/> + value="Calendar Server"/> </oaf_server> </oaf_info> diff --git a/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oafinfo b/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oafinfo index b7eb514f7e..c4b91b9dd8 100644 --- a/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oafinfo +++ b/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oafinfo @@ -1,89 +1,27 @@ <oaf_info> -<oaf_server iid="OAFIID:control-factory:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a" - type="exe" - location="evolution-calendar"> - - <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 calendar iTip view control"/> - -</oaf_server> - -<oaf_server iid="OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad" +<oaf_server iid="OAFIID:IDL:GNOME:Calendar:Repository:1.0:56989bb6-65a1-430c-86a8-81bbe64bf7ab" type="factory" - location="OAFIID:control-factory:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a"> + location="OAFIID:IDL:GNOME:Calendar:RepositoryLocator:1.0:83b25bb0-b68b-4c6b-86e7-c303e9897c21"> <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:Bonobo/Control:1.0"/> - <item value="IDL:Bonobo/PersistStream:1.0"/> + <item value="IDL:Gnome/Calendar/Repository:1.0"/> </oaf_attribute> - <oaf_attribute name="bonobo:supported_mime_types" type="stringv"> - <item value="text/calendar"/> - <item value="text/x-calendar"/> - </oaf_attribute> - - <oaf_attribute name="name" type="string" - value="Evolution calendar iTip/iMip viewer"/> <oaf_attribute name="description" type="string" - value="Factory for the calendar iTip view control"/> - + value="Calendar Repository"/> </oaf_server> -<oaf_server iid="OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921" +<oaf_server iid="OAFIID:IDL:GNOME:Calendar:RepositoryLocator:1.0:83b25bb0-b68b-4c6b-86e7-c303e9897c21" type="exe" - location="evolution-calendar"> - - <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 calendar component."/> - -</oaf_server> - -<oaf_server iid="OAFIID:evolution-shell-component:evolution-calendar:2eb9eb63-d305-4918-9c35-faae5db19e51" - type="factory" - location="OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921"> - - <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 the calendar."/> - - <oaf_attribute name="evolution:shell-component-icon" type="string" - value="evolution-calendar.png"/> -</oaf_server> - -<oaf_server iid="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af" - type="exe" - location="evolution-calendar"> - - <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 Calendar Summary component."/> -</oaf_server> - -<oaf_server iid="OAFIID:evolution-executive-summary-component:evolution-calendar:c80742c0-c7ae-4f53-9df2-33221864729c" - type="factory" - location="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af"> + location="gnomecal"> <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/Evolution:SummaryComponent:1.0"/> + <item value="IDL:GNOME/GenericFactory:1.0"/> </oaf_attribute> <oaf_attribute name="description" type="string" - value="Evolution calendar executive summary component."/> + value="Calendar Server"/> </oaf_server> </oaf_info> diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 8729b20f80..df422d6b96 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -128,7 +128,7 @@ evolution_calendar_LDADD = \ evolution_calendar_LDFLAGS = `gnome-config --libs gdk_pixbuf` oafdir = $(datadir)/oaf -oaf_DATA = calendar-control.oafinfo evolution-calendar.oafinfo +oaf_DATA = GNOME_Evolution_Calendar_Control.oafinfo GNOME_Evolution_Calendar.oafinfo EXTRA_DIST = \ $(glade_DATA) \ @@ -146,8 +146,7 @@ EXTRA_DIST = \ weekview.xpm \ workweekview.xpm \ yearview.xpm \ - calendar-control.oafinfo \ - evolution-calendar.oafinfo + $(oaf_DATA) install-data-local: $(mkinstalldirs) $(DESTDIR)$(help_base)/C diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c index b30bae6a02..91e50f84eb 100644 --- a/calendar/gui/calendar-component.c +++ b/calendar/gui/calendar-component.c @@ -35,8 +35,8 @@ #endif -#define COMPONENT_FACTORY_ID "OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921" -#define SUMMARY_FACTORY_ID "OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af" +#define COMPONENT_FACTORY_ID "OAFIID:GNOME_Evolution_Calendar_ShellComponentFactory" +#define SUMMARY_FACTORY_ID "OAFIID:GNOME_Evolution_Calendar_ExecutiveSummaryComponentFactory" static BonoboGenericFactory *factory = NULL; static BonoboGenericFactory *summary_factory = NULL; diff --git a/calendar/gui/calendar-control.oafinfo b/calendar/gui/calendar-control.oafinfo deleted file mode 100644 index f67c8eb416..0000000000 --- a/calendar/gui/calendar-control.oafinfo +++ /dev/null @@ -1,28 +0,0 @@ -<oaf_info> - -<oaf_server iid="OAFIID:control-factory:calendar:f4f90989-0f50-4af2-ad94-8bbdf331f0bc" - type="exe" - location="evolution-calendar"> - - <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 sample Calendar control"/> -</oaf_server> - -<oaf_server iid="OAFIID:control:calendar:dd34ddae-25c6-486b-a8a8-3e8f0286b54c" - type="factory" - location="OAFIID:control-factory:calendar:f4f90989-0f50-4af2-ad94-8bbdf331f0bc"> - - <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:BonoboControl/calendar-control:1.0"/> - <item value="IDL:Bonobo/Control:1.0"/> - </oaf_attribute> - - <oaf_attribute name="description" type="string" - value="A sample Bonobo control which displays an calendar."/> -</oaf_server> - -</oaf_info> diff --git a/calendar/gui/component-factory.c b/calendar/gui/component-factory.c index b30bae6a02..91e50f84eb 100644 --- a/calendar/gui/component-factory.c +++ b/calendar/gui/component-factory.c @@ -35,8 +35,8 @@ #endif -#define COMPONENT_FACTORY_ID "OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921" -#define SUMMARY_FACTORY_ID "OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af" +#define COMPONENT_FACTORY_ID "OAFIID:GNOME_Evolution_Calendar_ShellComponentFactory" +#define SUMMARY_FACTORY_ID "OAFIID:GNOME_Evolution_Calendar_ExecutiveSummaryComponentFactory" static BonoboGenericFactory *factory = NULL; static BonoboGenericFactory *summary_factory = NULL; diff --git a/calendar/gui/control-factory.c b/calendar/gui/control-factory.c index c38a0f26f9..ea68675e43 100644 --- a/calendar/gui/control-factory.c +++ b/calendar/gui/control-factory.c @@ -41,7 +41,7 @@ #define PROPERTY_CALENDAR_URI_IDX 1 -#define CONTROL_FACTORY_ID "OAFIID:control-factory:calendar:f4f90989-0f50-4af2-ad94-8bbdf331f0bc" +#define CONTROL_FACTORY_ID "OAFIID:GNOME_Evolution_Calendar_ControlFactory" CORBA_Environment ev; diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c index 476853c707..0d894ec2e8 100644 --- a/calendar/gui/e-itip-control.c +++ b/calendar/gui/e-itip-control.c @@ -16,18 +16,18 @@ #include <ical.h> #include <time.h> #include <Evolution-Composer.h> +#include <e-components.h> #include "e-itip-control.h" #include <cal-util/cal-component.h> #include <cal-client/cal-client.h> #include "itip-utils.h" +#define MAIL_COMPOSER_OAF_IID "OAFIID:GNOME_Evolution_Mail_Composer" #define DEFAULT_WIDTH 400 #define DEFAULT_HEIGHT 300 -#define COMPOSER_OAFID "OAFIID:evolution-composer:evolution-mail:cd8618ea-53e1-4b9e-88cf-ec578bdb903b" - extern gchar *evolution_dir; typedef struct _EItipControlPrivate EItipControlPrivate; @@ -231,7 +231,7 @@ send_itip_reply (EItipControlPrivate *priv) CORBA_exception_init (&ev); /* First, I obtain an object reference that represents the Composer. */ - bonobo_server = bonobo_object_activate (COMPOSER_OAFID, 0); + bonobo_server = bonobo_object_activate (MAIL_COMPOSER_OAF_IID, 0); g_return_if_fail (bonobo_server != NULL); @@ -1044,10 +1044,9 @@ e_itip_control_factory_init (void) if (factory != NULL) return; - factory = - bonobo_generic_factory_new ( - "OAFIID:control-factory:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a", - e_itip_control_factory, NULL); + factory = bonobo_generic_factory_new ( + "OAFIID:GNOME_Evolution_Calendar_iTip_ControlFactory", + e_itip_control_factory, NULL); if (factory == NULL) g_error ("I could not register an iTip control factory."); diff --git a/calendar/gui/e-meeting-edit.c b/calendar/gui/e-meeting-edit.c index b6435a12fc..efe41bbf09 100644 --- a/calendar/gui/e-meeting-edit.c +++ b/calendar/gui/e-meeting-edit.c @@ -465,8 +465,7 @@ schedule_button_clicked_cb (GtkWidget *widget, gpointer data) return; } -#define COMPOSER_OAFID "OAFIID:evolution-composer:evolution-mail:cd8618ea-53e1-4b9e-88cf-ec578bdb903b" - +#define GNOME_EVOLUTION_COMPOSER_OAFIID "OAFIID:GNOME_Evolution_Mail_Composer" static gchar *itip_methods[] = { "REQUEST", @@ -503,7 +502,7 @@ send_calendar_info (itip_method_enum method, EMeetingEditorPrivate *priv) CORBA_exception_init (&ev); /* First, I obtain an object reference that represents the Composer. */ - bonobo_server = bonobo_object_activate (COMPOSER_OAFID, 0); + bonobo_server = bonobo_object_activate (GNOME_EVOLUTION_COMPOSER_OAFIID, 0); g_return_if_fail (bonobo_server != NULL); diff --git a/calendar/gui/evolution-calendar.oafinfo b/calendar/gui/evolution-calendar.oafinfo deleted file mode 100644 index b7eb514f7e..0000000000 --- a/calendar/gui/evolution-calendar.oafinfo +++ /dev/null @@ -1,89 +0,0 @@ -<oaf_info> - -<oaf_server iid="OAFIID:control-factory:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a" - type="exe" - location="evolution-calendar"> - - <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 calendar iTip view control"/> - -</oaf_server> - -<oaf_server iid="OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad" - type="factory" - location="OAFIID:control-factory:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a"> - - <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:Bonobo/Control:1.0"/> - <item value="IDL:Bonobo/PersistStream:1.0"/> - </oaf_attribute> - - <oaf_attribute name="bonobo:supported_mime_types" type="stringv"> - <item value="text/calendar"/> - <item value="text/x-calendar"/> - </oaf_attribute> - - <oaf_attribute name="name" type="string" - value="Evolution calendar iTip/iMip viewer"/> - <oaf_attribute name="description" type="string" - value="Factory for the calendar iTip view control"/> - -</oaf_server> - -<oaf_server iid="OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921" - type="exe" - location="evolution-calendar"> - - <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 calendar component."/> - -</oaf_server> - -<oaf_server iid="OAFIID:evolution-shell-component:evolution-calendar:2eb9eb63-d305-4918-9c35-faae5db19e51" - type="factory" - location="OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921"> - - <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 the calendar."/> - - <oaf_attribute name="evolution:shell-component-icon" type="string" - value="evolution-calendar.png"/> -</oaf_server> - -<oaf_server iid="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af" - type="exe" - location="evolution-calendar"> - - <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 Calendar Summary component."/> -</oaf_server> - -<oaf_server iid="OAFIID:evolution-executive-summary-component:evolution-calendar:c80742c0-c7ae-4f53-9df2-33221864729c" - type="factory" - location="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af"> - - <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/Evolution:SummaryComponent:1.0"/> - </oaf_attribute> - - <oaf_attribute name="description" type="string" - value="Evolution calendar executive summary component."/> -</oaf_server> - -</oaf_info> diff --git a/calendar/gui/gnomecal.oafinfo b/calendar/gui/gnomecal.oafinfo deleted file mode 100644 index 6af67e9fe0..0000000000 --- a/calendar/gui/gnomecal.oafinfo +++ /dev/null @@ -1,27 +0,0 @@ -<oaf_info> - -<oaf_server iid="OAFIID:IDL:GNOME:Calendar:Repository:1.0:56989bb6-65a1-430c-86a8-81bbe64bf7ab" - type="factory" - location="OAFIID:IDL:GNOME:Calendar:RepositoryLocator:1.0:83b25bb0-b68b-4c6b-86e7-c303e9897c21"> - - <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:Gnome/Calendar/Repository:1.0"/> - </oaf_attribute> - - <oaf_attribute name="description" type="string" - value="Calendar Repository"/> -</oaf_server> - -<oaf_server iid="OAFIID:IDL:GNOME:Calendar:RepositoryLocator:1.0:83b25bb0-b68b-4c6b-86e7-c303e9897c21" - type="exe" - location="gnomecal"> - - <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/ObjectFactory:1.0"/> - </oaf_attribute> - - <oaf_attribute name="description" type="string" - value="Calendar Server"/> -</oaf_server> - -</oaf_info> diff --git a/composer/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c index 1cd999c11f..0ab2b76829 100644 --- a/composer/e-msg-composer-hdrs.c +++ b/composer/e-msg-composer-hdrs.c @@ -41,7 +41,7 @@ #include "mail/mail-config.h" -#define SELECT_NAMES_OAFID "OAFIID:addressbook:select-names:39301deb-174b-40d1-8a6e-5edc300f7b61" +#define SELECT_NAMES_OAFID "OAFIID:GNOME_Evolution_Addressbook_SelectNames" struct _EMsgComposerHdrsPrivate { GNOME_Evolution_Addressbook_SelectNames corba_select_names; diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index e2b741f6b9..80e6eaf357 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -63,7 +63,7 @@ #include <libgnomevfs/gnome-vfs.h> -#define HTML_EDITOR_CONTROL_ID "OAFIID:control:html-editor:63c5499b-8b0c-475a-9948-81ec96a9662c" +#define GNOME_GTKHTML_EDITOR_CONTROL_ID "OAFIID:control:html-editor:63c5499b-8b0c-475a-9948-81ec96a9662c" #define DEFAULT_WIDTH 600 @@ -1354,7 +1354,7 @@ e_msg_composer_construct (EMsgComposer *composer) /* Editor component. */ composer->editor = bonobo_widget_new_control ( - HTML_EDITOR_CONTROL_ID, + GNOME_GTKHTML_EDITOR_CONTROL_ID, bonobo_ui_component_get_container (composer->uic)); if (!composer->editor) diff --git a/composer/evolution-composer.c b/composer/evolution-composer.c index c0e86ca227..b4614d6c50 100644 --- a/composer/evolution-composer.c +++ b/composer/evolution-composer.c @@ -289,7 +289,7 @@ evolution_composer_new (void) E_MAKE_TYPE (evolution_composer, "EvolutionComposer", EvolutionComposer, class_init, init, PARENT_TYPE) -#define COMPOSER_FACTORY_ID "OAFIID:evolution-composer-factory:evolution-mail:fcfda393-60ee-485f-b782-e9323434bff3" +#define GNOME_EVOLUTION_MAIL_COMPOSER_FACTORY_ID "OAFIID:GNOME_Evolution_Mail_ComposerFactory" static BonoboObject * factory_fn (BonoboGenericFactory *factory, void *closure) @@ -301,7 +301,7 @@ void evolution_composer_factory_init (void (*send) (EMsgComposer *, gpointer), void (*postpone) (EMsgComposer *, gpointer)) { - if (bonobo_generic_factory_new (COMPOSER_FACTORY_ID, + if (bonobo_generic_factory_new (GNOME_EVOLUTION_MAIL_COMPOSER_FACTORY_ID, factory_fn, NULL) == NULL) { e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, _("Cannot initialize Evolution's composer.")); diff --git a/data/evolution.keys b/data/evolution.keys index 7f28de5c8a..301b56efb3 100644 --- a/data/evolution.keys +++ b/data/evolution.keys @@ -1,24 +1,24 @@ text/x-vcard description=address card default_action_type=component - default_component_iid=OAFIID:control:e_minicard:f9542709-fb31-4c6a-bc00-d462ba41e4b9 - short_list_component_iids_for_novice_user_level=OAFIID:control:e_minicard:f9542709-fb31-4c6a-bc00-d462ba41e4b9 - short_list_component_iids_for_intermediate_user_level=OAFIID:control:e_minicard:f9542709-fb31-4c6a-bc00-d462ba41e4b9 - short_list_component_iids_for_hacker_user_level=OAFIID:control:e_minicard:f9542709-fb31-4c6a-bc00-d462ba41e4b9 + default_component_iid=OAFIID:GNOME_Evolution_Addressbook_MiniCard_Control + short_list_component_iids_for_novice_user_level=OAFIID:GNOME_Evolution_Addressbook_MiniCard_Control + short_list_component_iids_for_intermediate_user_level=OAFIID:GNOME_Evolution_Addressbook_MiniCard_Control + short_list_component_iids_for_hacker_user_level=OAFIID:GNOME_Evolution_Addressbook_MiniCard_Control text/x-calendar description=calendar information default_action_type=component - default_component_iid=OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad - short_list_component_iids_for_novice_user_level=OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad - short_list_component_iids_for_intermediate_user_level=OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad - short_list_component_iids_for_hacker_user_level=OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad + default_component_iid=OAFIID:GNOME_Evolution_Calendar_iTip_Control + short_list_component_iids_for_novice_user_level=OAFIID:GNOME_Evolution_Calendar_iTip_Control + short_list_component_iids_for_intermediate_user_level=OAFIID:GNOME_Evolution_Calendar_iTip_Control + short_list_component_iids_for_hacker_user_level=OAFIID:GNOME_Evolution_Calendar_iTip_Control text/calendar description=calendar information default_action_type=component - default_component_iid=OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad - short_list_component_iids_for_novice_user_level=OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad - short_list_component_iids_for_intermediate_user_level=OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad - short_list_component_iids_for_hacker_user_level=OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad + default_component_iid=OAFIID:GNOME_Evolution_Calendar_iTip_Control + short_list_component_iids_for_novice_user_level=OAFIID:GNOME_Evolution_Calendar_iTip_Control + short_list_component_iids_for_intermediate_user_level=OAFIID:GNOME_Evolution_Calendar_iTip_Control + short_list_component_iids_for_hacker_user_level=OAFIID:GNOME_Evolution_Calendar_iTip_Control diff --git a/doc/NAMESPACE b/doc/NAMESPACE new file mode 100644 index 0000000000..0914dba35d --- /dev/null +++ b/doc/NAMESPACE @@ -0,0 +1,28 @@ + + Here is how both the Evolution implementation and IDL namespacing +is to be organized, NB. for implementations and oafinfo filenames we replace +'/' with '_' + +Files: + +/GNOME/Evolution/ + + Addressbook/ + Calendar/ + Control + gnomecal + Composer/ + Mail/ + Notes/ + Shell/ + Summary/ + test + rdf + Wombat/ + +Components: + + Shell components end in _ShellComponent, controls in _Control, +executive summary components in _ExecutiveSummaryComponent and +factories append 'Factory'. + 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 @@ <oaf_info> -<oaf_server iid="OAFIID:evolution-shell-component-factory:evolution-executive-summary:e030e71d-0c53-4118-8d48-28757f0a8504" +<oaf_server iid="OAFIID:GNOME_Evolution_Summary_ShellComponentFactory" type="exe" location="evolution-executive-summary"> <oaf_attribute name="repo_ids" type="stringv"> @@ -11,9 +11,9 @@ value="Factory for the Evolution executive summary component."/> </oaf_server> -<oaf_server iid="OAFIID:evolution-shell-component:evolution-executive-summary:a978364e-3839-4570-a2a5-98cf0de587e4" +<oaf_server iid="OAFIID:GNOME_Evolution_Summary_ShellComponent" type="factory" - location="OAFIID:evolution-shell-component-factory:evolution-executive-summary:e030e71d-0c53-4118-8d48-28757f0a8504"> + location="OAFIID:GNOME_Evolution_Summary_ShellComponentFactory"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/Evolution/ShellComponent:1.0"/> 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 @@ <oaf_info> -<oaf_server iid="OAFIID:evolution-shell-component-factory:evolution-executive-summary:e030e71d-0c53-4118-8d48-28757f0a8504" +<oaf_server iid="OAFIID:GNOME_Evolution_Summary_ShellComponentFactory" type="exe" location="evolution-executive-summary"> <oaf_attribute name="repo_ids" type="stringv"> @@ -11,9 +11,9 @@ value="Factory for the Evolution executive summary component."/> </oaf_server> -<oaf_server iid="OAFIID:evolution-shell-component:evolution-executive-summary:a978364e-3839-4570-a2a5-98cf0de587e4" +<oaf_server iid="OAFIID:GNOME_Evolution_Summary_ShellComponent" type="factory" - location="OAFIID:evolution-shell-component-factory:evolution-executive-summary:e030e71d-0c53-4118-8d48-28757f0a8504"> + location="OAFIID:GNOME_Evolution_Summary_ShellComponentFactory"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/Evolution/ShellComponent:1.0"/> 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 @@ -<oaf_info> - -<oaf_server iid="OAFIID:evolution-shell-component-factory:evolution-executive-summary:e030e71d-0c53-4118-8d48-28757f0a8504" - type="exe" - location="evolution-executive-summary"> - <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 executive summary component."/> -</oaf_server> - -<oaf_server iid="OAFIID:evolution-shell-component:evolution-executive-summary:a978364e-3839-4570-a2a5-98cf0de587e4" - type="factory" - location="OAFIID:evolution-shell-component-factory:evolution-executive-summary:e030e71d-0c53-4118-8d48-28757f0a8504"> - - <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 the executive summary."/> - - <oaf_attribute name="evolution:shell-component-icon" type="string" - value="evolution-today.png"/> -</oaf_server> - -</oaf_info> 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 @@ <oaf_info> -<oaf_server iid="OAFIID:evolution-summary-component-factory:rdf-summary:8d7a395c-1036-4e54-8aa6-bd30fb5a1379" +<oaf_server iid="OAFIID:GNOME_Evolution_Summary_rdf_SummaryComponentFactory" type="exe" location="rdf-summary"> @@ -12,9 +12,9 @@ value="Factory for the RDF summary."/> </oaf_server> -<oaf_server iid="OAFIID:evolution-summary-component:rdf-summary:65610e8c-7994-4cde-ab35-c907f35e37c0" +<oaf_server iid="OAFIID:GNOME_Evolution_Summary_rdf_SummaryComponent" type="factory" - location="OAFIID:evolution-summary-component-factory:rdf-summary:8d7a395c-1036-4e54-8aa6-bd30fb5a1379"> + location="OAFIID:GNOME_Evolution_Summary_rdf_SummaryComponentFactory"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:Evolution:SummaryComponent:1.0"/> 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 @@ <oaf_info> -<oaf_server iid="OAFIID:evolution-summary-component-factory:rdf-summary:8d7a395c-1036-4e54-8aa6-bd30fb5a1379" +<oaf_server iid="OAFIID:GNOME_Evolution_Summary_rdf_SummaryComponentFactory" type="exe" location="rdf-summary"> @@ -12,9 +12,9 @@ value="Factory for the RDF summary."/> </oaf_server> -<oaf_server iid="OAFIID:evolution-summary-component:rdf-summary:65610e8c-7994-4cde-ab35-c907f35e37c0" +<oaf_server iid="OAFIID:GNOME_Evolution_Summary_rdf_SummaryComponent" type="factory" - location="OAFIID:evolution-summary-component-factory:rdf-summary:8d7a395c-1036-4e54-8aa6-bd30fb5a1379"> + location="OAFIID:GNOME_Evolution_Summary_rdf_SummaryComponentFactory"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:Evolution:SummaryComponent:1.0"/> 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 @@ <oaf_info> -<oaf_server iid="OAFIID:evolution-summary-component-factory:test-service:0ea887d5-622b-4b8c-b525-18aa1cbe18a6" +<oaf_server iid="OAFIID:GNOME_Evolution_Summary_test_ComponentFactory" type="exe" location="test-service"> @@ -12,9 +12,9 @@ value="Factory for the test component."/> </oaf_server> -<oaf_server iid="OAFIID:evolution-summary-component:test-service:d3cb3ed6-a654-4337-8aa0-f443751d6d1b" +<oaf_server iid="OAFIID:GNOME_Evolution_Summary_test_Component" type="factory" - location="OAFIID:evolution-summary-component-factory:test-service:0ea887d5-622b-4b8c-b525-18aa1cbe18a6"> + location="OAFIID:GNOME_Evolution_Summary_test_ComponentFactory"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/Evolution:Summary:ComponentFactory:1.0"/> 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 @@ <oaf_info> -<oaf_server iid="OAFIID:evolution-summary-component-factory:test-service:0ea887d5-622b-4b8c-b525-18aa1cbe18a6" +<oaf_server iid="OAFIID:GNOME_Evolution_Summary_test_ComponentFactory" type="exe" location="test-service"> @@ -12,9 +12,9 @@ value="Factory for the test component."/> </oaf_server> -<oaf_server iid="OAFIID:evolution-summary-component:test-service:d3cb3ed6-a654-4337-8aa0-f443751d6d1b" +<oaf_server iid="OAFIID:GNOME_Evolution_Summary_test_Component" type="factory" - location="OAFIID:evolution-summary-component-factory:test-service:0ea887d5-622b-4b8c-b525-18aa1cbe18a6"> + location="OAFIID:GNOME_Evolution_Summary_test_ComponentFactory"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/Evolution:Summary:ComponentFactory:1.0"/> 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 @@ -<oaf_info> - -<oaf_server iid="OAFIID:evolution-summary-component-factory:rdf-summary:8d7a395c-1036-4e54-8aa6-bd30fb5a1379" - type="exe" - location="rdf-summary"> - - <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 RDF summary."/> -</oaf_server> - -<oaf_server iid="OAFIID:evolution-summary-component:rdf-summary:65610e8c-7994-4cde-ab35-c907f35e37c0" - type="factory" - location="OAFIID:evolution-summary-component-factory:rdf-summary:8d7a395c-1036-4e54-8aa6-bd30fb5a1379"> - - <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:Evolution:SummaryComponent:1.0"/> - </oaf_attribute> - - <oaf_attribute name="description" type="string" - value="RDF Summary"/> -</oaf_server> - -</oaf_info> 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 @@ -<oaf_info> - -<oaf_server iid="OAFIID:evolution-summary-component-factory:test-service:0ea887d5-622b-4b8c-b525-18aa1cbe18a6" - type="exe" - location="test-service"> - - <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 test component."/> -</oaf_server> - -<oaf_server iid="OAFIID:evolution-summary-component:test-service:d3cb3ed6-a654-4337-8aa0-f443751d6d1b" - type="factory" - location="OAFIID:evolution-summary-component-factory:test-service:0ea887d5-622b-4b8c-b525-18aa1cbe18a6"> - - <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="Test service"/> -</oaf_server> - -<!-- This does not work -<oaf_server iid="OAFIID:evolution-summary-component-factory:test-bonobo-service:b6da2ad2-1fbb-4539-93f9-038b1702810e" - type="exe" - location="test-bonobo-service"> - - <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 test bonobo component."/> -</oaf_server> - -<oaf_server iid="OAFIID:evolution-summary-component:test-bonobo-service:d3cb3ed6-a654-4337-8aa0-f443751d6d1b" - type="factory" - location="OAFIID:evolution-summary-component-factory:test-bonobo-service:b6da2ad2-1fbb-4539-93f9-038b1702810e"> - - <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:Evolution:SummaryComponent:1.0"/> - </oaf_attribute> - - <oaf_attribute name="description" type="string" - value="Test bonobo service"/> -</oaf_server> - ---> -</oaf_info> diff --git a/help/NAMESPACE b/help/NAMESPACE new file mode 100644 index 0000000000..0914dba35d --- /dev/null +++ b/help/NAMESPACE @@ -0,0 +1,28 @@ + + Here is how both the Evolution implementation and IDL namespacing +is to be organized, NB. for implementations and oafinfo filenames we replace +'/' with '_' + +Files: + +/GNOME/Evolution/ + + Addressbook/ + Calendar/ + Control + gnomecal + Composer/ + Mail/ + Notes/ + Shell/ + Summary/ + test + rdf + Wombat/ + +Components: + + Shell components end in _ShellComponent, controls in _Control, +executive summary components in _ExecutiveSummaryComponent and +factories append 'Factory'. + diff --git a/libical/src/libical/icalyacc.c b/libical/src/libical/icalyacc.c index 9c8ba8b6fb..c93fcc3df1 100644 --- a/libical/src/libical/icalyacc.c +++ b/libical/src/libical/icalyacc.c @@ -14,124 +14,125 @@ #define COLON 264 #define COMMA 265 #define SEMICOLON 266 -#define TIMESEPERATOR 267 -#define TRUE 268 -#define FALSE 269 -#define FREQ 270 -#define BYDAY 271 -#define BYHOUR 272 -#define BYMINUTE 273 -#define BYMONTH 274 -#define BYMONTHDAY 275 -#define BYSECOND 276 -#define BYSETPOS 277 -#define BYWEEKNO 278 -#define BYYEARDAY 279 -#define DAILY 280 -#define MINUTELY 281 -#define MONTHLY 282 -#define SECONDLY 283 -#define WEEKLY 284 -#define HOURLY 285 -#define YEARLY 286 -#define INTERVAL 287 -#define COUNT 288 -#define UNTIL 289 -#define WKST 290 -#define MO 291 -#define SA 292 -#define SU 293 -#define TU 294 -#define WE 295 -#define TH 296 -#define FR 297 -#define BIT8 298 -#define ACCEPTED 299 -#define ADD 300 -#define AUDIO 301 -#define BASE64 302 -#define BINARY 303 -#define BOOLEAN 304 -#define BUSY 305 -#define BUSYTENTATIVE 306 -#define BUSYUNAVAILABLE 307 -#define CALADDRESS 308 -#define CANCEL 309 -#define CANCELLED 310 -#define CHAIR 311 -#define CHILD 312 -#define COMPLETED 313 -#define CONFIDENTIAL 314 -#define CONFIRMED 315 -#define COUNTER 316 -#define DATE 317 -#define DATETIME 318 -#define DECLINECOUNTER 319 -#define DECLINED 320 -#define DELEGATED 321 -#define DISPLAY 322 -#define DRAFT 323 -#define DURATION 324 -#define EMAIL 325 -#define END 326 -#define FINAL 327 -#define FLOAT 328 -#define FREE 329 -#define GREGORIAN 330 -#define GROUP 331 -#define INDIVIDUAL 332 -#define INPROCESS 333 -#define INTEGER 334 -#define NEEDSACTION 335 -#define NONPARTICIPANT 336 -#define OPAQUE 337 -#define OPTPARTICIPANT 338 -#define PARENT 339 -#define PERIOD 340 -#define PRIVATE 341 -#define PROCEDURE 342 -#define PUBLIC 343 -#define PUBLISH 344 -#define RECUR 345 -#define REFRESH 346 -#define REPLY 347 -#define REQPARTICIPANT 348 -#define REQUEST 349 -#define RESOURCE 350 -#define ROOM 351 -#define SIBLING 352 -#define START 353 -#define TENTATIVE 354 -#define TEXT 355 -#define THISANDFUTURE 356 -#define THISANDPRIOR 357 -#define TIME 358 -#define TRANSPAENT 359 -#define UNKNOWN 360 -#define UTCOFFSET 361 -#define XNAME 362 -#define ALTREP 363 -#define CN 364 -#define CUTYPE 365 -#define DAYLIGHT 366 -#define DIR 367 -#define ENCODING 368 -#define EVENT 369 -#define FBTYPE 370 -#define FMTTYPE 371 -#define LANGUAGE 372 -#define MEMBER 373 -#define PARTSTAT 374 -#define RANGE 375 -#define RELATED 376 -#define RELTYPE 377 -#define ROLE 378 -#define RSVP 379 -#define SENTBY 380 -#define STANDARD 381 -#define URI 382 -#define TIME_CHAR 383 -#define UTC_CHAR 384 +#define MINUS 267 +#define TIMESEPERATOR 268 +#define TRUE 269 +#define FALSE 270 +#define FREQ 271 +#define BYDAY 272 +#define BYHOUR 273 +#define BYMINUTE 274 +#define BYMONTH 275 +#define BYMONTHDAY 276 +#define BYSECOND 277 +#define BYSETPOS 278 +#define BYWEEKNO 279 +#define BYYEARDAY 280 +#define DAILY 281 +#define MINUTELY 282 +#define MONTHLY 283 +#define SECONDLY 284 +#define WEEKLY 285 +#define HOURLY 286 +#define YEARLY 287 +#define INTERVAL 288 +#define COUNT 289 +#define UNTIL 290 +#define WKST 291 +#define MO 292 +#define SA 293 +#define SU 294 +#define TU 295 +#define WE 296 +#define TH 297 +#define FR 298 +#define BIT8 299 +#define ACCEPTED 300 +#define ADD 301 +#define AUDIO 302 +#define BASE64 303 +#define BINARY 304 +#define BOOLEAN 305 +#define BUSY 306 +#define BUSYTENTATIVE 307 +#define BUSYUNAVAILABLE 308 +#define CALADDRESS 309 +#define CANCEL 310 +#define CANCELLED 311 +#define CHAIR 312 +#define CHILD 313 +#define COMPLETED 314 +#define CONFIDENTIAL 315 +#define CONFIRMED 316 +#define COUNTER 317 +#define DATE 318 +#define DATETIME 319 +#define DECLINECOUNTER 320 +#define DECLINED 321 +#define DELEGATED 322 +#define DISPLAY 323 +#define DRAFT 324 +#define DURATION 325 +#define EMAIL 326 +#define END 327 +#define FINAL 328 +#define FLOAT 329 +#define FREE 330 +#define GREGORIAN 331 +#define GROUP 332 +#define INDIVIDUAL 333 +#define INPROCESS 334 +#define INTEGER 335 +#define NEEDSACTION 336 +#define NONPARTICIPANT 337 +#define OPAQUE 338 +#define OPTPARTICIPANT 339 +#define PARENT 340 +#define PERIOD 341 +#define PRIVATE 342 +#define PROCEDURE 343 +#define PUBLIC 344 +#define PUBLISH 345 +#define RECUR 346 +#define REFRESH 347 +#define REPLY 348 +#define REQPARTICIPANT 349 +#define REQUEST 350 +#define RESOURCE 351 +#define ROOM 352 +#define SIBLING 353 +#define START 354 +#define TENTATIVE 355 +#define TEXT 356 +#define THISANDFUTURE 357 +#define THISANDPRIOR 358 +#define TIME 359 +#define TRANSPAENT 360 +#define UNKNOWN 361 +#define UTCOFFSET 362 +#define XNAME 363 +#define ALTREP 364 +#define CN 365 +#define CUTYPE 366 +#define DAYLIGHT 367 +#define DIR 368 +#define ENCODING 369 +#define EVENT 370 +#define FBTYPE 371 +#define FMTTYPE 372 +#define LANGUAGE 373 +#define MEMBER 374 +#define PARTSTAT 375 +#define RANGE 376 +#define RELATED 377 +#define RELTYPE 378 +#define ROLE 379 +#define RSVP 380 +#define SENTBY 381 +#define STANDARD 382 +#define URI 383 +#define TIME_CHAR 384 +#define UTC_CHAR 385 #line 1 "icalyacc.y" @@ -275,22 +276,22 @@ typedef union { -#define YYFINAL 137 +#define YYFINAL 143 #define YYFLAG -32768 -#define YYNTBASE 141 +#define YYNTBASE 142 -#define YYTRANSLATE(x) ((unsigned)(x) <= 385 ? yytranslate[x] : 167) +#define YYTRANSLATE(x) ((unsigned)(x) <= 386 ? yytranslate[x] : 168) static const short yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 137, 2, 138, 2, 140, 2, 2, 2, + 2, 2, 138, 2, 139, 2, 141, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 136, 2, 2, - 2, 133, 2, 2, 2, 2, 134, 2, 2, 139, - 2, 2, 135, 2, 2, 2, 132, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 137, 2, 2, + 2, 134, 2, 2, 2, 2, 135, 2, 2, 140, + 2, 2, 136, 2, 2, 2, 133, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -320,7 +321,7 @@ static const short yytranslate[] = { 0, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, - 127, 128, 129, 130, 131 + 127, 128, 129, 130, 131, 132 }; #if YYDEBUG != 0 @@ -330,40 +331,41 @@ static const short yyprhs[] = { 0, 42, 45, 48, 51, 54, 57, 61, 64, 68, 71, 74, 75, 77, 79, 83, 87, 91, 101, 108, 112, 116, 120, 124, 128, 132, 136, 138, 140, 142, 144, - 146, 148, 150, 152, 155, 159, 164, 166, 170, 174, - 178, 182, 186, 190, 194, 198, 202, 206, 210, 214, - 218, 222, 226, 230, 234, 238, 242, 246, 250, 251, - 255, 258, 260, 262, 266 + 146, 148, 150, 152, 155, 159, 163, 168, 174, 176, + 180, 184, 188, 192, 196, 200, 204, 208, 212, 216, + 220, 224, 228, 232, 236, 240, 244, 248, 252, 256, + 260, 261, 265, 268, 270, 272, 276 }; -static const short yyrhs[] = { 142, - 0, 143, 0, 144, 0, 147, 0, 156, 0, 157, - 0, 164, 0, 166, 0, 1, 0, 131, 0, 14, - 0, 15, 0, 3, 0, 0, 130, 0, 0, 130, - 0, 3, 129, 3, 145, 0, 154, 0, 154, 150, - 0, 3, 132, 0, 129, 151, 0, 129, 152, 0, - 129, 153, 0, 3, 133, 0, 3, 133, 152, 0, - 3, 134, 0, 3, 134, 153, 0, 3, 135, 0, - 3, 136, 0, 0, 137, 0, 138, 0, 155, 139, - 148, 0, 155, 139, 150, 0, 155, 139, 149, 0, - 3, 129, 3, 145, 140, 3, 129, 3, 146, 0, - 3, 129, 3, 145, 140, 156, 0, 16, 8, 29, - 0, 16, 8, 27, 0, 16, 8, 31, 0, 16, - 8, 26, 0, 16, 8, 30, 0, 16, 8, 28, - 0, 16, 8, 32, 0, 39, 0, 37, 0, 40, - 0, 41, 0, 42, 0, 43, 0, 38, 0, 159, - 0, 3, 159, 0, 160, 11, 159, 0, 160, 11, - 3, 159, 0, 3, 0, 161, 11, 3, 0, 33, - 8, 3, 0, 36, 8, 39, 0, 36, 8, 37, - 0, 36, 8, 40, 0, 36, 8, 41, 0, 36, - 8, 42, 0, 36, 8, 43, 0, 36, 8, 38, - 0, 22, 8, 161, 0, 19, 8, 161, 0, 18, - 8, 161, 0, 17, 8, 160, 0, 20, 8, 161, - 0, 21, 8, 161, 0, 25, 8, 161, 0, 24, - 8, 161, 0, 23, 8, 161, 0, 35, 8, 147, - 0, 35, 8, 144, 0, 34, 8, 3, 0, 0, - 163, 12, 162, 0, 158, 163, 0, 137, 0, 138, - 0, 165, 4, 4, 0, 165, 4, 4, 4, 0 +static const short yyrhs[] = { 143, + 0, 144, 0, 145, 0, 148, 0, 157, 0, 158, + 0, 165, 0, 167, 0, 1, 0, 132, 0, 15, + 0, 16, 0, 3, 0, 0, 131, 0, 0, 131, + 0, 3, 130, 3, 146, 0, 155, 0, 155, 151, + 0, 3, 133, 0, 130, 152, 0, 130, 153, 0, + 130, 154, 0, 3, 134, 0, 3, 134, 153, 0, + 3, 135, 0, 3, 135, 154, 0, 3, 136, 0, + 3, 137, 0, 0, 138, 0, 139, 0, 156, 140, + 149, 0, 156, 140, 151, 0, 156, 140, 150, 0, + 3, 130, 3, 146, 141, 3, 130, 3, 147, 0, + 3, 130, 3, 146, 141, 157, 0, 17, 8, 30, + 0, 17, 8, 28, 0, 17, 8, 32, 0, 17, + 8, 27, 0, 17, 8, 31, 0, 17, 8, 29, + 0, 17, 8, 33, 0, 40, 0, 38, 0, 41, + 0, 42, 0, 43, 0, 44, 0, 39, 0, 160, + 0, 3, 160, 0, 13, 3, 160, 0, 161, 11, + 160, 0, 161, 11, 3, 160, 0, 161, 11, 13, + 3, 160, 0, 3, 0, 162, 11, 3, 0, 34, + 8, 3, 0, 37, 8, 40, 0, 37, 8, 38, + 0, 37, 8, 41, 0, 37, 8, 42, 0, 37, + 8, 43, 0, 37, 8, 44, 0, 37, 8, 39, + 0, 23, 8, 162, 0, 20, 8, 162, 0, 19, + 8, 162, 0, 18, 8, 161, 0, 21, 8, 162, + 0, 22, 8, 162, 0, 26, 8, 162, 0, 25, + 8, 162, 0, 24, 8, 162, 0, 36, 8, 148, + 0, 36, 8, 145, 0, 35, 8, 3, 0, 0, + 164, 12, 163, 0, 159, 164, 0, 138, 0, 139, + 0, 166, 4, 4, 0, 166, 4, 4, 4, 0 }; #endif @@ -374,11 +376,11 @@ static const short yyrline[] = { 0, 176, 179, 182, 197, 199, 202, 204, 206, 222, 223, 225, 230, 233, 236, 240, 244, 249, 253, 258, 263, 268, 271, 274, 278, 283, 288, 297, 318, 350, 352, - 353, 354, 355, 356, 357, 361, 364, 366, 368, 370, - 372, 374, 379, 381, 382, 383, 386, 388, 391, 393, - 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, - 404, 405, 406, 407, 408, 409, 412, 415, 419, 421, - 423, 431, 432, 434, 440 + 353, 354, 355, 356, 357, 361, 363, 364, 365, 366, + 367, 368, 373, 375, 377, 379, 380, 382, 387, 389, + 392, 394, 395, 396, 397, 398, 399, 400, 401, 402, + 403, 404, 405, 406, 407, 408, 409, 410, 413, 416, + 420, 422, 424, 432, 433, 435, 441 }; #endif @@ -387,7 +389,7 @@ static const short yyrline[] = { 0, static const char * const yytname[] = { "$","error","$undefined.","DIGITS", "INTNUMBER","FLOATNUMBER","STRING","EOL","EQUALS","CHARACTER","COLON","COMMA", -"SEMICOLON","TIMESEPERATOR","TRUE","FALSE","FREQ","BYDAY","BYHOUR","BYMINUTE", +"SEMICOLON","MINUS","TIMESEPERATOR","TRUE","FALSE","FREQ","BYDAY","BYHOUR","BYMINUTE", "BYMONTH","BYMONTHDAY","BYSECOND","BYSETPOS","BYWEEKNO","BYYEARDAY","DAILY", "MINUTELY","MONTHLY","SECONDLY","WEEKLY","HOURLY","YEARLY","INTERVAL","COUNT", "UNTIL","WKST","MO","SA","SU","TU","WE","TH","FR","BIT8","ACCEPTED","ADD","AUDIO", @@ -411,15 +413,15 @@ static const char * const yytname[] = { "$","error","$undefined.","DIGITS", #endif static const short yyr1[] = { 0, - 141, 141, 141, 141, 141, 141, 141, 141, 141, 142, - 143, 143, 144, 145, 145, 146, 146, 147, 148, 148, - 149, 150, 150, 150, 151, 151, 152, 152, 153, 154, - 155, 155, 155, 156, 156, 156, 157, 157, 158, 158, - 158, 158, 158, 158, 158, 159, 159, 159, 159, 159, - 159, 159, 160, 160, 160, 160, 161, 161, 162, 162, - 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, - 162, 162, 162, 162, 162, 162, 162, 162, 163, 163, - 164, 165, 165, 166, 166 + 142, 142, 142, 142, 142, 142, 142, 142, 142, 143, + 144, 144, 145, 146, 146, 147, 147, 148, 149, 149, + 150, 151, 151, 151, 152, 152, 153, 153, 154, 155, + 156, 156, 156, 157, 157, 157, 158, 158, 159, 159, + 159, 159, 159, 159, 159, 160, 160, 160, 160, 160, + 160, 160, 161, 161, 161, 161, 161, 161, 162, 162, + 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, + 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, + 164, 164, 165, 166, 166, 167, 167 }; static const short yyr2[] = { 0, @@ -428,94 +430,98 @@ static const short yyr2[] = { 0, 2, 2, 2, 2, 2, 3, 2, 3, 2, 2, 0, 1, 1, 3, 3, 3, 9, 6, 3, 3, 3, 3, 3, 3, 3, 1, 1, 1, 1, 1, - 1, 1, 1, 2, 3, 4, 1, 3, 3, 3, + 1, 1, 1, 2, 3, 3, 4, 5, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 0, 3, - 2, 1, 1, 3, 4 + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 0, 3, 2, 1, 1, 3, 4 }; static const short yydefact[] = { 0, 9, 13, 11, 12, 0, 10, 32, 33, 1, 2, - 3, 4, 0, 5, 6, 79, 7, 0, 8, 0, - 0, 0, 81, 0, 14, 42, 40, 44, 39, 43, - 41, 45, 0, 0, 34, 36, 35, 19, 0, 84, + 3, 4, 0, 5, 6, 81, 7, 0, 8, 0, + 0, 0, 83, 0, 14, 42, 40, 44, 39, 43, + 41, 45, 0, 0, 34, 36, 35, 19, 0, 86, 15, 18, 21, 30, 0, 22, 23, 24, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 80, 85, 31, 25, 27, 29, 0, 0, + 0, 0, 82, 87, 31, 25, 27, 29, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, 33, 38, 0, 26, 0, 28, 0, - 47, 52, 46, 48, 49, 50, 51, 53, 70, 57, - 69, 68, 71, 72, 67, 75, 74, 73, 59, 78, - 13, 77, 76, 61, 66, 60, 62, 63, 64, 65, - 0, 54, 0, 0, 0, 16, 0, 55, 58, 14, - 17, 37, 56, 18, 0, 0, 0 + 0, 47, 52, 46, 48, 49, 50, 51, 53, 72, + 59, 71, 70, 73, 74, 69, 77, 76, 75, 61, + 80, 13, 79, 78, 63, 68, 62, 64, 65, 66, + 67, 0, 54, 0, 0, 0, 0, 16, 55, 0, + 0, 56, 60, 14, 17, 37, 57, 0, 18, 58, + 0, 0, 0 }; -static const short yydefgoto[] = { 135, - 9, 10, 11, 42, 132, 12, 35, 36, 37, 46, - 47, 48, 38, 13, 14, 15, 16, 98, 99, 101, +static const short yydefgoto[] = { 141, + 9, 10, 11, 42, 136, 12, 35, 36, 37, 46, + 47, 48, 38, 13, 14, 15, 16, 99, 100, 102, 63, 23, 17, 18, 19 }; static const short yypact[] = { -1, --32768, -123,-32768,-32768, 1,-32768, 3, 8,-32768,-32768, --32768,-32768, -122,-32768,-32768,-32768,-32768, 12,-32768, 33, - -7, -2, 40, 49, -119,-32768,-32768,-32768,-32768,-32768, --32768,-32768, -128, 51,-32768,-32768,-32768, -46, 39, 80, --32768, -55,-32768,-32768, -100,-32768,-32768,-32768,-32768, 78, - 79, 81, 82, 83, 84, 85, 86, 87, 88, 89, - 90, 91,-32768,-32768, 2, 97, 98,-32768, 0, 99, - 99, 99, 99, 99, 99, 99, 99, 100, 101, 102, - -11, -41,-32768,-32768,-32768, -28,-32768, -27,-32768, 28, --32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 96,-32768, - 103, 103, 103, 103, 103, 103, 103, 103,-32768,-32768, - -20,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, - 107,-32768, 7, 108, 109, -17, 28,-32768,-32768, -119, --32768,-32768,-32768,-32768, 115, 116,-32768 +-32768, -123,-32768,-32768, 5,-32768, 31, 32,-32768,-32768, +-32768,-32768, -134,-32768,-32768,-32768,-32768, 35,-32768, 15, + -7, -2, 28, 37, -89,-32768,-32768,-32768,-32768,-32768, +-32768,-32768, -129, 83,-32768,-32768,-32768, -43, 41, 84, +-32768, -52,-32768,-32768, -124,-32768,-32768,-32768,-32768, 82, + 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, + 95, 96,-32768,-32768, 2, 102, 103,-32768, 6, 104, + 104, 104, 104, 104, 104, 104, 104, 105, 106, 107, + -10, -39,-32768,-32768,-32768, -24,-32768, -44,-32768, 30, + 109,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 108, +-32768, 110, 110, 110, 110, 110, 110, 110, 110,-32768, +-32768, -17,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, +-32768, 111,-32768, 30, 14, 112, 113, -14,-32768, 30, + 115,-32768,-32768, -89,-32768,-32768,-32768, 30,-32768,-32768, + 120, 122,-32768 }; static const short yypgoto[] = {-32768, --32768,-32768, 37, -12,-32768, 41,-32768,-32768, 93,-32768, - 53, 55,-32768,-32768, 58,-32768,-32768, -72,-32768, 5, +-32768,-32768, 43, -9,-32768, 44,-32768,-32768, 97,-32768, + 60, 62,-32768,-32768, 65,-32768,-32768, -87,-32768, 8, -32768,-32768,-32768,-32768,-32768 }; -#define YYLAST 140 +#define YYLAST 141 static const short yytable[] = { 1, - 33, 2, 90, 43, 82, 20, -82, 44, 21, 127, - 41, -83, 3, 4, 5, 24, 22, 122, 26, 27, - 28, 29, 30, 31, 32, 114, 115, 116, 117, 118, - 119, 120, 66, 67, 68, 25, 91, 92, 93, 94, - 95, 96, 97, 91, 92, 93, 94, 95, 96, 97, - 128, 39, 40, 45, 133, 50, 51, 52, 53, 54, - 55, 56, 57, 58, 91, 92, 93, 94, 95, 96, - 97, 59, 60, 61, 62, 102, 103, 104, 105, 106, - 107, 108, 34, 64, 65, 69, 70, 121, 71, 72, - 73, 74, 75, 76, 77, 78, 79, 80, 81, 86, - 88, 100, 109, 110, 111, 67, 123, 68, 125, 126, - 129, 130, 131, 124, 136, 137, 112, 134, 87, 0, - 113, 89, 85, 0, 0, 0, 34, 0, 0, 6, - 49, 0, 0, 0, 0, 7, 8, -31, 83, 84 + 33, 2, 123, 43, 82, 22, 20, 44, 90, 66, + 67, 68, 21, 3, 4, 5, 130, 25, 91, 26, + 27, 28, 29, 30, 31, 32, 131, 115, 116, 117, + 118, 119, 120, 121, -84, -85, 129, 132, 24, 39, + 40, 41, 137, 92, 93, 94, 95, 96, 97, 98, + 140, 92, 93, 94, 95, 96, 97, 98, 50, 51, + 52, 53, 54, 55, 56, 57, 58, 92, 93, 94, + 95, 96, 97, 98, 59, 60, 61, 62, 103, 104, + 105, 106, 107, 108, 109, 45, 34, 64, 65, 69, + 122, 68, 70, 71, 72, 73, 74, 75, 76, 77, + 78, 79, 80, 81, 86, 88, 101, 110, 111, 112, + 67, 124, 127, 128, 133, 134, 135, 138, 125, 142, + 126, 143, 113, 114, 139, 87, 0, 34, 89, 85, + 6, 0, 0, 0, 49, 0, 7, 8, -31, 83, + 84 }; static const short yycheck[] = { 1, - 3, 3, 3, 132, 3, 129, 4, 136, 8, 3, - 130, 4, 14, 15, 16, 4, 139, 90, 26, 27, - 28, 29, 30, 31, 32, 37, 38, 39, 40, 41, - 42, 43, 133, 134, 135, 3, 37, 38, 39, 40, - 41, 42, 43, 37, 38, 39, 40, 41, 42, 43, - 123, 12, 4, 3, 127, 17, 18, 19, 20, 21, - 22, 23, 24, 25, 37, 38, 39, 40, 41, 42, - 43, 33, 34, 35, 36, 71, 72, 73, 74, 75, - 76, 77, 129, 4, 140, 8, 8, 129, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 3, - 3, 3, 3, 3, 3, 134, 11, 135, 129, 3, - 3, 3, 130, 11, 0, 0, 80, 130, 66, -1, - 80, 67, 65, -1, -1, -1, 129, -1, -1, 131, - 38, -1, -1, -1, -1, 137, 138, 139, 137, 138 + 3, 3, 90, 133, 3, 140, 130, 137, 3, 134, + 135, 136, 8, 15, 16, 17, 3, 3, 13, 27, + 28, 29, 30, 31, 32, 33, 13, 38, 39, 40, + 41, 42, 43, 44, 4, 4, 124, 125, 4, 12, + 4, 131, 130, 38, 39, 40, 41, 42, 43, 44, + 138, 38, 39, 40, 41, 42, 43, 44, 18, 19, + 20, 21, 22, 23, 24, 25, 26, 38, 39, 40, + 41, 42, 43, 44, 34, 35, 36, 37, 71, 72, + 73, 74, 75, 76, 77, 3, 130, 4, 141, 8, + 130, 136, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 3, 3, 3, 3, 3, 3, + 135, 3, 130, 3, 3, 3, 131, 3, 11, 0, + 11, 0, 80, 80, 134, 66, -1, 130, 67, 65, + 132, -1, -1, -1, 38, -1, 138, 139, 140, 138, + 139 }; /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ #line 3 "/usr/lib/bison.simple" @@ -1295,165 +1301,170 @@ case 45: break;} case 46: #line 362 "icalyacc.y" -{ skiplist[skippos]=ICAL_SUNDAY_WEEKDAY+8*dow_pos; - if( skippos<8) skippos++;; +{ skiplist[skippos]=ICAL_SUNDAY_WEEKDAY; ; break;} case 47: -#line 364 "icalyacc.y" -{ skiplist[skippos]=ICAL_MONDAY_WEEKDAY+8*dow_pos; - if( skippos<8) skippos++;; +#line 363 "icalyacc.y" +{ skiplist[skippos]=ICAL_MONDAY_WEEKDAY; ; break;} case 48: -#line 366 "icalyacc.y" -{ skiplist[skippos]=ICAL_TUESDAY_WEEKDAY+8*dow_pos; - if( skippos<8) skippos++;; +#line 364 "icalyacc.y" +{ skiplist[skippos]=ICAL_TUESDAY_WEEKDAY; ; break;} case 49: -#line 368 "icalyacc.y" -{ skiplist[skippos]=ICAL_WEDNESDAY_WEEKDAY+8*dow_pos; - if( skippos<8) skippos++;; +#line 365 "icalyacc.y" +{ skiplist[skippos]=ICAL_WEDNESDAY_WEEKDAY; ; break;} case 50: -#line 370 "icalyacc.y" -{ skiplist[skippos]=ICAL_THURSDAY_WEEKDAY+8*dow_pos; - if( skippos<8) skippos++;; +#line 366 "icalyacc.y" +{ skiplist[skippos]=ICAL_THURSDAY_WEEKDAY; ; break;} case 51: -#line 372 "icalyacc.y" -{ skiplist[skippos]=ICAL_FRIDAY_WEEKDAY+8*dow_pos; - if( skippos<8) skippos++;; +#line 367 "icalyacc.y" +{ skiplist[skippos]=ICAL_FRIDAY_WEEKDAY; ; break;} case 52: -#line 374 "icalyacc.y" -{ skiplist[skippos]=ICAL_SATURDAY_WEEKDAY+8*dow_pos; - if( skippos<8) skippos++;; +#line 368 "icalyacc.y" +{ skiplist[skippos]=ICAL_SATURDAY_WEEKDAY; ; break;} case 53: -#line 380 "icalyacc.y" -{dow_pos = 0; +#line 374 "icalyacc.y" +{if( skippos<8) skippos++;; break;} case 54: -#line 381 "icalyacc.y" -{ dow_pos = atoi(yyvsp[-1].v_string); +#line 375 "icalyacc.y" +{ dow_pos = atoi(yyvsp[-1].v_string); + skiplist[skippos] += 8*dow_pos; if( skippos<8) skippos++; ; break;} case 55: -#line 382 "icalyacc.y" -{dow_pos = 0; +#line 377 "icalyacc.y" +{ dow_pos = atoi(yyvsp[-1].v_string); + skiplist[skippos] -= 8*dow_pos; if( skippos<8) skippos++; ; break;} case 56: -#line 383 "icalyacc.y" -{ dow_pos = atoi(yyvsp[-1].v_string); +#line 379 "icalyacc.y" +{if( skippos<8) skippos++;; break;} case 57: -#line 387 "icalyacc.y" -{ skiplist[skippos] = atoi(yyvsp[0].v_string); skippos++;; +#line 380 "icalyacc.y" +{ dow_pos = atoi(yyvsp[-1].v_string); + skiplist[skippos] += 8*dow_pos;if( skippos<8) skippos++;; break;} case 58: -#line 388 "icalyacc.y" -{ skiplist[skippos] = atoi(yyvsp[0].v_string); if (skippos<367) skippos++;; +#line 382 "icalyacc.y" +{ dow_pos = atoi(yyvsp[-1].v_string); + skiplist[skippos] -= 8*dow_pos;if( skippos<8) skippos++;; break;} case 59: -#line 392 "icalyacc.y" -{recur.interval = atoi(yyvsp[0].v_string);; +#line 388 "icalyacc.y" +{ skiplist[skippos] = atoi(yyvsp[0].v_string); skippos++;; break;} case 60: -#line 393 "icalyacc.y" -{recur.week_start = ICAL_SUNDAY_WEEKDAY;; +#line 389 "icalyacc.y" +{ skiplist[skippos] = atoi(yyvsp[0].v_string); if (skippos<367) skippos++;; break;} case 61: -#line 394 "icalyacc.y" -{recur.week_start = ICAL_MONDAY_WEEKDAY;; +#line 393 "icalyacc.y" +{recur.interval = atoi(yyvsp[0].v_string);; break;} case 62: -#line 395 "icalyacc.y" -{recur.week_start = ICAL_TUESDAY_WEEKDAY;; +#line 394 "icalyacc.y" +{recur.week_start = ICAL_SUNDAY_WEEKDAY;; break;} case 63: -#line 396 "icalyacc.y" -{recur.week_start = ICAL_WEDNESDAY_WEEKDAY;; +#line 395 "icalyacc.y" +{recur.week_start = ICAL_MONDAY_WEEKDAY;; break;} case 64: -#line 397 "icalyacc.y" -{recur.week_start = ICAL_THURSDAY_WEEKDAY;; +#line 396 "icalyacc.y" +{recur.week_start = ICAL_TUESDAY_WEEKDAY;; break;} case 65: -#line 398 "icalyacc.y" -{recur.week_start = ICAL_FRIDAY_WEEKDAY;; +#line 397 "icalyacc.y" +{recur.week_start = ICAL_WEDNESDAY_WEEKDAY;; break;} case 66: -#line 399 "icalyacc.y" -{recur.week_start = ICAL_SATURDAY_WEEKDAY;; +#line 398 "icalyacc.y" +{recur.week_start = ICAL_THURSDAY_WEEKDAY;; break;} case 67: -#line 400 "icalyacc.y" -{copy_list(recur.by_second,60);; +#line 399 "icalyacc.y" +{recur.week_start = ICAL_FRIDAY_WEEKDAY;; break;} case 68: -#line 401 "icalyacc.y" -{copy_list(recur.by_minute,60);; +#line 400 "icalyacc.y" +{recur.week_start = ICAL_SATURDAY_WEEKDAY;; break;} case 69: -#line 402 "icalyacc.y" -{copy_list(recur.by_hour,24);; +#line 401 "icalyacc.y" +{copy_list(recur.by_second,60);; break;} case 70: -#line 403 "icalyacc.y" -{copy_list(recur.by_day,7);; +#line 402 "icalyacc.y" +{copy_list(recur.by_minute,60);; break;} case 71: -#line 404 "icalyacc.y" -{copy_list(recur.by_month,12);; +#line 403 "icalyacc.y" +{copy_list(recur.by_hour,24);; break;} case 72: -#line 405 "icalyacc.y" -{copy_list(recur.by_month_day,31);; +#line 404 "icalyacc.y" +{copy_list(recur.by_day,7);; break;} case 73: -#line 406 "icalyacc.y" -{copy_list(recur.by_year_day,366);; +#line 405 "icalyacc.y" +{copy_list(recur.by_month,12);; break;} case 74: -#line 407 "icalyacc.y" -{copy_list(recur.by_week_no,53);; +#line 406 "icalyacc.y" +{copy_list(recur.by_month_day,31);; break;} case 75: +#line 407 "icalyacc.y" +{copy_list(recur.by_year_day,366);; + break;} +case 76: #line 408 "icalyacc.y" +{copy_list(recur.by_week_no,53);; + break;} +case 77: +#line 409 "icalyacc.y" {copy_list(recur.by_set_pos,366);; break;} -case 76: -#line 410 "icalyacc.y" +case 78: +#line 411 "icalyacc.y" { recur.until = icalvalue_get_datetime(icalparser_yy_value); icalvalue_free(icalparser_yy_value); icalparser_yy_value=0;; break;} -case 77: -#line 413 "icalyacc.y" +case 79: +#line 414 "icalyacc.y" { recur.until = icalvalue_get_date(icalparser_yy_value); icalvalue_free(icalparser_yy_value); icalparser_yy_value=0;; break;} -case 78: -#line 416 "icalyacc.y" +case 80: +#line 417 "icalyacc.y" { recur.count = atoi(yyvsp[0].v_string); ; break;} -case 81: -#line 425 "icalyacc.y" +case 83: +#line 426 "icalyacc.y" { icalparser_yy_value = icalvalue_new_recur(recur); ; break;} -case 82: -#line 431 "icalyacc.y" +case 84: +#line 432 "icalyacc.y" { utcsign = 1; ; break;} -case 83: -#line 432 "icalyacc.y" +case 85: +#line 433 "icalyacc.y" { utcsign = -1; ; break;} -case 84: -#line 436 "icalyacc.y" +case 86: +#line 437 "icalyacc.y" { icalparser_yy_value = icalvalue_new_utcoffset( utcsign * (yyvsp[-1].v_int*3600) + (yyvsp[0].v_int*60) ); ; break;} -case 85: -#line 441 "icalyacc.y" +case 87: +#line 442 "icalyacc.y" { icalparser_yy_value = icalvalue_new_utcoffset(utcsign * (yyvsp[-2].v_int*3600) + (yyvsp[-1].v_int*60) +(yyvsp[0].v_int)); ; @@ -1680,7 +1691,7 @@ yyerrhandle: } return 1; } -#line 447 "icalyacc.y" +#line 448 "icalyacc.y" 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){ 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> diff --git a/shell/ChangeLog b/shell/ChangeLog index df600ac65c..e3a33d5953 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,9 @@ +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. + 2000-12-04 Ettore Perazzoli <ettore@helixcode.com> * e-shortcuts-view.c (e_shortcuts_view_construct): Ref the diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index 884396d149..a82ba563b8 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -1108,6 +1108,8 @@ setup_corba_interface (EShellView *shell_view, BonoboControlFrame *control_frame; EvolutionShellView *corba_interface; + g_return_if_fail (control != NULL); + priv = shell_view->priv; control_frame = bonobo_widget_get_control_frame (BONOBO_WIDGET (control)); @@ -1254,7 +1256,7 @@ get_control_for_uri (EShellView *shell_view, CORBA_exception_init (&ev); corba_control = GNOME_Evolution_ShellComponent_createView (handler, e_folder_get_physical_uri (folder), - folder_type, &ev); + folder_type, &ev); if (ev._major != CORBA_NO_EXCEPTION) { CORBA_exception_free (&ev); @@ -1263,6 +1265,9 @@ get_control_for_uri (EShellView *shell_view, CORBA_exception_free (&ev); + if (corba_control == CORBA_OBJECT_NIL) + return NULL; + container = bonobo_ui_component_get_container (priv->ui_component); control = bonobo_widget_new_control_from_objref (corba_control, container); diff --git a/wombat/GNOME_Evolution_Wombat.oaf.in b/wombat/GNOME_Evolution_Wombat.oaf.in index 466443d1ab..8f74e35512 100644 --- a/wombat/GNOME_Evolution_Wombat.oaf.in +++ b/wombat/GNOME_Evolution_Wombat.oaf.in @@ -1,6 +1,6 @@ <oaf_info> -<oaf_server iid="OAFIID:evolution:addressbook-server:0fbc844d-c721-4615-98d0-d67eacf42d80" +<oaf_server iid="OAFIID:GNOME_Evolution_Wombat_ServerFactory" type="exe" location="wombat"> @@ -13,7 +13,7 @@ value="The Personal Addressbook Server"/> </oaf_server> -<oaf_server iid="OAFIID:evolution:calendar-factory:1c915858-ece3-4a6f-9d81-ea0f108a9554" +<oaf_server iid="OAFIID:GNOME_Evolution_Wombat_CalendarFactory" type="exe" location="wombat"> diff --git a/wombat/GNOME_Evolution_Wombat.oafinfo b/wombat/GNOME_Evolution_Wombat.oafinfo index 466443d1ab..8f74e35512 100644 --- a/wombat/GNOME_Evolution_Wombat.oafinfo +++ b/wombat/GNOME_Evolution_Wombat.oafinfo @@ -1,6 +1,6 @@ <oaf_info> -<oaf_server iid="OAFIID:evolution:addressbook-server:0fbc844d-c721-4615-98d0-d67eacf42d80" +<oaf_server iid="OAFIID:GNOME_Evolution_Wombat_ServerFactory" type="exe" location="wombat"> @@ -13,7 +13,7 @@ value="The Personal Addressbook Server"/> </oaf_server> -<oaf_server iid="OAFIID:evolution:calendar-factory:1c915858-ece3-4a6f-9d81-ea0f108a9554" +<oaf_server iid="OAFIID:GNOME_Evolution_Wombat_CalendarFactory" type="exe" location="wombat"> diff --git a/wombat/Makefile.am b/wombat/Makefile.am index 89ea9f2d69..a8ce0dcfb2 100644 --- a/wombat/Makefile.am +++ b/wombat/Makefile.am @@ -34,9 +34,9 @@ wombat_LDADD = \ wombat_LDFLAGS = `gnome-config --libs gnorba` oafdir = $(datadir)/oaf -oaf_DATA = wombat.oafinfo +oaf_DATA = GNOME_Evolution_Wombat.oafinfo -EXTRA_DIST = wombat.oafinfo +EXTRA_DIST = $(oaf_DATA) if ENABLE_PURIFY PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ diff --git a/wombat/wombat.c b/wombat/wombat.c index d5f350e6dd..d0e78bf374 100644 --- a/wombat/wombat.c +++ b/wombat/wombat.c @@ -108,7 +108,7 @@ register_pcs (CORBA_Object obj) OAF_RegistrationResult result; result = oaf_active_server_register - ("OAFIID:evolution:calendar-factory:1c915858-ece3-4a6f-9d81-ea0f108a9554", + ("OAFIID:GNOME_Evolution_Wombat_CalendarFactory", obj); switch (result) { diff --git a/wombat/wombat.idl b/wombat/wombat.idl index ab13b2cabf..7a7f43bbc3 100644 --- a/wombat/wombat.idl +++ b/wombat/wombat.idl @@ -4,9 +4,11 @@ * Copyright 2000, Helix Code, Inc. */ +module GNOME { module Evolution { interface Config { }; }; +}; diff --git a/wombat/wombat.oafinfo b/wombat/wombat.oafinfo deleted file mode 100644 index 466443d1ab..0000000000 --- a/wombat/wombat.oafinfo +++ /dev/null @@ -1,30 +0,0 @@ -<oaf_info> - -<oaf_server iid="OAFIID:evolution:addressbook-server:0fbc844d-c721-4615-98d0-d67eacf42d80" - type="exe" - location="wombat"> - - <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/Evolution/BookFactory:1.0"/> - <item value="IDL:Bonobo/Unknown:1.0"/> - </oaf_attribute> - - <oaf_attribute name="description" type="string" - value="The Personal Addressbook Server"/> -</oaf_server> - -<oaf_server iid="OAFIID:evolution:calendar-factory:1c915858-ece3-4a6f-9d81-ea0f108a9554" - type="exe" - location="wombat"> - - <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/Evolution/Calendar/CalFactory:1.0"/> - <item value="IDL:Bonobo/Unknown:1.0"/> - </oaf_attribute> - - <oaf_attribute name="description" type="string" - value="The Personal Calendar Server; calendar factory"/> - -</oaf_server> - -</oaf_info> |