From 5619735c1f410b59cc0fa2a539b699d2821aeb1e Mon Sep 17 00:00:00 2001
From: Patrick McDermott <pj@pehjota.net>
Date: Fri, 06 Oct 2017 16:10:36 -0400
Subject: MqConfig: Pass MqConfig object to notification callbacks

And update callbacks in src/web-settings.c.
---
(limited to 'src/web-settings.c')

diff --git a/src/web-settings.c b/src/web-settings.c
index d597c4e..00918cb 100644
--- a/src/web-settings.c
+++ b/src/web-settings.c
@@ -153,8 +153,8 @@ static struct mapping mappings[] = {
 static GHashTable *mappings_table = NULL;
 
 static void
-wks_bool_cb(const gchar *name, const gboolean value,
-	WebKitSettings *wk_settings)
+wks_bool_cb(MqConfig __attribute__((unused)) *config, const gchar *name,
+	const gboolean value, WebKitSettings *wk_settings)
 {
 	GValue g_value = G_VALUE_INIT;
 
@@ -165,8 +165,8 @@ wks_bool_cb(const gchar *name, const gboolean value,
 }
 
 static void
-wks_bool_n_cb(const gchar *name, const gboolean value,
-	WebKitSettings *wk_settings)
+wks_bool_n_cb(MqConfig __attribute__((unused)) *config, const gchar *name,
+	const gboolean value, WebKitSettings *wk_settings)
 {
 	GValue g_value = G_VALUE_INIT;
 
@@ -177,7 +177,8 @@ wks_bool_n_cb(const gchar *name, const gboolean value,
 }
 
 static void
-wks_int_cb(const gchar *name, const gint value, WebKitSettings *wk_settings)
+wks_int_cb(MqConfig __attribute__((unused)) *config, const gchar *name,
+	const gint value, WebKitSettings *wk_settings)
 {
 	GValue g_value = G_VALUE_INIT;
 
@@ -188,7 +189,8 @@ wks_int_cb(const gchar *name, const gint value, WebKitSettings *wk_settings)
 }
 
 static void
-wks_str_cb(const gchar *name, const gchar *value, WebKitSettings *wk_settings)
+wks_str_cb(MqConfig __attribute__((unused)) *config, const gchar *name,
+	const gchar *value, WebKitSettings *wk_settings)
 {
 	GValue g_value = G_VALUE_INIT;
 
@@ -231,7 +233,7 @@ mq_web_settings_connect(MqConfig *config, WebKitSettings *wk_settings,
 					mappings[i].mq_name,
 					(MqConfigBooleanCallback) wks_bool_cb,
 					wk_settings);
-				wks_bool_cb(mappings[i].mq_name,
+				wks_bool_cb(config, mappings[i].mq_name,
 					mq_config_get_boolean(config,
 						mappings[i].mq_name),
 					wk_settings);
@@ -241,7 +243,7 @@ mq_web_settings_connect(MqConfig *config, WebKitSettings *wk_settings,
 					mappings[i].mq_name,
 					(MqConfigBooleanCallback) wks_bool_n_cb,
 					wk_settings);
-				wks_bool_n_cb(mappings[i].mq_name,
+				wks_bool_n_cb(config, mappings[i].mq_name,
 					mq_config_get_boolean(config,
 						mappings[i].mq_name),
 					wk_settings);
@@ -251,7 +253,7 @@ mq_web_settings_connect(MqConfig *config, WebKitSettings *wk_settings,
 					mappings[i].mq_name,
 					(MqConfigIntegerCallback) wks_int_cb,
 					wk_settings);
-				wks_int_cb(mappings[i].mq_name,
+				wks_int_cb(config, mappings[i].mq_name,
 					mq_config_get_integer(config,
 						mappings[i].mq_name),
 					wk_settings);
@@ -261,7 +263,7 @@ mq_web_settings_connect(MqConfig *config, WebKitSettings *wk_settings,
 					mappings[i].mq_name,
 					(MqConfigStringCallback) wks_str_cb,
 					wk_settings);
-				wks_str_cb(mappings[i].mq_name,
+				wks_str_cb(config, mappings[i].mq_name,
 					mq_config_get_string(config,
 						mappings[i].mq_name),
 					wk_settings);
--
cgit v0.9.1