changeset 2073:136471768e3c

merge in recent changes from main repo
author corvid <corvid@lavabit.com>
date Wed, 01 Jun 2011 23:32:38 +0000
parents e6a6cf3aab0f (current diff) 8abe97ebb6e3 (diff)
children 9657be74b813
files ChangeLog src/uicmd.cc
diffstat 4 files changed, 14 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue May 31 17:28:09 2011 -0400
+++ b/ChangeLog	Wed Jun 01 23:32:38 2011 +0000
@@ -40,6 +40,7 @@
    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 @@
 +- Support @media rules.
  - Implement media-conditional @import rules.
  - Configure/Makefile cleanup.
+ - Fix meta refresh looping.
    Patches: Jeremy Henty
 
 -----------------------------------------------------------------------------
--- a/src/cache.c	Tue May 31 17:28:09 2011 -0400
+++ b/src/cache.c	Wed Jun 01 23:32:38 2011 +0000
@@ -311,6 +311,10 @@
    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);
 }
 
--- a/src/styleengine.cc	Tue May 31 17:28:09 2011 -0400
+++ b/src/styleengine.cc	Wed Jun 01 23:32:38 2011 +0000
@@ -612,14 +612,14 @@
          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.
--- a/src/uicmd.cc	Tue May 31 17:28:09 2011 -0400
+++ b/src/uicmd.cc	Wed Jun 01 23:32:38 2011 +0000
@@ -1221,14 +1221,14 @@
  * 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);