diff options
| -rw-r--r-- | composer/ChangeLog | 5 | ||||
| -rw-r--r-- | composer/e-msg-composer.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog index bae09c37ab..9526622354 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,8 @@ +2000-03-17 bertrand <bertrand@helixcode.com> + + * e-msg-composer.c (create_menubar): Pass the composer as the data + for the menubar callbacks. + 2000-03-12 Matt Loper <matt@helixcode.com> * Makefile.am: Modified to make the composer into a library, to be diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index d413b8d41a..3b822863dc 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -72,7 +72,7 @@ create_editor (EMsgComposer *composer) corba_uih = bonobo_object_corba_objref (BONOBO_OBJECT (composer->uih)); /* FIXME: Hardcoded value sucks! */ - control = bonobo_widget_new_control ("control:html-editor", corba_uih); + control = bonobo_widget_new_control ("control:html-editor", NULL /*corba_uih*/); if (control == NULL) { g_warning ("Cannot get the `control:html-editor' component."); return NULL; @@ -336,7 +336,7 @@ create_menubar (EMsgComposer *composer) bonobo_ui_handler_create_menubar (uih); - list = bonobo_ui_handler_menu_parse_uiinfo_list (menubar_info); + list = bonobo_ui_handler_menu_parse_uiinfo_list_with_data (menubar_info, composer); bonobo_ui_handler_menu_add_list (uih, "/", list); } |