[evolution/wip/webkit2] Rename some link dialog related functions

[Tomas Popela <tpopela src gnome org>]

commit 9e13295695eeb995f11c1f34146c2f46dd1636d4
Author: Tomas Popela <tpopela redhat com>
Date:   Tue Jul 19 17:40:52 2016 +0200

    Rename some link dialog related functions

 modules/webkit-editor/e-webkit-editor.c            |    4 +-
 .../web-extension/e-dialogs-dom-functions.c        |    4 +-
 .../web-extension/e-dialogs-dom-functions.h        |    6 +++-
 .../web-extension/e-editor-web-extension.c         |   26 ++++++++++----------
 4 files changed, 21 insertions(+), 19 deletions(-)
---
diff --git a/modules/webkit-editor/e-webkit-editor.c b/modules/webkit-editor/e-webkit-editor.c
index b64404d..fa23bb9 100644
--- a/modules/webkit-editor/e-webkit-editor.c
+++ b/modules/webkit-editor/e-webkit-editor.c
@@ -3290,7 +3290,7 @@ webkit_editor_on_link_dialog_open (EContentEditor *editor)
        wk_editor = E_WEBKIT_EDITOR (editor);
 
        webkit_editor_call_simple_extension_function (
-               wk_editor, "EEditorLinkDialogOpen");
+               wk_editor, "EEditorLinkDialogOnOpen");
 }
 
 static void
@@ -3301,7 +3301,7 @@ webkit_editor_on_link_dialog_close (EContentEditor *editor)
        wk_editor = E_WEBKIT_EDITOR (editor);
 
        webkit_editor_call_simple_extension_function (
-               wk_editor, "EEditorLinkDialogClose");
+               wk_editor, "EEditorLinkDialogOnClose");
 }
 
 static void
diff --git a/modules/webkit-editor/web-extension/e-dialogs-dom-functions.c 
b/modules/webkit-editor/web-extension/e-dialogs-dom-functions.c
index f678edd..033e98d 100644
--- a/modules/webkit-editor/web-extension/e-dialogs-dom-functions.c
+++ b/modules/webkit-editor/web-extension/e-dialogs-dom-functions.c
@@ -774,7 +774,7 @@ e_dialogs_dom_link_commit (EEditorPage *editor_page,
 }
 
 void
-e_dialogs_dom_link_close (EEditorPage *editor_page)
+e_dialogs_dom_link_dialog_on_close (EEditorPage *editor_page)
 {
        WebKitDOMDocument *document;
        WebKitDOMElement *link;
@@ -805,7 +805,7 @@ e_dialogs_dom_link_close (EEditorPage *editor_page)
 }
 
 void
-e_dialogs_dom_link_open (EEditorPage *editor_page)
+e_dialogs_dom_link_dialog_on_open (EEditorPage *editor_page)
 {
        EEditorUndoRedoManager *manager;
        WebKitDOMDocument *document;
diff --git a/modules/webkit-editor/web-extension/e-dialogs-dom-functions.h 
b/modules/webkit-editor/web-extension/e-dialogs-dom-functions.h
index 1e5188f..db28b49 100644
--- a/modules/webkit-editor/web-extension/e-dialogs-dom-functions.h
+++ b/modules/webkit-editor/web-extension/e-dialogs-dom-functions.h
@@ -87,8 +87,10 @@ void         e_dialogs_dom_link_commit       (EEditorPage *editor_page,
                                                 const gchar *url,
                                                 const gchar *inner_text);
 GVariant *     e_dialogs_dom_link_show         (EEditorPage *editor_page);
-void           e_dialogs_dom_link_open         (EEditorPage *editor_page);
-void           e_dialogs_dom_link_close        (EEditorPage *editor_page);
+void           e_dialogs_dom_link_dialog_on_open
+                                               (EEditorPage *editor_page);
+void           e_dialogs_dom_link_dialog_on_close
+                                               (EEditorPage *editor_page);
 
 /* ******************** Page Dialog ***************** */
 
diff --git a/modules/webkit-editor/web-extension/e-editor-web-extension.c 
b/modules/webkit-editor/web-extension/e-editor-web-extension.c
index ab9591b..ad81ec9 100644
--- a/modules/webkit-editor/web-extension/e-editor-web-extension.c
+++ b/modules/webkit-editor/web-extension/e-editor-web-extension.c
@@ -283,6 +283,15 @@ static const gchar *introspection_xml =
 "      <arg type='s' name='url' direction='out'/>"
 "      <arg type='s' name='inner_text' direction='out'/>"
 "    </method>"
+"    <method name='EEditorLinkDialogOnOpen'>"
+"      <arg type='t' name='page_id' direction='in'/>"
+"    </method>"
+"    <method name='EEditorLinkDialogOnClose'>"
+"      <arg type='t' name='page_id' direction='in'/>"
+"    </method>"
+"    <method name='EEditorLinkDialogUnlink'>"
+"      <arg type='t' name='page_id' direction='in'/>"
+"    </method>"
 "<!-- ********************************************************* -->"
 "<!--     Functions that are used in EEditorPageDialog     -->"
 "<!-- ********************************************************* -->"
@@ -375,15 +384,6 @@ static const gchar *introspection_xml =
 "    <method name='EEditorDialogInsertRowBelow'>"
 "      <arg type='t' name='page_id' direction='in'/>"
 "    </method>"
-"    <method name='EEditorLinkDialogOpen'>"
-"      <arg type='t' name='page_id' direction='in'/>"
-"    </method>"
-"    <method name='EEditorLinkDialogClose'>"
-"      <arg type='t' name='page_id' direction='in'/>"
-"    </method>"
-"    <method name='EEditorLinkDialogUnlink'>"
-"      <arg type='t' name='page_id' direction='in'/>"
-"    </method>"
 "    <method name='EEditorDialogSaveHistoryForCut'>"
 "      <arg type='t' name='page_id' direction='in'/>"
 "    </method>"
@@ -1472,24 +1472,24 @@ handle_method_call (GDBusConnection *connection,
                e_editor_dom_insert_row_below (editor_page);
 
                g_dbus_method_invocation_return_value (invocation, NULL);
-       } else if (g_strcmp0 (method_name, "EEditorLinkDialogOpen") == 0) {
+       } else if (g_strcmp0 (method_name, "EEditorLinkDialogOnOpen") == 0) {
                g_variant_get (parameters, "(t)", &page_id);
 
                editor_page = get_editor_page_or_return_dbus_error (invocation, extension, page_id);
                if (!editor_page)
                        goto error;
 
-               e_dialogs_dom_link_open (editor_page);
+               e_dialogs_dom_link_dialog_on_open (editor_page);
 
                g_dbus_method_invocation_return_value (invocation, NULL);
-       } else if (g_strcmp0 (method_name, "EEditorLinkDialogClose") == 0) {
+       } else if (g_strcmp0 (method_name, "EEditorLinkDialogOnClose") == 0) {
                g_variant_get (parameters, "(t)", &page_id);
 
                editor_page = get_editor_page_or_return_dbus_error (invocation, extension, page_id);
                if (!editor_page)
                        goto error;
 
-               e_dialogs_dom_link_close (editor_page);
+               e_dialogs_dom_link_dialog_on_close (editor_page);
 
                g_dbus_method_invocation_return_value (invocation, NULL);
        } else if (g_strcmp0 (method_name, "EEditorLinkDialogUnlink") == 0) {