[yelp/webkit: 33/33] Merge branch 'gnome-2-30' into webkit

[Josselin Mouette <jmouette src gnome org>]

commit a99563cfccc7376e377d74ceffa20b97007cf711
Merge: 3791450 db4fc8e
Author: Josselin Mouette <joss debian org>
Date:   Sat Apr 3 13:51:25 2010 +0200

    Merge branch 'gnome-2-30' into webkit
    
    Conflicts:
    	src/yelp-html.c
    	src/yelp-window.c
    	stylesheets/db2html.xsl.in
    
    Excluding commit a5588114ed94d00ca64913aa5b248e09a5e13edc

 NEWS                        |   49 ++
 configure.in                |    6 +-
 po/LINGUAS                  |    1 +
 po/bn.po                    |  154 ++--
 po/ca.po                    |   57 +-
 po/en shaw po               | 1378 ++++++++++++++++++++++++++++++++++
 po/eu.po                    |    8 +-
 po/gl.po                    |  135 ++--
 po/he.po                    |  343 +++++----
 po/lt.po                    |  308 +++++---
 po/lv.po                    | 1706 ++++++++++++++++++++++++++++++-------------
 po/nl.po                    |  444 +++++++-----
 po/nn.po                    |  905 +++++++++++++----------
 po/pl.po                    |  267 ++++----
 po/ru.po                    |  303 +++++----
 po/sv.po                    |   88 ++--
 po/th.po                    |  294 +++++---
 po/vi.po                    |  280 +++++---
 src/eggdesktopfile.c        |    8 -
 src/gtkentryaction.c        |    8 +-
 src/yelp-base.c             |    5 +-
 src/yelp-mallard.c          |   24 +-
 src/yelp-print.c            |    8 +-
 src/yelp-print.h            |    2 +-
 src/yelp-settings.c         |    9 +-
 src/yelp-window.c           |   23 +-
 stylesheets/mal2html.xsl.in |   10 +-
 tests/test-uri.c            |    1 +
 28 files changed, 4715 insertions(+), 2109 deletions(-)
---
diff --cc src/yelp-window.c
index 03ebe57,401e059..e2a31cf
--- a/src/yelp-window.c
+++ b/src/yelp-window.c
@@@ -907,8 -919,9 +907,8 @@@ page_request_cb (YelpDocument       *do
  
  	window->priv->current_request = -1;
  	yelp_page_free ((YelpPage *) func_data);
- 	gdk_window_set_cursor (GTK_WIDGET (window)->window, NULL);
- 
+ 	gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (window)),
+ 	                       NULL);
 -	g_free (data);
  	break;
      case YELP_DOCUMENT_SIGNAL_TITLE:
  	/* We don't need to actually handle title signals as gecko