[webkit-changes] [218090] trunk/Tools

Sun, 11 Jun 2017 23:54:49 -0700

Title: [218090] trunk/Tools
Revision
218090
Author
[email protected]
Date
2017-06-11 23:54:04 -0700 (Sun, 11 Jun 2017)

Log Message

Unreviewed. Fix GTK+ test /webkit2/WebKitAutomationSession/request-session after r217831.

DBus interface and object path names were updated in r217831.

* TestWebKitAPI/Tests/WebKit2Gtk/TestAutomationSession.cpp:

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (218089 => 218090)


--- trunk/Tools/ChangeLog	2017-06-12 06:05:05 UTC (rev 218089)
+++ trunk/Tools/ChangeLog	2017-06-12 06:54:04 UTC (rev 218090)
@@ -1,3 +1,11 @@
+2017-06-11  Carlos Garcia Campos  <[email protected]>
+
+        Unreviewed. Fix GTK+ test /webkit2/WebKitAutomationSession/request-session after r217831.
+
+        DBus interface and object path names were updated in r217831.
+
+        * TestWebKitAPI/Tests/WebKit2Gtk/TestAutomationSession.cpp:
+
 2017-06-10  Dan Bernstein  <[email protected]>
 
         Reverted r218056 because it made the IDE reindex constantly.

Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestAutomationSession.cpp (218089 => 218090)


--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestAutomationSession.cpp	2017-06-12 06:05:05 UTC (rev 218089)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestAutomationSession.cpp	2017-06-12 06:54:04 UTC (rev 218090)
@@ -95,7 +95,7 @@
     {
         static const char introspectionXML[] =
             "<node>"
-            "  <interface name='org.webkitgtk.RemoteInspectorClient'>"
+            "  <interface name='org.webkit.RemoteInspectorClient'>"
             "    <method name='SetTargetList'>"
             "      <arg type='t' name='connectionID' direction='in'/>"
             "      <arg type='a(tsssb)' name='list' direction='in'/>"
@@ -110,7 +110,7 @@
         static GDBusNodeInfo* introspectionData = nullptr;
         if (!introspectionData)
             introspectionData = g_dbus_node_info_new_for_xml(introspectionXML, nullptr);
-        g_dbus_connection_register_object(m_connection.get(), "/org/webkitgtk/RemoteInspectorClient", introspectionData->interfaces[0], &s_interfaceVTable, this, nullptr, nullptr);
+        g_dbus_connection_register_object(m_connection.get(), "/org/webkit/RemoteInspectorClient", introspectionData->interfaces[0], &s_interfaceVTable, this, nullptr, nullptr);
     }
 
     void setConnection(GRefPtr<GDBusConnection>&& connection)
@@ -153,7 +153,7 @@
             messageBuilder.append(parameters);
         }
         messageBuilder.append('}');
-        g_dbus_connection_call(m_connection.get(), nullptr, "/org/webkitgtk/Inspector", "org.webkitgtk.Inspector",
+        g_dbus_connection_call(m_connection.get(), nullptr, "/org/webkit/Inspector", "org.webkit.Inspector",
             "SendMessageToBackend", g_variant_new("(tts)", m_connectionID, m_target.id, messageBuilder.toString().utf8().data()),
             nullptr, G_DBUS_CALL_FLAGS_NO_AUTO_START, -1, nullptr, nullptr, nullptr);
     }
@@ -180,7 +180,7 @@
     WebKitAutomationSession* requestSession(const char* sessionID)
     {
         auto signalID = g_signal_connect(m_webContext.get(), "automation-started", G_CALLBACK(automationStartedCallback), this);
-        g_dbus_connection_call(m_connection.get(), nullptr, "/org/webkitgtk/Inspector", "org.webkitgtk.Inspector",
+        g_dbus_connection_call(m_connection.get(), nullptr, "/org/webkit/Inspector", "org.webkit.Inspector",
             "StartAutomationSession", g_variant_new("(s)", sessionID), nullptr, G_DBUS_CALL_FLAGS_NO_AUTO_START, -1, nullptr, nullptr, nullptr);
         auto timeoutID = g_timeout_add(1000, [](gpointer userData) -> gboolean {
             g_main_loop_quit(static_cast<GMainLoop*>(userData));
@@ -200,7 +200,7 @@
         if (m_target.isPaired)
             return;
         g_assert(m_target.id);
-        g_dbus_connection_call(m_connection.get(), nullptr, "/org/webkitgtk/Inspector", "org.webkitgtk.Inspector",
+        g_dbus_connection_call(m_connection.get(), nullptr, "/org/webkit/Inspector", "org.webkit.Inspector",
             "Setup", g_variant_new("(tt)", m_connectionID, m_target.id), nullptr, G_DBUS_CALL_FLAGS_NO_AUTO_START, -1, nullptr, nullptr, nullptr);
         g_main_loop_run(m_mainLoop.get());
         g_assert(m_target.isPaired);

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to