Merge branch 'hints' into webkit2.

diff --cc src/ext-proxy.c
index 99a2648,2cb2896..5dce15e
--- 1/src/ext-proxy.c
--- 2/src/ext-proxy.c
+++ b/src/ext-proxy.c
@@@ -30,12 -30,10 +30,14 @@@ static gboolean on_new_connection(GDBus
          GDBusConnection *connection, gpointer data);
  static void on_proxy_created (GDBusProxy *proxy, GAsyncResult *result,
          gpointer data);
 +static void on_vertical_scroll(GDBusConnection *connection,
 +        const char *sender_name, const char *object_path,
 +        const char *interface_name, const char *signal_name,
 +        GVariant *parameters, Client *c);
  static void dbus_call(Client *c, const char *method, GVariant *param,
          GAsyncReadyCallback callback);
+ static GVariant *dbus_call_sync(Client *c, const char *method, GVariant
+         *param);
  static void on_web_extension_page_created(GDBusConnection *connection,
          const char *sender_name, const char *object_path,
          const char *interface_name, const char *signal_name,

diff --cc src/normal.c
Simple merge