Tell WebKit where to look for web extensions

1 files changed, 12 insertions, 0 deletions

diff --git a/browser.c b/browser.c
index cf8d2a0..b73f317 100644
--- a/browser.c
+++ b/browser.c
@@ -80,6 +80,7 @@ static gboolean language_is_set = FALSE;
 static gchar *search_text = NULL;
 static gboolean tabbed_automagic = TRUE;
 static gchar *user_agent = NULL;
+static gchar *web_extensions_dir = NULL;
 
 
 void
@@ -516,6 +517,13 @@ grab_environment_configuration(void)
 	if (e != NULL)
 		user_agent = g_strdup(e);
 
+	e = g_getenv(__NAME_UPPERCASE__"_WEB_EXTENSIONS_DIR");
+	if (e != NULL)
+		web_extensions_dir = g_strdup(e);
+	else
+		web_extensions_dir = g_build_filename(g_get_user_data_dir(), __NAME__,
+		                                      "web_extensions", NULL);
+
 	e = g_getenv(__NAME_UPPERCASE__"_ZOOM");
 	if (e != NULL)
 		global_zoom = atof(e);
@@ -907,6 +915,10 @@ main(int argc, char **argv)
 	if (tabbed_automagic && !(cooperative_instances && !cooperative_alone))
 		embed = tabbed_launch();
 
+	if (!cooperative_instances || cooperative_alone)
+		webkit_web_context_set_web_extensions_directory(webkit_web_context_get_default(),
+		                                                web_extensions_dir);
+
 	if (optind >= argc)
 		client_new(home_uri);
 	else