From dc5dd489e478b474741285d8b753fd5c789e2c51 Mon Sep 17 00:00:00 2001
From: Patrick McDermott <pj@pehjota.net>
Date: Mon, 30 Oct 2017 15:29:46 -0400
Subject: MqWebViewScheme: Convert to struct with anonymous union

---
(limited to 'src/web-view-schemes')

diff --git a/src/web-view-schemes/schemes.h b/src/web-view-schemes/schemes.h
index e6f82d4..7ed7a0b 100644
--- a/src/web-view-schemes/schemes.h
+++ b/src/web-view-schemes/schemes.h
@@ -19,7 +19,7 @@
  * along with Marquee.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-typedef union _MqWebViewScheme MqWebViewScheme;
+typedef struct _MqWebViewScheme MqWebViewScheme;
 
 #ifndef MQ_WEB_VIEW_SCHEMES_H
 #define MQ_WEB_VIEW_SCHEMES_H
@@ -43,14 +43,17 @@ typedef struct {
 	const gchar  *uri;
 } MqWebViewViewSourceScheme;
 
-union _MqWebViewScheme {
-	MqWebViewNormalScheme     normal;
-	MqWebViewViewSourceScheme view_source;
+struct _MqWebViewScheme {
+	union {  /* C11: Anonymous union whose members are accessed directly */
+		MqWebViewNormalScheme     normal;
+		MqWebViewViewSourceScheme view_source;
+	};
 };
 
 typedef struct {
 	gboolean (*match_uri)   (const gchar *uri);
 	void     (*initialize)  (MqWebView *, MqWebViewScheme *, const gchar *);
+	gboolean (*ready)       (MqWebView *, MqWebViewScheme *);
 	void     (*finalize)    (MqWebViewScheme *);
 	gchar *  (*rewrite_uri) (MqWebView *, MqWebViewScheme *, const gchar *);
 	gchar *  (*display_uri) (MqWebView *, MqWebViewScheme *, const gchar *);
--
cgit v0.9.1