diff options
Diffstat (limited to 'plugins/email-custom-header')
| -rw-r--r-- | plugins/email-custom-header/Makefile.am | 6 | ||||
| -rw-r--r-- | plugins/email-custom-header/email-custom-header.c | 11 |
2 files changed, 9 insertions, 8 deletions
diff --git a/plugins/email-custom-header/Makefile.am b/plugins/email-custom-header/Makefile.am index 7014929882..04d0536ba3 100644 --- a/plugins/email-custom-header/Makefile.am +++ b/plugins/email-custom-header/Makefile.am @@ -12,8 +12,8 @@ liborg_gnome_email_custom_header_la_CPPFLAGS = \ -I$(top_builddir)/composer \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) + $(CODE_COVERAGE_CFLAGS) \ + $(NULL) liborg_gnome_email_custom_header_la_SOURCES = \ email-custom-header.c \ @@ -25,7 +25,7 @@ liborg_gnome_email_custom_header_la_LIBADD = \ $(top_builddir)/mail/libevolution-mail.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) + $(NULL) liborg_gnome_email_custom_header_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS) diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c index d933e1ae82..eed2954857 100644 --- a/plugins/email-custom-header/email-custom-header.c +++ b/plugins/email-custom-header/email-custom-header.c @@ -495,15 +495,16 @@ destroy_compo_data (gpointer data) static void action_email_custom_header_cb (GtkAction *action, EMsgComposer *composer) - { GtkUIManager *ui_manager; GtkWidget *menuitem; GdkWindow *window; CustomHeaderOptionsDialog *dialog = NULL; EmailCustomHeaderWindow *new_email_custom_header_window = NULL; + EHTMLEditor *editor; - ui_manager = gtkhtml_editor_get_ui_manager (GTKHTML_EDITOR (composer)); + editor = e_msg_composer_get_editor (composer); + ui_manager = e_html_editor_get_ui_manager (editor); menuitem = gtk_ui_manager_get_widget (ui_manager, "/main-menu/insert-menu/insert-menu-top/Custom Header"); new_email_custom_header_window = g_object_get_data ((GObject *) composer, "compowindow"); @@ -545,13 +546,13 @@ gboolean e_plugin_ui_init (GtkUIManager *ui_manager, EMsgComposer *composer) { - GtkhtmlEditor *editor; + EHTMLEditor *editor; - editor = GTKHTML_EDITOR (composer); + editor = e_msg_composer_get_editor (composer); /* Add actions to the "composer" action group. */ gtk_action_group_add_actions ( - gtkhtml_editor_get_action_group (editor, "composer"), + e_html_editor_get_action_group (editor, "composer"), entries, G_N_ELEMENTS (entries), composer); return TRUE; |