Rename web_extensions to web-extensions

diff --git a/Makefile b/Makefile
index 8240e2952499a26d2cf9da2246902458ddc7b724..fe0f4aba950f9f6fdbe345a7a2f863aeba0b00fd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ install: all
        mkdir -p $(bindir) \
                $(mandir)/man1 \
                $(mandir)/man5 \
-               $(libdir)/chorizo/web_extensions \
+               $(libdir)/chorizo/web-extensions \
                $(datadir)/chorizo/user-scripts \
                $(datadir)/applications \
                $(docdir)/chorizo
@@ -49,7 +49,7 @@ install: all
        cp man/*.5 $(mandir)/man5/
        cp chorizo.ini $(docdir)/chorizo/
        cp chorizo.desktop $(datadir)/applications/
-       cp -r extensions/*.so $(libdir)/chorizo/web_extensions/
+       cp -r extensions/*.so $(libdir)/chorizo/web-extensions/
        cp -r user-scripts/* $(datadir)/chorizo/user-scripts/
 
 uninstall:

diff --git a/man/chorizo-usage.1.scd b/man/chorizo-usage.1.scd
index a55d861336b8e4877f0ed5ea95918433e7d300c2..66b0639d736bd10b6b973786e75bbb34a62c5c31 100644 (file)
--- a/man/chorizo-usage.1.scd
+++ b/man/chorizo-usage.1.scd
@@ -46,7 +46,7 @@ _~/.local/share/chorizo/user-styles_, and be applied every time a page
 loads. The rules in these files override any rules provided by the website.
 
 # WEB EXTENSIONS
-On startup, WebKit checks _~/.local/share/chorizo/web_extensions_ for any *.so*
+On startup, WebKit checks _~/.local/share/chorizo/web-extensions_ for any *.so*
 files. See
 <http://blogs.igalia.com/carlosgc/2013/09/10/webkit2gtk-web-process-extensions/>
 this blog post for further information on these extensions.

diff --git a/man/chorizo.1.scd b/man/chorizo.1.scd
index 5ff49f0a5fffe3cb62af0a5ecff279d4862071d1..22dcf42ebdb6e40f09652a1aff79d4e728eeba19 100644 (file)
--- a/man/chorizo.1.scd
+++ b/man/chorizo.1.scd
@@ -58,7 +58,7 @@ XDG variables will be used to construct these paths.
 *~/.local/share/chorizo/user-styles*
        Directory to store user-supplied CSS snippets. See *chorizo-usage*(1).
 
-*~/.local/share/chorizo/web_extensions*
+*~/.local/share/chorizo/web-extensions*
        Sets the directory where WebKit will look for web extensions. See
        *chorizo-usage*(1).
 

diff --git a/src/browser.c b/src/browser.c
index 276f396f7444ce3bf520a917999b203df96a6828..3edab07a13fda9d52749ce92c4909ded8b48ea26 100644 (file)
--- a/src/browser.c
+++ b/src/browser.c
@@ -794,7 +794,7 @@ init_default_web_context(void) {
         WEBKIT_PROCESS_MODEL_MULTIPLE_SECONDARY_PROCESSES;
     webkit_web_context_set_process_model(wc, model);
 
-    p = g_build_filename(g_get_user_data_dir(), __NAME__, "web_extensions",
+    p = g_build_filename(g_get_user_data_dir(), __NAME__, "web-extensions",
                          NULL);
     webkit_web_context_set_web_extensions_directory(wc, p);
     g_free(p);