aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dillorc24
-rw-r--r--dpid/dpi_socket_dir.c2
-rw-r--r--src/dicache.c1
-rw-r--r--src/findbar.hh2
-rw-r--r--src/html.cc1
-rw-r--r--src/prefs.c6
-rw-r--r--src/prefs.h1
7 files changed, 2 insertions, 15 deletions
diff --git a/dillorc2 b/dillorc2
index 7c5cda50..12d3d9d0 100644
--- a/dillorc2
+++ b/dillorc2
@@ -12,10 +12,6 @@
#geometry=650x545+0+20
geometry=780x580
-# Dicache is where the Decompressed Images are cached (not the original ones).
-# If you have a lot of memory and a slow CPU, use YES, otherwise use NO
-use_dicache=NO
-
# Uncomment if you want to have text-only browsing from the start.
# (there's a toggle button near the bug meter to change this on-the-fly)
#load_images=NO
diff --git a/dpid/dpi_socket_dir.c b/dpid/dpi_socket_dir.c
index 27df9296..68f0143c 100644
--- a/dpid/dpi_socket_dir.c
+++ b/dpid/dpi_socket_dir.c
@@ -79,7 +79,7 @@ char *mk_sockdir(void)
{
char *template, *logname;
- logname = getenv("LOGNAME") ? getenv("LOGNAME") : "joe";
+ logname = getenv("LOGNAME") ? getenv("LOGNAME") : "dillo";
template = dStrconcat("/tmp/", logname, "-", "XXXXXX", NULL);
if (a_Misc_mkdtemp(template) == NULL) {
ERRMSG("mk_sockdir", "a_Misc_mkdtemp", 0);
diff --git a/src/dicache.c b/src/dicache.c
index 02324f26..4bdbb71b 100644
--- a/src/dicache.c
+++ b/src/dicache.c
@@ -18,7 +18,6 @@
#include "web.hh"
#include "dicache.h"
#include "cache.h"
-#include "prefs.h"
typedef struct _DICacheNode DICacheNode;
diff --git a/src/findbar.hh b/src/findbar.hh
index 9f76398a..29890ef3 100644
--- a/src/findbar.hh
+++ b/src/findbar.hh
@@ -1,14 +1,12 @@
#ifndef __FINDBAR_HH__
#define __FINDBAR_HH__
-//#include <fltk/Window.h>
#include <fltk/Widget.h>
#include <fltk/HighlightButton.h>
#include <fltk/Button.h>
#include <fltk/Input.h>
#include <fltk/Group.h>
#include <fltk/CheckButton.h>
-#include <fltk/ReturnButton.h>
// simple declaration to avoid circular include
class UI;
diff --git a/src/html.cc b/src/html.cc
index da7787c0..b6c8b1ea 100644
--- a/src/html.cc
+++ b/src/html.cc
@@ -2104,6 +2104,7 @@ static void Html_tag_open_frame (DilloHtml *html, const char *tag, int tagsize)
}
style_attrs.textDecoration |= TEXT_DECORATION_UNDERLINE;
style_attrs.x_link = Html_set_new_link(html, &url);
+ style_attrs.cursor = CURSOR_POINTER;
link_style = Style::create (HT2LT(html), &style_attrs);
textblock->addParbreak (5, S_TOP(html)->style);
diff --git a/src/prefs.c b/src/prefs.c
index d1b0bcf8..e820ed75 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -102,7 +102,6 @@ typedef enum {
DRC_TOKEN_STANDARD_WIDGET_COLORS,
DRC_TOKEN_START_PAGE,
DRC_TOKEN_TEXT_COLOR,
- DRC_TOKEN_USE_DICACHE,
DRC_TOKEN_VISITED_COLOR,
DRC_TOKEN_VW_FONT,
DRC_TOKEN_W3C_PLUS_HEURISTICS
@@ -161,7 +160,6 @@ static const SymNode_t symbols[] = {
{ "standard_widget_colors", DRC_TOKEN_STANDARD_WIDGET_COLORS },
{ "start_page", DRC_TOKEN_START_PAGE },
{ "text_color", DRC_TOKEN_TEXT_COLOR },
- { "use_dicache", DRC_TOKEN_USE_DICACHE },
{ "visited_color", DRC_TOKEN_VISITED_COLOR, },
{ "vw_fontname", DRC_TOKEN_VW_FONT },
{ "w3c_plus_heuristics", DRC_TOKEN_W3C_PLUS_HEURISTICS }
@@ -275,9 +273,6 @@ static int Prefs_parse_pair(char *name, char *value)
case DRC_TOKEN_W3C_PLUS_HEURISTICS:
prefs.w3c_plus_heuristics = (strcmp(value,"YES") == 0);
break;
- case DRC_TOKEN_USE_DICACHE:
- prefs.use_dicache = (strcmp(value, "YES") == 0);
- break;
case DRC_TOKEN_SHOW_BACK:
prefs.show_back = (strcmp(value, "YES") == 0);
break;
@@ -425,7 +420,6 @@ void a_Prefs_init(void)
prefs.limit_text_width = FALSE;
prefs.w3c_plus_heuristics = TRUE;
prefs.font_factor = 1.0;
- prefs.use_dicache = FALSE;
prefs.show_back=TRUE;
prefs.show_forw=TRUE;
prefs.show_home=TRUE;
diff --git a/src/prefs.h b/src/prefs.h
index f162e8f5..c7658c80 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -37,7 +37,6 @@ struct _DilloPrefs {
bool_t limit_text_width;
bool_t w3c_plus_heuristics;
double font_factor;
- bool_t use_dicache;
bool_t show_back;
bool_t show_forw;
bool_t show_home;