diff options
| author | Tomas Popela <tpopela@redhat.com> | 2014-06-09 22:32:25 +0800 |
|---|---|---|
| committer | Tomas Popela <tpopela@redhat.com> | 2014-06-09 22:32:25 +0800 |
| commit | 8650fb139a9143f04615de74ff569bce3e0c4ce3 (patch) | |
| tree | 89a41d08f179a5359b8eaee0c9344b8a5bf07cb3 /plugins/email-custom-header/email-custom-header.c | |
| parent | 04b7c97275ae420dca43f3e65c2ef54d02f01bdd (diff) | |
| download | gsoc2013-evolution-8650fb139a9143f04615de74ff569bce3e0c4ce3.tar gsoc2013-evolution-8650fb139a9143f04615de74ff569bce3e0c4ce3.tar.gz gsoc2013-evolution-8650fb139a9143f04615de74ff569bce3e0c4ce3.tar.bz2 gsoc2013-evolution-8650fb139a9143f04615de74ff569bce3e0c4ce3.tar.lz gsoc2013-evolution-8650fb139a9143f04615de74ff569bce3e0c4ce3.tar.xz gsoc2013-evolution-8650fb139a9143f04615de74ff569bce3e0c4ce3.tar.zst gsoc2013-evolution-8650fb139a9143f04615de74ff569bce3e0c4ce3.zip | |
Bug 540362: [webkit-composer] Use webkit for composer
Merge wip/webkit-composer branch into master.
Diffstat (limited to 'plugins/email-custom-header/email-custom-header.c')
| -rw-r--r-- | plugins/email-custom-header/email-custom-header.c | 11 |
1 files changed, 6 insertions, 5 deletions
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; |