[yelp/yelp-3-0: 26/27] Merge commit 'origin/webkit' into yelp-3-0

[Shaun McCance <shaunm src gnome org>]

commit 3da814fdf5c3dd8d209574fdeb99cc2cf6cbdfb4
Merge: 83fc28c... f26a70b...
Author: Shaun McCance <shaunm gnome org>
Date:   Sun Sep 6 15:16:36 2009 -0500

    Merge commit 'origin/webkit' into yelp-3-0
    
    Conflicts:
    	src/yelp-info-parser.c
    	src/yelp-window.c

 Makefile.am                        |    2 -
 configure.in                       |   52 +---
 m4/gecko.m4                        |  735 ------------------------------------
 src/Makefile.am                    |   51 +---
 src/Yelper.cpp                     |  335 ----------------
 src/Yelper.h                       |   69 ----
 src/yelp-gecko-services.cpp        |  464 -----------------------
 src/yelp-gecko-services.h          |   80 ----
 src/yelp-gecko-utils.cpp           |  271 -------------
 src/yelp-gecko-utils.h             |   41 --
 src/{yelp-html.cpp => yelp-html.c} |  331 +++++++++-------
 src/yelp-html.h                    |   19 +-
 src/yelp-info-parser.c             |   10 +-
 src/yelp-io-channel.c              |    7 -
 src/yelp-main.c                    |   15 +-
 src/yelp-search-parser.c           |   10 +-
 src/yelp-window.c                  |  158 +++-----
 stylesheets/db2html.xsl.in         |   24 +-
 stylesheets/toc2html.xsl.in        |    4 +-
 19 files changed, 293 insertions(+), 2385 deletions(-)
---
diff --cc src/yelp-window.c
index 58afc0a,ed7d501..8543986
--- a/src/yelp-window.c
+++ b/src/yelp-window.c
@@@ -2861,23 -2804,18 +2829,25 @@@ window_write_html (YelpWindow *window, 
  {
      gchar *uri = NULL;
      gsize read;
-     YelpHtml *html = data->window->priv->html_view;
      gchar contents[BUFFER_SIZE];
+     
+     if (!html)
+         html = window->priv->html_view;
  
      /* Use a silly fake URI to stop gecko doing silly things */
 -    if (window->priv->current_frag)
 -	uri = g_strdup_printf ("%s?%s", window->priv->base_uri, 
 -			       window->priv->current_frag);
 +    if (data->window->priv->current_frag) {
 +        /* FIXME: more of this terrible slash hack */
 +        gchar *slash, *jump_id;
 +        slash = strchr (data->window->priv->current_frag, '/');
 +        if (slash)
 +            jump_id = slash + 1;
 +        else
 +            jump_id = data->window->priv->current_frag;
 +	uri = g_strdup_printf ("%s#%s", data->window->priv->base_uri, jump_id);
 +    }
      else
- 	uri = g_strdup (data->window->priv->base_uri);
- 
+ 	uri = g_strdup (window->priv->base_uri);
+     
      yelp_html_set_base_uri (html, uri);
      g_free (uri);
      yelp_html_open_stream (html, "application/xhtml+xml");