aboutsummaryrefslogtreecommitdiffstats
path: root/composer/e-msg-composer.c
diff options
context:
space:
mode:
Diffstat (limited to 'composer/e-msg-composer.c')
-rw-r--r--composer/e-msg-composer.c21
1 files changed, 12 insertions, 9 deletions
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 6db5954871..908d59e352 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -58,12 +58,12 @@
#include "e-msg-composer-hdrs.h"
#include "e-msg-composer-select-file.h"
-#include "HTMLEditor.h"
+#include "Editor.h"
#include "listener.h"
#include <libgnomevfs/gnome-vfs.h>
-#define GNOME_GTKHTML_EDITOR_CONTROL_ID "OAFIID:control:html-editor:63c5499b-8b0c-475a-9948-81ec96a9662c"
+#define GNOME_GTKHTML_EDITOR_CONTROL_ID "OAFIID:GNOME_GtkHTML_Editor"
#define DEFAULT_WIDTH 600
@@ -458,19 +458,22 @@ prepare_engine (EMsgComposer *composer)
/* printf ("prepare_engine\n"); */
CORBA_exception_init (&ev);
- composer->editor_engine = (GNOME_HTMLEditor_Engine) bonobo_object_client_query_interface
- (bonobo_widget_get_server (BONOBO_WIDGET (composer->editor)), "IDL:GNOME/HTMLEditor/Engine:1.0", &ev);
+ composer->editor_engine = (GNOME_GtkHTML_Editor_Engine) bonobo_object_client_query_interface
+ (bonobo_widget_get_server (BONOBO_WIDGET (composer->editor)), "IDL:GNOME/GtkHTML/Editor/Engine:1.0", &ev);
if (composer->editor_engine != CORBA_OBJECT_NIL) {
/* printf ("trying set listener\n"); */
- composer->editor_listener = BONOBO_OBJECT (htmleditor_listener_new (composer));
+ composer->editor_listener = BONOBO_OBJECT (listener_new (composer));
if (composer->editor_listener != CORBA_OBJECT_NIL)
- GNOME_HTMLEditor_Engine__set_listener (composer->editor_engine,
- (GNOME_HTMLEditor_Listener)
+ GNOME_GtkHTML_Editor_Engine__set_listener (composer->editor_engine,
+ (GNOME_GtkHTML_Editor_Listener)
bonobo_object_dup_ref
(bonobo_object_corba_objref (composer->editor_listener), &ev),
&ev);
- }
+ else
+ g_warning ("Can't establish Editor Listener\n");
+ } else
+ g_warning ("Can't get Editor Engine\n");
CORBA_exception_free (&ev);
}
@@ -486,7 +489,7 @@ mark_orig_text (EMsgComposer *composer)
*((CORBA_boolean *) flag->_value) = CORBA_TRUE;
CORBA_exception_init (&ev);
- GNOME_HTMLEditor_Engine_setObjectDataByType (composer->editor_engine, "ClueFlow", "orig", flag, &ev);
+ GNOME_GtkHTML_Editor_Engine_setObjectDataByType (composer->editor_engine, "ClueFlow", "orig", flag, &ev);
CORBA_free (flag);
CORBA_exception_free (&ev);
}