Add support for configuring plugins directories

diff --git a/config.def.h b/config.def.h
index 34265f6e89320b984968ebe04899914f671dec95..738f464995383423323030d07de02f8bad43157c 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -6,6 +6,11 @@ static char *styledir       = "~/.surf/styles/";
 static char *certdir        = "~/.surf/certificates/";
 static char *cachedir       = "~/.surf/cache/";
 static char *cookiefile     = "~/.surf/cookies.txt";
+static char **plugindirs    = (char*[]){
+       "~/.surf/plugins/",
+       LIBPREFIX "/mozilla/plugins/",
+       NULL
+};
 
 /* Webkit default features */
 /* Highest priority value will be used.

diff --git a/config.mk b/config.mk
index 7450b5d16d7f34bfd1942a07a77d421a959e8993..694171382d555a66666e6e1c840c6be1474dbb82 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -22,8 +22,9 @@ INCS = $(X11INC) $(GTKINC)
 LIBS = $(X11LIB) $(GTKLIB) -lgthread-2.0
 
 # flags
-CPPFLAGS = -DVERSION=\"$(VERSION)\" -DWEBEXTDIR=\"$(LIBDIR)\" \
-           -D_DEFAULT_SOURCE -DGCR_API_SUBJECT_TO_CHANGE
+CPPFLAGS = -DVERSION=\"$(VERSION)\" -DGCR_API_SUBJECT_TO_CHANGE \
+           -DLIBPREFIX=\"$(LIBPREFIX)\" -DWEBEXTDIR=\"$(LIBDIR)\" \
+           -D_DEFAULT_SOURCE
 SURFCFLAGS = -fPIC $(INCS) $(CPPFLAGS)
 WEBEXTCFLAGS = -fPIC $(WEBEXTINC)
 

diff --git a/surf.c b/surf.c
index 42927e9c8827a3a1d50ad668e12101b1db9ad966..2d25fa43ac08ac5276d10a6965e91ad64d9407b8 100644 (file)
--- a/surf.c
+++ b/surf.c
@@ -1161,6 +1161,10 @@ newview(Client *c, WebKitWebView *rv)
                webkit_web_context_set_cache_model(context,
                    curconfig[DiskCache].val.i ? WEBKIT_CACHE_MODEL_WEB_BROWSER :
                    WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER);
+               /* plugins directories */
+               for (; *plugindirs; ++plugindirs)
+                       webkit_web_context_set_additional_plugins_directory(
+                           context, *plugindirs);
 
                /* Currently only works with text file to be compatible with curl */
                webkit_cookie_manager_set_persistent_storage(cookiemanager,