changeset 2063:93b03ac0add6

merge
author Johannes Hofmann <Johannes.Hofmann@gmx.de>
date Fri, 27 May 2011 22:42:02 +0200
parents d03d62c2ed36 (current diff) c66d4b30ca39 (diff)
children 0e4d2e07d338
files
diffstat 2 files changed, 21 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri May 27 22:41:54 2011 +0200
+++ b/ChangeLog	Fri May 27 22:42:02 2011 +0200
@@ -2,6 +2,20 @@
 Dillo project
 =============================================================================
 
+dillo-3.0 [not released yet]
+
++- Ported Dillo to FLTK-1.3.
+   Patch: corvid, Johannes Hofmann, Jorge Arellano Cid
++- Default binding for close-all changed from Alt-q to Ctrl-q.
+ - Default binding for close-tab changed from Ctrl-q to Ctrl-w.
+ - Add right_click_closes_tab preference (default is middle click).
+   Patches: Jorge Arellano Cid
++- Remove --enable-ansi configure option.
+ - Limit saved cookie size.
+   Patches: corvid
+
+-----------------------------------------------------------------------------
+
 dillo-2.2.1 [not released yet]
 
 +- Implemented "View source" as a dpi.
--- a/src/prefsparser.cc	Fri May 27 22:41:54 2011 +0200
+++ b/src/prefsparser.cc	Fri May 27 22:42:02 2011 +0200
@@ -171,13 +171,6 @@
       MSG_WARN("prefs: {%s} IS recognized but not handled!\n", name);
       break;   /* Not reached */
    }
-
-   if (prefs.limit_text_width) {
-      /* BUG: causes 100% CPU usage with <button> or <input type="image"> */
-      MSG_WARN("Disabling limit_text_width preference (currently broken).\n");
-      prefs.limit_text_width = FALSE;
-   }
-
    return 0;
 }
 
@@ -213,4 +206,11 @@
    // restore the old numeric locale
    setlocale(LC_NUMERIC, oldLocale);
    dFree(oldLocale);
+
+
+   if (prefs.limit_text_width) {
+      /* BUG: causes 100% CPU usage with <button> or <input type="image"> */
+      MSG_WARN("Disabling limit_text_width preference (currently broken).\n");
+      prefs.limit_text_width = FALSE;
+   }
 }