diff options
author | Dan Winship <danw@src.gnome.org> | 2000-07-25 09:20:48 +0800 |
---|---|---|
committer | Dan Winship <danw@src.gnome.org> | 2000-07-25 09:20:48 +0800 |
commit | c09bf799645c1e54e013f85fd4c9beba6704392a (patch) | |
tree | bf6f863f80b3fd160f4a45cc1f5d69b057eaff0e | |
parent | dbf077d9dd938f2aeccf6d907e5d87e106a92739 (diff) | |
download | gsoc2013-evolution-c09bf799645c1e54e013f85fd4c9beba6704392a.tar.gz gsoc2013-evolution-c09bf799645c1e54e013f85fd4c9beba6704392a.tar.zst gsoc2013-evolution-c09bf799645c1e54e013f85fd4c9beba6704392a.zip |
Remove GOAD support. (create_editor): Try to give a more helpful error
* e-msg-composer.c: Remove GOAD support.
(create_editor): Try to give a more helpful error message when
failing to load the editor control.
svn path=/trunk/; revision=4300
-rw-r--r-- | composer/ChangeLog | 6 | ||||
-rw-r--r-- | composer/e-msg-composer.c | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog index 780e111585..e0247458e1 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,9 @@ +2000-07-24 Dan Winship <danw@helixcode.com> + + * e-msg-composer.c: Remove GOAD support. + (create_editor): Try to give a more helpful error message when + failing to load the editor control. + 2000-07-23 Ettore Perazzoli <ettore@helixcode.com> * e-msg-composer.c (menu_format_html_cb): New callback for the diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index 7249350d0e..cdf9b354a0 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -54,11 +54,7 @@ #include "e-msg-composer-hdrs.h" #include "e-msg-composer-select-file.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 @@ -83,7 +79,7 @@ create_editor (EMsgComposer *composer) control = bonobo_widget_new_control (HTML_EDITOR_CONTROL_ID, bonobo_object_corba_objref (BONOBO_OBJECT (composer->uih))); if (control == NULL) { - g_error ("Cannot get `%s'.", HTML_EDITOR_CONTROL_ID); + g_error ("Cannot activate `%s'. Did you build gtkhtml with Bonobo and OAF support?", HTML_EDITOR_CONTROL_ID); return NULL; } |