MqConfig: Pass MqConfig object to notification callbacks

And update callbacks in src/web-settings.c.

3 files changed, 24 insertions, 19 deletions

diff --git a/src/config.c b/src/config.c
index 1fe29ba..a841141 100644
--- a/src/config.c
+++ b/src/config.c
@@ -318,22 +318,22 @@ set_type_or_run_callbacks(MqConfig *config, const gchar *name,
 		for (cbs = item->callbacks; cbs; cbs = cbs->next) {
 			switch (item->type) {
 				case TYPE_BOOLEAN:
-					cbs->cb.boolean_cb(name,
+					cbs->cb.boolean_cb(config, name,
 						*((const gboolean *) value),
 						cbs->user_data);
 					break;
 				case TYPE_INTEGER:
-					cbs->cb.integer_cb(name,
+					cbs->cb.integer_cb(config, name,
 						*((const gint *) value),
 						cbs->user_data);
 					break;
 				case TYPE_DOUBLE:
-					cbs->cb.double_cb(name,
+					cbs->cb.double_cb(config, name,
 						*((const gdouble *) value),
 						cbs->user_data);
 					break;
 				case TYPE_STRING:
-					cbs->cb.string_cb(name,
+					cbs->cb.string_cb(config, name,
 						(const gchar *) value,
 						cbs->user_data);
 					break;
diff --git a/src/config.h b/src/config.h
index d76ab3b..55eeed4 100644
--- a/src/config.h
+++ b/src/config.h
@@ -34,11 +34,14 @@ struct MqConfig {
 	GHashTable *types_and_cbs;
 };
 
-typedef void (*MqConfigBooleanCallback)(const gchar *, const gboolean,
-	gpointer);
-typedef void (*MqConfigIntegerCallback)(const gchar *, const gint, gpointer);
-typedef void (*MqConfigDoubleCallback)(const gchar *, const gdouble, gpointer);
-typedef void (*MqConfigStringCallback)(const gchar *, const gchar *, gpointer);
+typedef void (*MqConfigBooleanCallback)(MqConfig *,
+	const gchar *, const gboolean, gpointer);
+typedef void (*MqConfigIntegerCallback)(MqConfig *,
+	const gchar *, const gint, gpointer);
+typedef void (*MqConfigDoubleCallback)(MqConfig *,
+	const gchar *, const gdouble, gpointer);
+typedef void (*MqConfigStringCallback)(MqConfig *,
+	const gchar *, const gchar *, gpointer);
 
 MqConfig *
 mq_config_new(const gchar *profile);
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);