[rhythmbox/gobject-introspection: 39/88] Merge branch 'master' into gobject-introspection

[Jonathan Matthew <jmatthew src gnome org>]

commit dff68a45fd9eef251c26bcb5ea8e68660ae145fe
Merge: 9a869f4 828c32d
Author: Jonathan Matthew <jonathan d14n org>
Date:   Wed Aug 18 17:30:03 2010 +1000

    Merge branch 'master' into gobject-introspection
    
    Conflicts:
    	bindings/python/rb.defs

 backends/gstreamer/rb-player-gst-xfade.c           |    3 +
 configure.ac                                       |    4 +
 data/Makefile.am                                   |   15 +-
 data/icons/hicolor/16x16/status/Makefile.am        |    4 +-
 .../hicolor/16x16/status/rhythmbox-notplaying.png  |  Bin 541 -> 0 bytes
 .../hicolor/16x16/status/rhythmbox-notplaying.svg  |  571 ------
 data/icons/hicolor/22x22/Makefile.am               |    2 +-
 data/icons/hicolor/22x22/status/Makefile.am        |   15 -
 .../hicolor/22x22/status/rhythmbox-notplaying.png  |  Bin 896 -> 0 bytes
 .../hicolor/22x22/status/rhythmbox-notplaying.svg  |  611 -------
 data/icons/hicolor/32x32/Makefile.am               |    2 +-
 data/icons/hicolor/32x32/status/Makefile.am        |   15 -
 .../hicolor/32x32/status/rhythmbox-notplaying.png  |  Bin 1271 -> 0 bytes
 .../hicolor/32x32/status/rhythmbox-notplaying.svg  |  670 -------
 data/icons/hicolor/scalable/Makefile.am            |    2 +-
 data/icons/hicolor/scalable/status/Makefile.am     |   14 -
 .../scalable/status/rhythmbox-notplaying.svg       |  700 --------
 data/rhythmbox-client.1                            |    9 +
 data/rhythmbox-device.desktop.in.in                |   19 +
 data/rhythmbox.desktop.in.in                       |    2 +-
 lib/rb-stock-icons.c                               |    3 +-
 lib/rb-stock-icons.h                               |    3 +-
 metadata/rb-metadata-gst.c                         |    1 +
 plugins/audioscrobbler/rb-lastfm-source.c          |   30 +-
 plugins/iradio/rb-iradio-source.c                  |   18 +-
 plugins/jamendo/jamendo-loading.ui                 |    2 +-
 plugins/mpris/mpris-spec.h                         |  127 +-
 plugins/mpris/rb-mpris-plugin.c                    | 1060 ++++++++---
 plugins/status-icon/rb-tray-icon-gtk.c             |   19 +-
 po/es.po                                           |  809 +++++----
 po/ja.po                                           | 1886 +++++++++++---------
 po/nb.po                                           | 1615 ++++++++++--------
 po/ru.po                                           | 1768 +++++++++++--------
 po/sl.po                                           |  829 +++++-----
 po/sv.po                                           |  587 +++---
 podcast/Makefile.am                                |    1 +
 remote/dbus/rb-client.c                            |   61 +
 rhythmdb/Makefile.am                               |    1 +
 rhythmdb/rhythmdb-entry-type.c                     |   70 +
 rhythmdb/rhythmdb-entry-type.h                     |   22 +-
 rhythmdb/rhythmdb-monitor.c                        |   65 +-
 rhythmdb/rhythmdb-private.h                        |    3 +
 rhythmdb/rhythmdb-song-entry-types.c               |  126 ++-
 rhythmdb/rhythmdb.c                                |  263 ++--
 shell/main.c                                       |    8 +-
 shell/rb-shell-player.c                            |   57 +-
 shell/rb-shell.c                                   |  240 ++-
 shell/rb-shell.h                                   |    6 +
 shell/rb-shell.xml                                 |    9 +
 sources/rb-library-source.c                        |   53 +-
 sources/rb-podcast-source.c                        |   18 +-
 sources/rb-source.c                                |   13 +-
 sources/rb-source.h                                |   17 +-
 53 files changed, 5796 insertions(+), 6652 deletions(-)
---