aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer/ChangeLog6
-rw-r--r--composer/e-msg-composer.c11
2 files changed, 10 insertions, 7 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 7f9000c2ab..9e90314668 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,9 @@
+2000-04-25 Radek Doulik <rodo@helixcode.com>
+
+ * e-msg-composer.c (create_editor): use uih here
+ (e_msg_composer_construct): create menubar/toolbar before creating
+ editor control
+
2000-04-23 Dan Winship <danw@helixcode.com>
* Makefile.am: build libcomposer static and don't install it.
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index b2f59adccb..0271666454 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -68,12 +68,10 @@ static GtkWidget *
create_editor (EMsgComposer *composer)
{
GtkWidget *control;
- Bonobo_UIHandler corba_uih;
-
- corba_uih = bonobo_object_corba_objref (BONOBO_OBJECT (composer->uih));
/* FIXME: Hardcoded value sucks! */
- control = bonobo_widget_new_control ("control:html-editor", NULL /*corba_uih*/);
+ control = bonobo_widget_new_control ("control:html-editor",
+ bonobo_object_corba_objref (BONOBO_OBJECT (composer->uih)));
if (control == NULL) {
g_warning ("Cannot get the `control:html-editor' component.");
return NULL;
@@ -606,6 +604,8 @@ e_msg_composer_construct (EMsgComposer *composer)
/* Editor component. */
+ create_menubar (composer);
+ create_toolbar (composer);
composer->editor = create_editor (composer);
gtk_widget_show (composer->editor);
@@ -635,9 +635,6 @@ e_msg_composer_construct (EMsgComposer *composer)
gtk_widget_show (vbox);
e_msg_composer_show_attachments (composer, FALSE);
-
- create_menubar (composer);
- create_toolbar (composer);
}
/**