summaryrefslogtreecommitdiff
path: root/src/config.h
diff options
context:
space:
mode:
authorportix <portix@gmx.net>2012-01-10 13:35:28 +0100
committerportix <portix@gmx.net>2012-01-10 13:35:28 +0100
commit7e0439e55acd1ae000d9519672ab561ac5c4d7c5 (patch)
tree99b17724442fd76176ccfa1d9d93d771c5986fdf /src/config.h
parent3df952cb410bd3997c612b3e9058501544a76ed7 (diff)
downloaddwb-7e0439e55acd1ae000d9519672ab561ac5c4d7c5.zip
Remove adblocker preprocessor directives; new commandline option -x
--HG-- branch : experimental
Diffstat (limited to 'src/config.h')
-rw-r--r--src/config.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/config.h b/src/config.h
index 28d5ddac..28fde4c2 100644
--- a/src/config.h
+++ b/src/config.h
@@ -487,7 +487,7 @@ static FunctionMap FMAP [] = {
{ { "set_setting", "Set setting", }, CP_COMMANDLINE | CP_HAS_MODE,
(Func)commands_set_setting, NULL, NEVER_SM,
- { 0 }, EP_NONE, { "set", NULL }, },
+ { 0 }, EP_NONE, { NULL }, },
{ { "set_key", "Set keybinding", }, CP_COMMANDLINE | CP_HAS_MODE,
(Func)commands_set_key, NULL, NEVER_SM,
@@ -960,12 +960,10 @@ static WebSettings DWB_SETTINGS[] = {
SETTING_GLOBAL, CHAR, { .p = "xterm -e ncftp 'dwb_uri'" }, NULL, },
{ { "editor", "External editor", },
SETTING_GLOBAL, CHAR, { .p = "xterm -e vim dwb_uri" }, NULL, },
-#ifdef DWB_ADBLOCKER
{ { "adblocker", "Whether to block advertisements via a filterlist", },
SETTING_GLOBAL, BOOLEAN, { .b = false }, (S_Func)dwb_set_adblock, },
{ { "adblocker-filterlist", "Path to a filterlist", },
SETTING_GLOBAL, CHAR, { .p = NULL }, NULL, },
-#endif
{ { "plugin-blocker", "Whether to block flash plugins and replace them with a clickable element", },
SETTING_PER_VIEW, BOOLEAN, { .b = true }, (S_Func)dwb_set_plugin_blocker, },
{ { "plugin-blocker", "Whether to block flash plugins and replace them with a clickable element", },