[evolution/gnome-3-18] EHTMLEditorView - Rename variables and functions to more reflect previous change

[Tomas Popela <tpopela src gnome org>]

commit 969f59e8671f1f7c2960a4d2b23e6d2d5933c691
Author: Tomas Popela <tpopela redhat com>
Date:   Mon Dec 7 21:53:44 2015 +0100

    EHTMLEditorView - Rename variables and functions to more reflect previous change

 e-util/e-html-editor-view.c |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/e-util/e-html-editor-view.c b/e-util/e-html-editor-view.c
index ab8c76b..ef0a36b 100644
--- a/e-util/e-html-editor-view.c
+++ b/e-util/e-html-editor-view.c
@@ -107,7 +107,7 @@ struct _EHTMLEditorViewPrivate {
        gboolean smiley_written;
        gboolean undo_redo_in_progress;
        gboolean dont_save_history_in_body_input;
-       gboolean im_input_in_progress;
+       gboolean composition_in_progress;
        gboolean style_change_callbacks_blocked;
        gboolean selection_changed_callbacks_blocked;
        gboolean copy_paste_clipboard_in_view;
@@ -3486,7 +3486,7 @@ body_keyup_event_cb (WebKitDOMElement *element,
        EHTMLEditorSelection *selection;
        glong key_code;
 
-       if (!view->priv->im_input_in_progress)
+       if (!view->priv->composition_in_progress)
                register_input_event_listener_on_body (view);
 
        selection = e_html_editor_view_get_selection (view);
@@ -7739,20 +7739,20 @@ clear_attributes (WebKitDOMDocument *document)
 }
 
 static void
-im_context_preedit_start_cb (WebKitDOMElement *element,
-                             WebKitDOMUIEvent *event,
-                             EHTMLEditorView *view)
+body_compositionstart_event_cb (WebKitDOMElement *element,
+                                WebKitDOMUIEvent *event,
+                                EHTMLEditorView *view)
 {
-       view->priv->im_input_in_progress = TRUE;
+       view->priv->composition_in_progress = TRUE;
        remove_input_event_listener_from_body (view);
 }
 
 static void
-im_context_preedit_end_cb (WebKitDOMElement *element,
-                           WebKitDOMUIEvent *event,
-                           EHTMLEditorView *view)
+body_compositionend_event_cb (WebKitDOMElement *element,
+                              WebKitDOMUIEvent *event,
+                              EHTMLEditorView *view)
 {
-       view->priv->im_input_in_progress = FALSE;
+       view->priv->composition_in_progress = FALSE;
        register_input_event_listener_on_body (view);
 }
 
@@ -7784,14 +7784,14 @@ register_html_events_handlers (EHTMLEditorView *view,
        webkit_dom_event_target_add_event_listener (
                WEBKIT_DOM_EVENT_TARGET (body),
                "compositionstart",
-               G_CALLBACK (im_context_preedit_start_cb),
+               G_CALLBACK (body_compositionstart_event_cb),
                FALSE,
                view);
 
        webkit_dom_event_target_add_event_listener (
                WEBKIT_DOM_EVENT_TARGET (body),
                "compositionend",
-               G_CALLBACK (im_context_preedit_end_cb),
+               G_CALLBACK (body_compositionend_event_cb),
                FALSE,
                view);
 }
@@ -11217,7 +11217,7 @@ e_html_editor_view_init (EHTMLEditorView *view)
                (GDestroyNotify) g_free,
                (GDestroyNotify) g_free);
 
-       view->priv->im_input_in_progress = FALSE;
+       view->priv->composition_in_progress = FALSE;
 
        g_signal_connect (
                view, "copy-clipboard",