[yelp: 3/4] Merge branch 'master' into db5

[Shaun McCance <shaunm src gnome org>]

commit 5c74d7b352d11c021dddb6c9f55d3a377ec82b14
Merge: bad5a49 55da840
Author: Shaun McCance <shaunm gnome org>
Date:   Fri May 21 17:59:51 2010 -0500

    Merge branch 'master' into db5

 .gitignore                                   |   46 +-
 Makefile.am                                  |    5 +-
 NEWS                                         |  135 ++
 autogen.sh                                   |    5 +-
 configure.ac                                 |  232 ++
 configure.in                                 |  298 ---
 data/Makefile.am                             |   16 +-
 data/icons/hicolor/16x16/status/Makefile.am  |    1 +
 data/icons/hicolor/16x16/status/bookmark.png |  Bin 0 -> 576 bytes
 data/org.gnome.yelp.gschema.xml              |   27 +
 data/ui/Makefile.am                          |    5 -
 data/ui/yelp-bookmarks-add.ui                |  105 -
 data/ui/yelp-bookmarks.ui                    |  160 --
 data/ui/yelp-open-location.ui                |  100 -
 data/ui/yelp-preferences.ui                  |  222 --
 data/ui/yelp-search-ui.xml                   |    9 -
 data/ui/yelp-ui.xml                          |   81 -
 docs/libyelp/Makefile.am                     |    8 +-
 libyelp/Makefile.am                          |   36 +-
 libyelp/yelp-bz2-decompressor.c              |  173 ++
 libyelp/yelp-bz2-decompressor.h              |   53 +
 libyelp/yelp-docbook-document.c              |   17 +-
 libyelp/yelp-document.c                      |   37 +-
 libyelp/yelp-info-document.c                 |  486 ++++
 libyelp/yelp-info-document.h                 |   52 +
 {src => libyelp}/yelp-info-parser.c          |  126 +-
 {src => libyelp}/yelp-info-parser.h          |   10 +-
 libyelp/yelp-io-channel.c                    |  224 --
 libyelp/yelp-io-channel.h                    |   31 -
 libyelp/yelp-location-entry.c                |  139 ++-
 libyelp/yelp-location-entry.h                |   12 +-
 libyelp/yelp-lzma-decompressor.c             |  182 ++
 libyelp/yelp-lzma-decompressor.h             |   52 +
 libyelp/yelp-magic-decompressor.c            |  161 ++
 libyelp/yelp-magic-decompressor.h            |   52 +
 libyelp/yelp-settings.c                      |   38 +-
 libyelp/yelp-settings.h                      |    3 +
 libyelp/yelp-simple-document.c               |   46 +-
 libyelp/yelp-uri.c                           |   69 +-
 libyelp/yelp-view.c                          |  837 +++++++-
 libyelp/yelp-view.h                          |   27 +-
 po/LINGUAS                                   |    1 +
 po/POTFILES.in                               |   26 +-
 po/POTFILES.skip                             |    6 +
 po/bn_IN.po                                  |   16 +-
 po/ca valencia po                            | 2126 ++++++++++++++++++
 po/crh.po                                    | 1850 ++++++++++++++++
 po/de.po                                     |  999 +++++----
 po/es.po                                     | 1213 ++++++-----
 po/gl.po                                     | 1220 ++++++-----
 po/id.po                                     | 1637 ++++++--------
 po/kn.po                                     |  318 ++--
 po/nb.po                                     |  734 +++----
 po/oc.po                                     |  202 +-
 po/or.po                                     |  858 +++-----
 po/sl.po                                     | 3040 +++++++++++++-------------
 po/ug.po                                     | 1977 +++++++++++++----
 src/Makefile.am                              |   75 +-
 src/eggdesktopfile.c                         | 1477 -------------
 src/eggsmclient-osx.c                        |  235 --
 src/eggsmclient-private.h                    |   53 -
 src/eggsmclient-win32.c                      |  353 ---
 src/eggsmclient-xsmp.c                       | 1405 ------------
 src/eggsmclient.c                            |  610 ------
 src/eggsmclient.h                            |  123 --
 src/gtkentryaction.c                         |  357 ---
 src/gtkentryaction.h                         |   67 -
 src/yelp-application.c                       |  380 +++-
 src/yelp-application.h                       |   45 +-
 src/yelp-base.c                              |  321 ---
 src/yelp-base.h                              |   67 -
 src/yelp-bookmarks.c                         | 1154 ----------
 src/yelp-bookmarks.h                         |   38 -
 src/yelp-error.c                             |  149 --
 src/yelp-error.h                             |   54 -
 src/yelp-html.c                              |  587 -----
 src/yelp-html.h                              |  109 -
 src/yelp-info.c                              |  436 ----
 src/yelp-info.h                              |   53 -
 src/yelp-infos.xml                           |   15 -
 src/yelp-main.c                              |  437 ----
 src/yelp-marshal.list                        |    6 -
 src/yelp-toc.c                               |    2 +-
 src/yelp-window.c                            | 1392 +++++++++---
 src/yelp-window.h                            |   14 +-
 stylesheets/Makefile.am                      |    9 +-
 stylesheets/info2html.xsl                    |  127 --
 stylesheets/info2html.xsl.in                 |  167 ++
 stylesheets/yelp-common.xsl.in               |    2 -
 tests/Makefile.am                            |   21 +-
 tests/{test-io-channel.c => test-bz2.c}      |   34 +-
 tests/{test-io-channel.c => test-lzma.c}     |   34 +-
 tests/{test-io-channel.c => test-magic.c}    |   34 +-
 tests/test-transform.c                       |    4 +-
 tests/test-uri.c                             |    4 +-
 95 files changed, 15109 insertions(+), 15882 deletions(-)
---