aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer/ChangeLog5
-rw-r--r--composer/e-msg-composer.c12
2 files changed, 14 insertions, 3 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index c04f297bed..8dfea666fb 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-07 Mathieu Lacage <mathieu@gnu.org>
+
+ * e-msg-composer.c (create_editor): remove FIXME and hardcoded
+ string. You can write mails with OAF now.
+
2000-05-07 Dan Winship <danw@helixcode.com>
* e-msg-composer.c (build_message): unref content, etc. after
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 37be9542f3..7e7444b8e6 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -49,6 +49,13 @@
#include "e-msg-composer-attachment-bar.h"
#include "e-msg-composer-hdrs.h"
+#ifdef USING_OAF
+#define HTML_EDITOR_CONTROL_ID "OAFIID:control:html-editor:63c5499b-8b0c-475a-9948-81ec96a9662c"
+#else
+#define HTML_EDITOR_CONTROL_ID "control:html-editor"
+#endif
+
+
#define DEFAULT_WIDTH 600
#define DEFAULT_HEIGHT 500
@@ -70,11 +77,10 @@ create_editor (EMsgComposer *composer)
{
GtkWidget *control;
- /* FIXME: Hardcoded value sucks! */
- control = bonobo_widget_new_control ("control:html-editor",
+ control = bonobo_widget_new_control ((HTML_EDITOR_CONTROL_ID,
bonobo_object_corba_objref (BONOBO_OBJECT (composer->uih)));
if (control == NULL) {
- g_warning ("Cannot get the `control:html-editor' component.");
+ g_error ("Cannot get `%s'.", HTML_EDITOR_CONTROL_ID);
return NULL;
}