Branch: refs/heads/master Author: Matthew Brush matt@geany.org Committer: Matthew Brush matt@geany.org Date: Tue, 15 May 2018 00:53:01 UTC Commit: 1b84e29992beaa40e25a40b20100b19170cc9448 https://github.com/geany/geany-plugins/commit/1b84e29992beaa40e25a40b20100b1...

Log Message: ----------- Markdown: Fix a typo in the Makefile.am

Also add namespace prefix to new macros to avoid clashing with Webkit (or other) sources.

Modified Paths: -------------- markdown/src/Makefile.am markdown/src/viewer.c markdown/src/viewer.h

Modified: markdown/src/Makefile.am 5 lines changed, 3 insertions(+), 2 deletions(-) =================================================================== @@ -35,7 +35,8 @@ markdown_la_CFLAGS += $(LIBMARKDOWN_CFLAGS) markdown_la_LIBADD += $(LIBMARKDOWN_LIBS) endif

-if WEBKIT2 -markdown_la_CFLAGS += -DWEBKIT2 +if MARKDOWN_WEBKIT2 +markdown_la_CFLAGS += -DMARKDOWN_WEBKIT2 +endif

include $(top_srcdir)/build/cppcheck.mk

Modified: markdown/src/viewer.c 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -22,7 +22,7 @@ #include "config.h" #include <string.h> #include <gtk/gtk.h> -#ifdef WEBKIT2 +#ifdef MARKDOWN_WEBKIT2 # include <webkit2/webkit2.h> #else # include <webkit/webkitwebview.h> @@ -300,7 +300,7 @@ pop_scroll_pos(MarkdownViewer *self) return popped; }

-#ifdef WEBKIT2 +#ifdef MARKDOWN_WEBKIT2 static void on_webview_load_changed(MarkdownViewer *self, WebKitLoadEvent load_event, @@ -405,7 +405,7 @@ markdown_viewer_update_view(MarkdownViewer *self) /* Connect a signal handler (only needed once) to restore the scroll * position once the webview is reloaded. */ if (self->priv->load_handle == 0) { -#ifdef WEBKIT2 +#ifdef MARKDOWN_WEBKIT2 self->priv->load_handle = g_signal_connect_swapped(WEBKIT_WEB_VIEW(self), "load-changed", G_CALLBACK(on_webview_load_changed), self); @@ -416,7 +416,7 @@ markdown_viewer_update_view(MarkdownViewer *self) #endif }

-#ifdef WEBKIT2 +#ifdef MARKDOWN_WEBKIT2 webkit_web_view_load_html(WEBKIT_WEB_VIEW(self), html, base_uri); #else webkit_web_view_load_string(WEBKIT_WEB_VIEW(self), html, "text/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> -#ifdef WEBKIT2 +#ifdef MARKDOWN_WEBKIT2 # include <webkit2/webkit2.h> #else # include <webkit/webkitwebview.h>

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