diff options
Diffstat (limited to 'addressbook')
15 files changed, 36 insertions, 159 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) |