aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.hgignore45
-rw-r--r--dillorc5
-rw-r--r--dpi/cookies.c2
-rw-r--r--src/uicmd.cc3
4 files changed, 51 insertions, 4 deletions
diff --git a/.hgignore b/.hgignore
new file mode 100644
index 00000000..154c9677
--- /dev/null
+++ b/.hgignore
@@ -0,0 +1,45 @@
+(^|/)CVS($|/)
+(^|/)\.hg($|/)
+(^|/)\.deps($|/)
+(^|/)\html($|/)
+.*\.a
+.*\.o
+config\..*
+autom4te.cache
+Makefile
+Makefile.in
+configure
+aclocal.m4
+depcomp
+install-sh
+stamp-h1
+missing
+tags
+dillo
+d_size.h
+dpi/bookmarks.dpi
+dpi/cookies.dpi
+dpi/datauri.filter.dpi
+dpi/downloads.dpi
+dpi/file.dpi
+dpi/ftp.filter.dpi
+dpi/hello.filter.dpi
+dpi/https.filter.dpi
+dpid/dpid
+test/dw-anchors-test
+test/dw-border-test
+test/dw-example
+test/dw-find-test
+test/dw-images-scaled
+test/dw-images-scaled2
+test/dw-images-simple
+test/dw-imgbuf-mem-test
+test/dw-links
+test/dw-links2
+test/dw-lists
+test/dw-resource-test
+test/dw-table
+test/dw-table-aligned
+test/dw-ui-test
+test/fltk-browser
+test/shapes
diff --git a/dillorc b/dillorc
index e61b1c40..2876f643 100644
--- a/dillorc
+++ b/dillorc
@@ -98,8 +98,9 @@
#search_url="http://www.google.com/search?ie=UTF-8&oe=UTF-8&q=%s"
# Set the proxy information for http.
-# WARNING: dillo uses wget for ftp and https. To use a proxy for those
-# protocols, you will need to configure wget.
+# WARNING: - HTTPS does not currently use the proxy settings.
+# - FTP and downloads plugins use wget. To use a proxy with them,
+# you will need to configure wget accordingly.
# http_proxy="http://localhost:8080/"
#(by default, no proxy is used)
diff --git a/dpi/cookies.c b/dpi/cookies.c
index 5b5bc35d..c482ecdf 100644
--- a/dpi/cookies.c
+++ b/dpi/cookies.c
@@ -426,7 +426,7 @@ static void Cookies_save_and_free()
rewind(file_stream);
fd = fileno(file_stream);
ftruncate(fd, 0);
- fprintf(file_stream, cookies_txt_header_str);
+ fprintf(file_stream, "%s", cookies_txt_header_str);
/* Iterate cookies per domain, saving and freeing */
while ((node = dList_nth_data(cookies, 0))) {
diff --git a/src/uicmd.cc b/src/uicmd.cc
index 9534a7fb..4484f059 100644
--- a/src/uicmd.cc
+++ b/src/uicmd.cc
@@ -180,7 +180,8 @@ BrowserWindow *a_UIcmd_browser_window_new(int ww, int wh, const void *vbw)
win->add(DilloTabs);
// Create and set the UI
- UI *new_ui = new UI(0, 0, ww, wh, DEFAULT_TAB_LABEL, old_bw ? BW2UI(old_bw) : NULL);
+ UI *new_ui = new UI(0, 0, ww, wh, DEFAULT_TAB_LABEL,
+ old_bw ? BW2UI(old_bw) : NULL);
new_ui->set_status("http://www.dillo.org/");
new_ui->tabs(DilloTabs);