Branch: refs/heads/master Author: Chow Loong Jin hyperair@debian.org Committer: Chow Loong Jin hyperair@debian.org Date: Wed, 17 Jan 2018 17:29:42 UTC Commit: 1b354aa6013bdebc58717783be9275d31ae741d6 https://github.com/geany/geany-plugins/commit/1b354aa6013bdebc58717783be9275...

Log Message: ----------- Merge remote-tracking branch 'sergiomb2/master' into webkit2gtk

Modified Paths: -------------- build/markdown.m4 build/webhelper.m4 markdown/src/viewer.c markdown/src/viewer.h

Modified: build/markdown.m4 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -49,8 +49,8 @@ AC_DEFUN([GP_CHECK_MARKDOWN], GTK_VERSION=2.16 WEBKIT_VERSION=1.1.13

- GP_CHECK_GTK3([webkit_package=webkitgtk-3.0], - [webkit_package=webkit-1.0]) + GP_CHECK_GTK3([webkit_package=webkit2gtk-4.0], + [webkit_package=webkit2gtk-4.0])

GP_CHECK_PLUGIN_DEPS([markdown], [MARKDOWN], [$GP_GTK_PACKAGE >= ${GTK_VERSION}

Modified: build/webhelper.m4 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -20,7 +20,7 @@ AC_DEFUN([GP_CHECK_WEBHELPER], fi

GP_CHECK_GTK3([webkit_package=webkit2gtk-4.0], - [webkit_package=webkit-1.0]) + [webkit_package=webkit2gtk-4.0]) GP_CHECK_PLUGIN_DEPS([WebHelper], [WEBHELPER], [$GP_GTK_PACKAGE >= ${GTK_VERSION} glib-2.0 >= ${GLIB_VERSION}

Modified: markdown/src/viewer.c 7 lines changed, 3 insertions(+), 4 deletions(-) =================================================================== @@ -22,7 +22,7 @@ #include "config.h" #include <string.h> #include <gtk/gtk.h> -#include <webkit/webkitwebview.h> +#include <webkit2/webkit2.h> #include <geanyplugin.h> #ifndef FULL_PRICE # include <mkdio.h> @@ -300,7 +300,7 @@ static void on_webview_load_status_notify(WebKitWebView *view, GParamSpec *pspec, MarkdownViewer *self) { - WebKitLoadStatus load_status; + WebKitLoadEvent load_status;

g_object_get(view, "load-status", &load_status, NULL);

@@ -393,8 +393,7 @@ markdown_viewer_update_view(MarkdownViewer *self) G_CALLBACK(on_webview_load_status_notify), self); }

- webkit_web_view_load_string(WEBKIT_WEB_VIEW(self), html, "text/html", - self->priv->enc, base_uri); + webkit_web_view_load_html(WEBKIT_WEB_VIEW(self), html, base_uri);

g_free(base_uri); g_free(html);

Modified: markdown/src/viewer.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -23,7 +23,7 @@ #define MARKDOWN_VIEWER_H 1

#include <gtk/gtk.h> -#include <webkit/webkitwebview.h> +#include <webkit2/webkit2.h>

G_BEGIN_DECLS

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).