merge in recent changes from main repo

4 files changed, 14 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index ff4c9783..80e7d4d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -40,6 +40,7 @@ dillo-2.2.1 [not released yet]
    Patches: corvid
 +- Reintroduce bg_color dillorc option.
  - Make Dillo compile with Clang.
+ - Fix Textblock flushing.
    Patches: Johannes Hofmann
 +- Implement line-height.
  - Draw image maps when image not loaded.
@@ -47,6 +48,7 @@ dillo-2.2.1 [not released yet]
 +- Support @media rules.
  - Implement media-conditional @import rules.
  - Configure/Makefile cleanup.
+ - Fix meta refresh looping.
    Patches: Jeremy Henty
 
 -----------------------------------------------------------------------------
diff --git a/src/cache.c b/src/cache.c
index ee9f2218..d26ae610 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -311,6 +311,10 @@ static void Cache_entry_free(CacheEntry_t *entry)
    dStr_free(entry->UTF8Data, 1);
    if (entry->CharsetDecoder)
       a_Decode_free(entry->CharsetDecoder);
+   if (entry->TransferDecoder)
+      a_Decode_free(entry->TransferDecoder);
+   if (entry->ContentDecoder)
+      a_Decode_free(entry->ContentDecoder);
    dFree(entry);
 }
 
diff --git a/src/styleengine.cc b/src/styleengine.cc
index aa09f286..d763146e 100644
--- a/src/styleengine.cc
+++ b/src/styleengine.cc
@@ -612,14 +612,14 @@ bool StyleEngine::computeValue (int *dest, CssLength value, Font *font) {
          return true;
       case CSS_LENGTH_TYPE_MM:
          *dest = roundInt (CSS_LENGTH_VALUE (value) * dpmm);
-        return true;
+         return true;
       case CSS_LENGTH_TYPE_EM:
          *dest = roundInt (CSS_LENGTH_VALUE (value) * font->size);
-        return true;
+         return true;
       case CSS_LENGTH_TYPE_EX:
          *dest = roundInt (CSS_LENGTH_VALUE(value) * font->xHeight);
-        return true;
-       case CSS_LENGTH_TYPE_NONE:
+         return true;
+      case CSS_LENGTH_TYPE_NONE:
          // length values other than 0 without unit are only allowed
          // in special cases (line-height) and have to be handled
          // separately.
diff --git a/src/uicmd.cc b/src/uicmd.cc
index 68550e41..577e2a17 100644
--- a/src/uicmd.cc
+++ b/src/uicmd.cc
@@ -1221,14 +1221,14 @@ void a_UIcmd_fullscreen_toggle(BrowserWindow *bw)
  * Search for next/previous occurrence of key.
  */
 void a_UIcmd_findtext_search(BrowserWindow *bw, const char *key,
-                             int case_sens, int backwards)
+                             int case_sens, int backward)
 {
    Layout *l = (Layout *)bw->render_layout;
 
-   switch (l->search(key, case_sens, backwards)) {
+   switch (l->search(key, case_sens, backward)) {
    case FindtextState::RESTART:
-      a_UIcmd_set_msg(bw, "No further occurrences of \"%s\". "
-                          "Restarting from the top.", key);
+      a_UIcmd_set_msg(bw, backward?"Top reached; restarting from the bottom."
+                                  :"Bottom reached; restarting from the top.");
       break;
    case FindtextState::NOT_FOUND:
       a_UIcmd_set_msg(bw, "\"%s\" not found.", key);