aboutsummaryrefslogtreecommitdiffstats
path: root/composer
diff options
context:
space:
mode:
Diffstat (limited to 'composer')
-rw-r--r--composer/e-msg-composer-hdrs.c2
-rw-r--r--composer/e-msg-composer.c4
-rw-r--r--composer/evolution-composer.c4
3 files changed, 5 insertions, 5 deletions
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."));