4 files changed, 52 insertions, 51 deletions
diff --git a/ChangeLog b/ChangeLog
index ee19e1f7..466a39ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -430,7 +430,7 @@ dillo-0.8.6 [Apr 26, 2006]
    * Made the downloads plugin dillo-cookie aware.
    * Ported the cookies dpi to libDpip.a.
    * Merged the new dpip code into the source tree.
-   Patches: Diego Sďż˝enz, Jorge Arellano
+   Patches: Diego Sáenz, Jorge Arellano
  - * Added "./configure --disable-threaded-dns" (for some non reentrant BSDs).
    Patch: Jorge Arellano, Francis Daly
  - * Fixed a bug with roman literals divisible by 10 (BUG#700).
@@ -442,13 +442,13 @@ dillo-0.8.6 [Apr 26, 2006]
  - * Improved the dpi framework. Now dpi-programs can be specified in dpidrc,
    and there's no need to touch dillo's sources to add new dpi services.
    Just make your dpi program, add a dpidrc line and play with it!
-   Patch: Diego Sďż˝enz, Jorge Arellano
+   Patch: Diego Sáenz, Jorge Arellano
 
 
 dillo-0.8.5 [Jun 15, 2005]
 
  - * Set "file:" to work as URI for current directory.
-   Patch: Diego Sďż˝enz
+   Patch: Diego Sáenz
  - * Added a "small" dillorc option for panel size (medium without labels).
    Patch: Eugeniy, Jorge Arellano
  - * Fixed the shell escaping code in the ftp plugin.
@@ -550,17 +550,17 @@ dillo-0.8.3 [Oct 27, 2004]
    Patches: Jorge Arellano
  - * Introduced a light-weight heuristic algorithm over the W3C parsing
      scheme (allows for slightly better rendering: w3c_plus_heuristics=YES).
-   Patch: Rubďż˝n Fernďż˝ndez
+   Patch: Rubén Fernández
  - * Moved the internal support for "file:" URIs into a dpi (server plugin).
    * Added TABLE-based rendering of directory listings to the new file dpi.
-   Patches: Jorge Arellano, Jďż˝rgen Viksell
+   Patches: Jorge Arellano, Jörgen Viksell
  - * Removed DwWidget::realize and DwWidget::unrealize.
    * Made all signals expect events to abstract methods.
    * Renamed a_Dw_widget_{size_request|get_extremes|size_allocate|set_*} to
      p_*, they should not be used outside of Dw.
    Patches: Sebastian Geerken
  - * Fixed the meta refresh warning to not switch from IN_HEAD to IN_BODY.
-   Patch: Bjďż˝rn Brill
+   Patch: Björn Brill
 
 
 dillo-0.8.2 [Jul 06, 2004]
@@ -594,7 +594,7 @@ dillo-0.8.2 [Jul 06, 2004]
    * Now you can copy & paste an URL into the "Clear URL" button.
    Patch: Jorge Arellano, Sebastian Geerken
  - * Made the save and open file dialogs remember the last directory (BUG#211).
-   Patch: Diego Sďż˝enz
+   Patch: Diego Sáenz
 
 
 dillo-0.8.1 [May 14, 2004]
@@ -604,13 +604,13 @@ dillo-0.8.1 [May 14, 2004]
  - * Fixed a slippery bug with certain interlaced gif images (BUG#500).
    Patch: Andreas Mueller
  - * Fixed libpng-1.2.4 detection in configure.in.
-   Patch: Rubďż˝n Helguera
+   Patch: Rubén Helguera
  - * Added proxy authentication support through the "http_proxyuser" option
      in dillorc (the password is asked at run time).
    Patch: Ivan Daniluk, Jorge Arellano, Francis Daly
  - * Moved tooltips to DwStyle, tooltip event handling to DwPage, and applied
      this also to the TITLE attribute of <a> and <abbr>.
-   Patch: Jďż˝rgen Viksell, Sebastian Geerken
+   Patch: Jörgen Viksell, Sebastian Geerken
  - * Fixed a bug related to spaces after anchors and breaks.
    Patch: Sebastian Geerken
  - * Removed two "type punning" gcc warnings (dw_gtk_viewport.c).
@@ -620,9 +620,9 @@ dillo-0.8.1 [May 14, 2004]
    * Switch one realloc() call to g_realloc(), to match g_free() (dpi.c).
    * Removed unnecessary NULL-checks and NULL initializations.
    * Added Html_get_attr_wdef(), it lets providing a default return value.
-   Patches: Jďż˝rgen Viksell
+   Patches: Jörgen Viksell
  - * Fixed configure.in so pthreads are only linked where needed.
-   Patch: Jďż˝rgen Viksell, Jorge Arellano
+   Patch: Jörgen Viksell, Jorge Arellano
  - * Modified a_Misc_stuff_chars for simplicity and removed a memory leak.
    * Made the dpi framework send the HTTP query to the https dpi
      (this allows for an SSL-lib dpi and for easier session caching).
@@ -755,7 +755,7 @@ dillo-0.8.0 [Feb 08, 2004]
    * Added configure options to disable either: png, jpeg or gif.
    * Fixed configure.in for proper library linking for dpis and dpid.
    * Improved libpng detection.
-   Patches: Jďż˝rgen Viksell
+   Patches: Jörgen Viksell
  - * Fixed wrong handling of coordinates in ISMAP and USEMAP images.
    * Added a hand-shaped cursor to input controls of type image.
    * Fixed a off-by-one memory leak in Dw(Ext)Iterator.
@@ -778,7 +778,7 @@ dillo-0.8.0 [Feb 08, 2004]
      The search engine can be set in dillorc (defaults to google).
    Patch: Johan Hovold, Jorge Arellano
  - * Fixed a problem with libpng options detection (configure.in).
-   Patch: Rubďż˝n Fernďż˝ndez
+   Patch: Rubén Fernández
  - * Added "pthreads" (with an "s") detection to configure.in.
    Patch: Andreas Schweitzer
  - * Added the "-geometry" switch to the CLI.
@@ -810,7 +810,7 @@ dillo-0.7.3 [Aug 03, 2003]
  - * Added support for the hspace and vspace attributes of the IMG tag.
    * Made only left button activate the image input type (BUG#367,#451).
    * Fixed SELECT with "multiple" but without "size" (BUG#469).
-   Patches: Jďż˝rgen Viksell
+   Patches: Jörgen Viksell
  - * Added titles to bookmark server's html pages.
    Patch: Kelson Vibber
  - * Made IFRAME to be handled like FRAME (shows link).
@@ -846,9 +846,9 @@ dillo-0.7.2 [Apr 30, 2003]
    detection, enabling and disabling. (BUG#: 386, 407, 392, 349)!
    Patches: Andreas Schweitzer
  - * Fixed two leaks in Dw(Ext)Iterator.
-   Patches: Jďż˝rgen Viksell
+   Patches: Jörgen Viksell
  - * Repaired some minor misbehaviours in the cookie-strings parser.
-   Patches: Jďż˝rgen Viksell, Jorge Arellano
+   Patches: Jörgen Viksell, Jorge Arellano
  - * Enabled entities parsing in HTML-given hidden and password values.
    Patch: Jorge Arellano, Francis Daly
  - * Implemented character stuffing in dpi (Fix bookmarks with quotes) BUG#434.
@@ -904,14 +904,14 @@ dillo-0.7.0 [Feb 17, 2003]
  - * Fixed a problem occurring when scrolling with the "b" key.
    Patch: Livio Baldini
  - * Fixed a memory leak in DwAlignedPage.
-   Patch: Jďż˝rgen Viksell, Sebastian Geerken
+   Patch: Jörgen Viksell, Sebastian Geerken
  - * Moved stuff into remove_cookie() and add_cookie() functions.
    * Made cookies sort once in add_cookie().
    * Removed some unneeded casts and calls in cookies.
    * Repairing some minor misbehaviours in Cookies_parse_string().
-   Patches: Jďż˝rgen Viksell, Jorge Arellano, Madis Janson
+   Patches: Jörgen Viksell, Jorge Arellano, Madis Janson
  - * Fixed a bug in Dw_widget_mouse_event.
-   Patch: Jďż˝rgen Viksell
+   Patch: Jörgen Viksell
  - * Fixed a bug in DwPage ("height" argument).
    Patch: Pekka Lampila
  - * Removed a segfault source in http.c
@@ -989,7 +989,7 @@ dillo-0.6.6 [May 30, 2002]
  - * Fixed a bug with cookies path parsing.
    * Fixed persistent-cookies obliteration (BUG#312, BUG#314)
    * Set max 20 persistent cookies for each domain.
-   Patches: Jďż˝rgen Viksell
+   Patches: Jörgen Viksell
  - * Switched flock to lockf.
    Patch: Andreas Schweitzer
  - * Made a little bugfix in doc/Makefile.am.
@@ -1030,7 +1030,7 @@ dillo-0.6.5 [Apr 26, 2002]
  - * Fixed a tiny bug with dillorc parsing on certain locales (BUG#301)
    Patch: Lars Clausen, Jorge Arellano
  - * Added support for cookies! RFC-2965 (BUG#82)
-   Patch: Jďż˝rgen Viksell, Lars Clausen, Jorge Arellano
+   Patch: Jörgen Viksell, Lars Clausen, Jorge Arellano
  - * Added code to detect redirect-loops (BUG#260)
    Patch: Jorge Arellano, Chet Murthy
  - * Added support for missing Content-Type in HTTP headers (BUG#216)
@@ -1066,7 +1066,7 @@ dillo-0.6.4 [Jan 29, 2002]
    * Cleaned some casts to use the GPOINTER_TO_INT and GINT_TO_POINTER macros.
    * Added the 'static' qualifier to some module-internal variables.
    * Added the 'static' qualifier to module-internal functions!
-   Patches: Jďż˝rgen Viksell
+   Patches: Jörgen Viksell
  - * New widget DwAlignedPage for alignment of vertical arrays.
      - New widget DwListItem for nicer list items (based on some extensions
        of DwPage) BUG#271.
@@ -1115,10 +1115,10 @@ dillo-0.6.3 [Dec 23, 2001]
  - * Added full-screen mode! (left double-click toggles it).
    Patch: Jorge Arellano, Sebastian Geerken
  - * Extended interface customization options in dillorc (a must for iPAQ).
-   Patch: Jorge Arellano, Sam Engstrďż˝m
+   Patch: Jorge Arellano, Sam Engström
  - * Rewrote the whole tag-parsing code with a new scheme (single pass FSM!)
      (BUG#190, BUG#197, BUG#207, BUG#228, BUG#239) --Big work here.
-   Patch: Jorge Arellano, Jďż˝rgen Viksell
+   Patch: Jorge Arellano, Jörgen Viksell
  - * Set form encoding to escape everything but alphanumeric and -_.* (BUG#236)
    * Rewrote Html_tag_open_input.
    * Extended BACK and FWD key shortcuts to: {ALT | MOD*} + {, | .}    :-)
@@ -1184,7 +1184,7 @@ dillo-0.6.1 [Sep 13, 2001]
    * Fixed (and made faster) Url_str_resolve_relative (BUG#194)
    Patch: Jorge Arellano, Livio Baldini
  - * Added parsing support for %HexHex escape sequences in file URIs
-   Patch: Jorge Arellano, Livio Baldini, Agustďż˝n Ferrďż˝n :)
+   Patch: Jorge Arellano, Livio Baldini, Agustín Ferrín :)
  - * Implemented Ctrl-W (close window) (BUG#87)
    Patch: Jorge Arellano, Martynas Jocius
  - * Fixed a segfault when dillo cannot access ~/.dillo for some reason.
@@ -1210,10 +1210,10 @@ dillo-0.6.0 [July 31, 2001]
  - * Fixed a bunch of memory leaks!
    * Fixed links on pages with only one line, tuned text-entries size and
      fixed the HTTP header problem (BUG#180)
-   Patches: Jďż˝rgen Viksell
+   Patches: Jörgen Viksell
  - * Improved dialogs handling: find_text, view_source, open_url, open_file,
      save_link and save_page (also removed a leak here).
-   Patches: Jorge Arellano, Jďż˝rgen Viksell
+   Patches: Jorge Arellano, Jörgen Viksell
  - * Modified GtkDwScrolledWindow and GtkDwViewport, now scrollbars work much
      better. This also fixes of the wrong viewport length (BUG#137).
    * Implemented tables! (incomplete)
@@ -1237,7 +1237,7 @@ dillo-0.6.0 [July 31, 2001]
    Patches: Sebastian Geerken
  - * Added nowrap attribute to DwStyle, and applied it to <pre> (BUG#134),
      <td> and <th>.
-   Patch: Jďż˝rgen Viksell, Sebastian Geerken
+   Patch: Jörgen Viksell, Sebastian Geerken
  - * Added a_List_resize to list.h methods.
    * Added debug.h to standarize debugging messages.
    Patches: Sebastian Geerken, Jorge Arellano
@@ -1246,7 +1246,7 @@ dillo-0.6.0 [July 31, 2001]
  - * Added a few 'const', a missing header and some strength reductions.
    Patch: Aaron Lehmann
  - * Made dillo to also check '/etc/dillorc' for options.
-   Patch: Eduardo Marcel Maďż˝an, Jorge Arellano
+   Patch: Eduardo Marcel Maçan, Jorge Arellano
  - * Made a help page, and linked it to 'about:help' (BUG#72)
    Patch: Jorge Arellano, Kristian A. Rink
  - * Added an "alt" camp to DilloUrl
@@ -1285,7 +1285,7 @@ dillo-0.5.1 [May 30, 2001]
    * Added support for EAGAIN in IO.c
    Patches: Livio Baldini
  - * Removed 6 memory leaks! (of varying significance)
-   Patches: Jďż˝rgen Viksell
+   Patches: Jörgen Viksell
  - * Fixed a bug in DwPage (BUG#162, crash when clicking on links).
    * Removed a_Dw_gtk_viewport_queue_anchor and related code (becomes obsolete
      with the new URL handling scheme).
@@ -1326,7 +1326,7 @@ dillo-0.5.0 [May 10, 2001]
      added READONLY, SIZE, MAXLENGTH attributes, type=BUTTON and some cleanups
    * Fixed VERBATIM parsing mode (BUG#130)
    * Fixed a bug in calculating the page width (BUG#136)
-   Patches: Jďż˝rgen Viksell
+   Patches: Jörgen Viksell
  - * Added a dillorc option to set the location entry within the menu bar.
    Patch: Eric Gaudet
  - * Integrated some modifications to ease compiling on GNU Darwin.
@@ -1365,7 +1365,7 @@ dillo-0.4.0 [March 3, 2001]
  - * Included a scaling font_factor into dillorc!
    Patch: Bruno Widmann
  - * Fixed bugs #125 and #129 (menu item focus and radio reset in forms)
-   Patch: Jďż˝rgen Viksell
+   Patch: Jörgen Viksell
  - * Added code to ignore anything inside STYLE tags.
    Patch: Mark McLoughlin
  - * Implemented image rendering based on GdkRGB and DwImage!
@@ -1385,9 +1385,9 @@ dillo-0.3.2 [February 22, 2001]
    * Repaired the dillorc parser to skip unknown symbols (BUG#119)
    Patch: Eric Gaudet
  - * Fixed the segfault for controls outside FORM and SELECT elements (BUG#121)
-   Patch: Eric Gaudet, Jďż˝rgen Viksell
+   Patch: Eric Gaudet, Jörgen Viksell
  - * Added support for SUB and SUP tags (BUG#115)
-   Patch: Jďż˝rgen Viksell
+   Patch: Jörgen Viksell
  - * Added a geometry directive to dillorc (sets initial browser size)
    Patch: Livio Baldini, Jorge Arellano
  - * Fixed bookmarks loading in new browser windows (BUG#110)
@@ -1415,7 +1415,7 @@ dillo-0.3.1 [December 22, 2000]
  - * Removed redundant functions from misc.c
    * Added support for BASE, CODE, DFN, KBD, SAMP and VAR tags (BUG#106)
    * Added support for TAB characters in plain text files (BUG#112)
-   Patches: Jďż˝rgen Viksell, Jorge Arellano
+   Patches: Jörgen Viksell, Jorge Arellano
  - * Fixed a_Url_squeeze (BUG#100)
    Patch: Livio Baldini, Jorge Arellano
  - * Added gamma support and basic transparency for PNG images (BUG#60)
@@ -1439,7 +1439,7 @@ dillo-0.3.0 [November 13, 2000]
 (Lots of patches are pending!)
 
  - * Added support for <strike>, <s>, <del> and <u> tags.
-   Patch: Jďż˝rgen Viksell
+   Patch: Jörgen Viksell
  - * Fixed a bug in #anchors code
    Patch: Sebastian Geerken
  - * Parsed text between script tags, out of the rendering part.
@@ -1489,7 +1489,7 @@ dillo-0.2.4 [August 21, 2000]
    * Added the base for refresh support in META tags.
    Patches: Sean 'Shaleh' Perry
  - * Added support for TEXTAREA tags!
-   Patch: Jďż˝rgen Viksell
+   Patch: Jörgen Viksell
  - * Improved and fixed Html_parse_entities.
    * Reimplemented the Stash buffer with a GString.
    * Fixed a bug with \r\n-terminated HTML lines.
@@ -1505,7 +1505,7 @@ dillo-0.2.3 [August 4, 2000]
  - * Removed "search.h" include in http.c (freeBSD compatibility).
    Patch: Kurt J. Lidl
  - * Removed several memory leaks that were sprinkled through the code.
-   Patches: Jďż˝rgen Viksell
+   Patches: Jörgen Viksell
  - * Fixed a segfault crash when hitting PgDn in the URL box (BUG #54).
    * Removed a segfault source in commands.c
    * Made some minor fixes to Dw and added more comments to the code.
@@ -1530,7 +1530,7 @@ dillo-0.2.2 [July 9, 2000]
      from having the same size as the main window. (Ex: with Sawfish)
    * Made some width and height changes to the SELECT-stuff
    * Added "submit" to submit buttons without a value.
-   Patches: Jďż˝rgen Viksell
+   Patches: Jörgen Viksell
  - * Fixed a segfault when calling "about:" method
    Patch: Dominic Wong
  - * Added an option to force dillorc-defined colors (Try it with slashdot!)
@@ -1574,7 +1574,7 @@ dillo-0.2.1 [June 17, 2000]
  - * Added some functionality to reload button (not complete yet)
    Patch: Luca Rota , Jorge Arellano Cid
  - * Fixed hash handling within URL parsing. (Bug #9)
-   Patch: Marcos Ramďż˝rez , Jorge Arellano Cid
+   Patch: Marcos Ramírez , Jorge Arellano Cid
 
 
 dillo-0.2.0 [June 2, 2000]
@@ -1625,7 +1625,7 @@ dillo-0.1.0 [Mar 30, 2000]
    * Added a startup page
    Patches: Jorge Arellano Cid
  - * Fixed a bug with http queries that sometimes produced infinite loops
-   Patch: Marcos Ramďż˝rez
+   Patch: Marcos Ramírez
 
 
 dillo-0.0.6 [Mar 9, 2000]
diff --git a/src/dicache.c b/src/dicache.c
index 9a34544e..21173c9a 100644
--- a/src/dicache.c
+++ b/src/dicache.c
@@ -314,7 +314,7 @@ void a_Dicache_set_parms(DilloUrl *url, int version, DilloImage *Image,
 {
    DICacheEntry *DicEntry;
 
-   MSG("a_Dicache_set_parms (%s)\n", URL_STR(url));
+   _MSG("a_Dicache_set_parms (%s)\n", URL_STR(url));
    dReturn_if_fail ( Image != NULL && width && height );
    /* Find the DicEntry for this Image */
    DicEntry = a_Dicache_get_entry(url, version);
@@ -322,7 +322,7 @@ void a_Dicache_set_parms(DilloUrl *url, int version, DilloImage *Image,
    /* Parameters already set? */
    dReturn_if_fail ( DicEntry->State < DIC_SetParms );
 
-   MSG("  RefCount=%d version=%d\n", DicEntry->RefCount, DicEntry->version);
+   _MSG("  RefCount=%d version=%d\n", DicEntry->RefCount, DicEntry->version);
 
    /* BUG: there's just one image-type now */
    #define I_RGB 0
@@ -347,6 +347,7 @@ void a_Dicache_set_cmap(DilloUrl *url, int version, DilloImage *Image,
 {
    DICacheEntry *DicEntry = a_Dicache_get_entry(url, version);
 
+   _MSG("a_Dicache_set_cmap\n");
    dReturn_if_fail ( DicEntry != NULL );
 
    dFree(DicEntry->cmap);
@@ -368,7 +369,7 @@ void a_Dicache_new_scan(const DilloUrl *url, int version)
 {
    DICacheEntry *DicEntry;
 
-   MSG("a_Dicache_new_scan\n");
+   _MSG("a_Dicache_new_scan\n");
    dReturn_if_fail ( url != NULL );
    DicEntry = a_Dicache_get_entry(url, version);
    dReturn_if_fail ( DicEntry != NULL );
@@ -415,7 +416,7 @@ void a_Dicache_close(DilloUrl *url, int version, CacheClient_t *Client)
    DICacheEntry *DicEntry = a_Dicache_get_entry(url, version);
 
    dReturn_if_fail ( DicEntry != NULL );
-   MSG("a_Dicache_close RefCount=%d\n", DicEntry->RefCount);
+   _MSG("a_Dicache_close RefCount=%d\n", DicEntry->RefCount);
 
    DicEntry->State = DIC_Close;
    dFree(DicEntry->cmap);
diff --git a/src/html.cc b/src/html.cc
index 6454d6df..284e1a6a 100644
--- a/src/html.cc
+++ b/src/html.cc
@@ -1600,7 +1600,7 @@ static void Html_tag_open_head(DilloHtml *html, const char *tag, int tagsize)
 static void Html_tag_close_head(DilloHtml *html, int TagIdx)
 {
    if (html->InFlags & IN_HEAD) {
-      MSG("Closing HEAD section\n");
+      _MSG("Closing HEAD section\n");
       if (html->Num_TITLE == 0)
          BUG_MSG("HEAD section lacks the TITLE element\n");
 
@@ -3025,7 +3025,7 @@ static void Html_tag_open_link(DilloHtml *html, const char *tag, int tagsize)
       return;
 
    MSG("  Html_tag_open_link(): URL=%s\n", URL_STR(url));
-   MSG("    repush after HEAD=%d\n", html->repush_after_head);
+   _MSG("    repush after HEAD=%d\n", html->repush_after_head);
 
    Html_load_stylesheet(html, url);
    a_Url_free(url);
diff --git a/src/image.cc b/src/image.cc
index cc41bc7c..0edaf35c 100644
--- a/src/image.cc
+++ b/src/image.cc
@@ -91,7 +91,7 @@ void a_Image_set_parms(DilloImage *Image, void *v_imgbuf, DilloUrl *url,
                        int version, uint_t width, uint_t height,
                        DilloImgType type)
 {
-   MSG("a_Image_set_parms: width=%d height=%d\n", width, height);
+   _MSG("a_Image_set_parms: width=%d height=%d\n", width, height);
 
    bool resize = (Image->width != width || Image->height != height);
    OI(Image)->setBuffer((Imgbuf*)v_imgbuf, resize);
@@ -109,7 +109,7 @@ void a_Image_set_parms(DilloImage *Image, void *v_imgbuf, DilloUrl *url,
  */
 void a_Image_set_cmap(DilloImage *Image, const uchar_t *cmap)
 {
-   MSG("a_Image_set_cmap\n");
+   _MSG("a_Image_set_cmap\n");
    Image->cmap = cmap;
    Image->State = IMG_SetCmap;
 }
@@ -119,7 +119,7 @@ void a_Image_set_cmap(DilloImage *Image, const uchar_t *cmap)
  */
 void a_Image_new_scan(DilloImage *Image, void *v_imgbuf)
 {
-   MSG("a_Image_new_scan\n");
+   _MSG("a_Image_new_scan\n");
    a_Bitvec_clear(Image->BitVec);
    Image->ScanNumber++;
    ((Imgbuf*)v_imgbuf)->newScan();
@@ -144,7 +144,7 @@ void a_Image_write(DilloImage *Image, uint_t y)
  */
 void a_Image_close(DilloImage *Image)
 {
-   MSG("a_Image_close\n");
+   _MSG("a_Image_close\n");
    a_Image_unref(Image);
 }