diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | config.mk | 1 | ||||
| -rw-r--r-- | contrib/bash-completion | 2 | ||||
| -rw-r--r-- | html/error.html (renamed from lib/error.html) | 0 | ||||
| -rw-r--r-- | html/head.html (renamed from lib/head.html) | 0 | ||||
| -rw-r--r-- | html/info.html (renamed from lib/info.html) | 0 | ||||
| -rw-r--r-- | html/local.html (renamed from lib/local.html) | 0 | ||||
| -rw-r--r-- | m4/Makefile | 9 | ||||
| -rw-r--r-- | src/html.c | 8 | ||||
| -rw-r--r-- | src/local.c | 2 | ||||
| -rw-r--r-- | src/view.c | 2 |
11 files changed, 13 insertions, 15 deletions
@@ -42,8 +42,8 @@ install-man: all install-data: all @# Lib - install -d $(DESTDIR)$(DATADIR)/$(REAL_NAME)/$(LIBDIR) - for file in $(LIBDIR)/*; do \ + install -d $(DESTDIR)$(DATADIR)/$(REAL_NAME)/$(HTMLDIR) + for file in $(HTMLDIR)/*; do \ install -m 644 $$file $(DESTDIR)$(DATADIR)/$(REAL_NAME)/$$file; \ done @# Share @@ -10,6 +10,7 @@ DOCDIR=doc APIDIR=$(DOCDIR)/api SRCDIR=src JSDIR=scripts +HTMLDIR=html LIBDIR=lib LIBJSDIR=$(JSDIR)/$(LIBDIR) LIBJSFILES=$(LIBJSDIR)/signals.js $(LIBJSDIR)/enums.js $(LIBJSDIR)/data.js diff --git a/contrib/bash-completion b/contrib/bash-completion index 7debbb64..2742f21b 100644 --- a/contrib/bash-completion +++ b/contrib/bash-completion @@ -156,3 +156,5 @@ _dwbem() { esac } && complete -F _dwbem dwbem + +# vim: set ft=sh: diff --git a/lib/error.html b/html/error.html index 88788849..88788849 100644 --- a/lib/error.html +++ b/html/error.html diff --git a/lib/head.html b/html/head.html index 13a17b08..13a17b08 100644 --- a/lib/head.html +++ b/html/head.html diff --git a/lib/info.html b/html/info.html index d0b986c1..d0b986c1 100644 --- a/lib/info.html +++ b/html/info.html diff --git a/lib/local.html b/html/local.html index c40a64ac..c40a64ac 100644 --- a/lib/local.html +++ b/html/local.html diff --git a/m4/Makefile b/m4/Makefile index d9ca3432..059872a6 100644 --- a/m4/Makefile +++ b/m4/Makefile @@ -1,8 +1,8 @@ # See COPYING for copyright and license details include ../config.mk -SETTINGS=../$(LIBDIR)/settings.html -KEYS=../$(LIBDIR)/keys.html +SETTINGS=../$(HTMLDIR)/settings.html +KEYS=../$(HTMLDIR)/keys.html OUTFILES=$(SETTINGS) $(KEYS) all: $(OUTFILES) @@ -15,11 +15,6 @@ $(SETTINGS): settings.m4 @echo gen settings.html @m4 $(M4FLAGS) $< > $@ -settings.in: settings.pre - @$(shell if pkg-config --exists 'libsoup-2.4 >= 2.38'; then \ - sed 's/^SSL_CERTIFICATION/ssl-use-system-ca-file checkbox Whether to use the system certification file/' $< > $@;\ - else sed 's/^SSL_CERTIFICATION/ssl-ca-file text Path to ssl-certificate/;/^addressbar-dns-lookup/d' $< > $@; fi) - clean: $(RM) $(OUTFILES) settings.in @@ -64,8 +64,8 @@ DwbStatus html_load_page(WebKitWebView *wv, HtmlTable *t, char *panel) { char *filecontent; GString *content = g_string_new(NULL); - char *path = util_get_data_file(t->file, "lib"); - char *headpath = util_get_data_file(HEAD_FILE, "lib"); + char *path = util_get_data_file(t->file, "html"); + char *headpath = util_get_data_file(HEAD_FILE, "html"); DwbStatus ret = STATUS_ERROR; if (path && headpath) @@ -324,7 +324,7 @@ html_settings(GList *gl, HtmlTable *table) DwbStatus ret = STATUS_ERROR; WebKitWebView *wv = WEBVIEW(gl); - char *path = util_get_data_file(SETTINGS_FILE, "lib"); + char *path = util_get_data_file(SETTINGS_FILE, "html"); if (path != NULL) { g_file_get_contents(path, &content, NULL, NULL); @@ -427,7 +427,7 @@ html_keys(GList *gl, HtmlTable *table) DwbStatus ret = STATUS_ERROR; char *content = NULL; WebKitWebView *wv = WEBVIEW(gl); - char *path = util_get_data_file(KEY_FILE, "lib"); + char *path = util_get_data_file(KEY_FILE, "html"); if (path != NULL) { g_signal_connect(wv, "notify::load-status", G_CALLBACK(html_keys_load_cb), table); diff --git a/src/local.c b/src/local.c index bd55313e..15eebcd5 100644 --- a/src/local.c +++ b/src/local.c @@ -271,7 +271,7 @@ local_show_directory(GList *gl, const char *path, gboolean add_to_history) g_string_append_len(path_buffer, tmp, match-tmp); g_string_append(path_buffer, "</a>"); - local_file = util_get_data_file(LOCAL_FILE, "lib"); + local_file = util_get_data_file(LOCAL_FILE, "html"); filecontent = util_get_file_content(local_file, NULL); if (filecontent == NULL) /* File doesn't exist or is a directory */ return; @@ -853,7 +853,7 @@ view_load_error_cb(WebKitWebView *web, WebKitWebFrame *frame, char *uri, GError || weberror->code == WEBKIT_POLICY_ERROR_FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE) return false; - char *errorfile = util_get_data_file(ERROR_FILE, "lib"); + char *errorfile = util_get_data_file(ERROR_FILE, "html"); if (errorfile == NULL) return false; |