diff options
| author | Sebastian Geerken <devnull@localhost> | 2014-09-24 12:52:46 +0200 |
|---|---|---|
| committer | Sebastian Geerken <devnull@localhost> | 2014-09-24 12:52:46 +0200 |
| commit | b472fe79479ab5edc7a3d3397313a3c5e38c0440 (patch) | |
| tree | f9e0361a8f7807ffc37bcdbf6b9062ead735ce0e /src | |
| parent | 346143676c0abcb93d2d00c8fc345f471145086a (diff) | |
| parent | 8e186583e3994242d3c3a9ac107da5028e66f656 (diff) | |
Merge with main repo.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/dillo.cc | 24 | ||||
| -rw-r--r-- | src/styleengine.cc | 3 |
3 files changed, 15 insertions, 14 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 5abb43dc..597a743b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,7 +2,7 @@ AM_CPPFLAGS= \ -I$(top_srcdir) \ -DDILLO_SYSCONF='"$(sysconfdir)/"' \ -DDILLO_DOCDIR='"$(docdir)/"' \ - -DCUR_WORKING_DIR='"@BASE_CUR_WORKING_DIR@/src"' + -DCUR_WORKING_DIR='"@BASE_CUR_WORKING_DIR@/src"' \ @LIBJPEG_CPPFLAGS@ AM_CFLAGS = @LIBPNG_CFLAGS@ diff --git a/src/dillo.cc b/src/dillo.cc index 90eecdd7..44a8d754 100644 --- a/src/dillo.cc +++ b/src/dillo.cc @@ -379,18 +379,18 @@ static DilloUrl *makeStartUrl(char *str, bool local) */ int main(int argc, char **argv) { - DBG_OBJ_COLOR("#c0ff80", "dw::*"); - DBG_OBJ_COLOR("#c0c0ff", "dw::fltk::*"); - DBG_OBJ_COLOR("#ffa0a0", "dw::core::*"); - DBG_OBJ_COLOR("#ffe0a0", "dw::core::style::*"); - - DBG_OBJ_COLOR ("#80ffa0", "dw::Image"); - DBG_OBJ_COLOR ("#f0ff80", "dw::Textblock"); - DBG_OBJ_COLOR ("#d0ff80", "dw::OutOfFlowMgr"); - DBG_OBJ_COLOR ("#e0ff80", "dw::AlignedTextblock"); - DBG_OBJ_COLOR ("#b0ff80", "dw::ListItem"); - DBG_OBJ_COLOR ("#80ff80", "dw::TableCell"); - DBG_OBJ_COLOR ("#80ffc0", "dw::Table"); + DBG_OBJ_COLOR ("dw::*", "#c0ff80"); + DBG_OBJ_COLOR ("dw::fltk::*", "#c0c0ff"); + DBG_OBJ_COLOR ("dw::core::*", "#ffa0a0"); + DBG_OBJ_COLOR ("dw::core::style::*", "#ffe0a0"); + + DBG_OBJ_COLOR ("dw::Image", "#80ffa0"); + DBG_OBJ_COLOR ("dw::Textblock", "#f0ff80"); + DBG_OBJ_COLOR ("dw::OutOfFlowMgr", "#d0ff80"); + DBG_OBJ_COLOR ("dw::AlignedTextblock", "#e0ff80"); + DBG_OBJ_COLOR ("dw::ListItem", "#b0ff80"); + DBG_OBJ_COLOR ("dw::TableCell", "#80ff80"); + DBG_OBJ_COLOR ("dw::Table", "#80ffc0"); uint_t opt_id; uint_t options_got = 0; diff --git a/src/styleengine.cc b/src/styleengine.cc index 706340b6..8a90751e 100644 --- a/src/styleengine.cc +++ b/src/styleengine.cc @@ -753,7 +753,8 @@ void StyleEngine::apply (int i, StyleAttrs *attrs, CssPropertyList *props, } if (imgUrl && prefs.load_background_images && - !stack->getRef (i)->displayNone) + !stack->getRef (i)->displayNone && + !(URL_FLAGS(pageUrl) & URL_SpamSafe)) { attrs->backgroundImage = StyleImage::create(); DilloImage *image = |