aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/mail-signature-editor.c7
2 files changed, 11 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index d0b30ca18b..309799a36d 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2005-01-12 Not Zed <NotZed@Ximian.com>
+
+ ** See bug #70018.
+
+ * mail-signature-editor.c (mail_signature_editor): use the right
+ version for the gtkhtml editor control.
+
2005-01-11 Vivek Jain <jvivek@novell.com>
* em-folder-tree.c (render_pixbuf): Added conditions to check for
diff --git a/mail/mail-signature-editor.c b/mail/mail-signature-editor.c
index f1e2985785..ead7ec3469 100644
--- a/mail/mail-signature-editor.c
+++ b/mail/mail-signature-editor.c
@@ -45,6 +45,7 @@
#define d(x)
+#define GNOME_GTKHTML_EDITOR_CONTROL_ID "OAFIID:GNOME_GtkHTML_Editor:" GTKHTML_API_VERSION
typedef struct _ESignatureEditor {
GtkWidget *win;
@@ -383,12 +384,12 @@ mail_signature_editor (ESignature *sig, GtkWindow *parent, gboolean is_new)
bonobo_ui_util_set_ui (component, PREFIX,
EVOLUTION_UIDIR "/evolution-signature-editor.xml",
"evolution-signature-editor", NULL);
-
- editor->control = bonobo_widget_new_control ("OAFIID:GNOME_GtkHTML_Editor:3.1",
+
+ editor->control = bonobo_widget_new_control (GNOME_GTKHTML_EDITOR_CONTROL_ID,
bonobo_ui_component_get_container (component));
if (editor->control == NULL) {
- g_warning ("Cannot get 'OAFIID:GNOME_GtkHTML_Editor:3.1'.");
+ g_warning ("Cannot get '" GNOME_GTKHTML_EDITOR_CONTROL_ID "'.");
destroy_editor (editor);
return;