[balsa] html: Fix the build
- From: Peter Bloomfield <peterb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [balsa] html: Fix the build
- Date: Mon, 23 Jul 2018 16:45:59 +0000 (UTC)
commit 9ff5995e6c5aade57ce9f56bb82085e218012f67
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date: Mon Jul 23 12:42:40 2018 -0400
html: Fix the build
Revert 38a0985b83f4d80ca4cf5016e08b03ccbca75d28. It broke the build.
libbalsa/html.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/libbalsa/html.c b/libbalsa/html.c
index 6f45aed08..307194e0a 100644
--- a/libbalsa/html.c
+++ b/libbalsa/html.c
@@ -146,13 +146,13 @@ html2text(gchar ** text, gsize len)
* Experimental support for WebKit2.
*/
-#if defined(GTK_DISABLE_DEPRECATED)
/* WebKitContextMenuItem uses GtkAction, which is deprecated.
- * We don't use it, but it breaks the git-tree build, so we temporarily
- * turn off deprecation warnings: */
-#undef GTK_DISABLE_DEPRECATED
+ * We don't use it, but it breaks the git-tree build, so we just mangle
+ * it: */
+#if defined(GTK_DISABLE_DEPRECATED)
+#define GtkAction GAction
#include <webkit2/webkit2.h>
-#define GTK_DISABLE_DEPRECATED
+#undef GtkAction
#else /* defined(GTK_DISABLE_DEPRECATED) */
#include <webkit2/webkit2.h>
#endif /* defined(GTK_DISABLE_DEPRECATED) */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]