[rhythmbox/gobject-introspection: 201/205] Merge branch 'master' into gobject-introspection

[Jonathan Matthew <jmatthew src gnome org>]

commit 2c4bce9208d358fc88a8decfa4c035d31215219f
Merge: 40dfb9e 3fba474
Author: Jonathan Matthew <jonathan d14n org>
Date:   Tue Oct 26 19:10:33 2010 +1000

    Merge branch 'master' into gobject-introspection
    
    Conflicts:
    	bindings/python/rb.defs
    	bindings/python/rb.override
    	configure.ac
    	plugins/cd-recorder/rb-playlist-source-recorder.c

 backends/gstreamer/rb-player-gst-xfade.c           |   19 +
 backends/gstreamer/rb-player-gst.c                 |    5 +-
 configure.ac                                       |   10 +-
 data/rhythmbox.schemas                             |   22 +
 plugins/Makefile.am                                |    1 +
 .../rb-audioscrobbler-radio-source.c               |   26 +-
 plugins/daap/Makefile.am                           |    6 +
 plugins/daap/daap-prefs.ui                         |  288 +-
 plugins/daap/rb-daap-plugin.c                      |  108 +-
 plugins/daap/rb-daap-record.c                      |   57 +-
 plugins/daap/rb-dacp-player.c                      |  360 +
 plugins/daap/rb-dacp-player.h                      |   71 +
 plugins/daap/rb-dacp-source.c                      |  656 ++
 plugins/daap/rb-dacp-source.h                      |   79 +
 plugins/daap/rb-rhythmdb-dmap-db-adapter.c         |    6 +-
 plugins/daap/remote-icon.png                       |  Bin 0 -> 4641 bytes
 plugins/ipod/rb-ipod-db.c                          |   51 +-
 plugins/ipod/rb-ipod-source.c                      |  106 +-
 plugins/ipod/rb-ipod-static-playlist-source.c      |   17 +-
 plugins/iradio/iradio-initial.xspf                 |   18 +-
 plugins/iradio/rb-iradio-source.c                  |   17 +-
 plugins/mmkeys/rb-mmkeys-plugin.c                  |   59 +-
 plugins/mtpdevice/rb-mtp-gst-src.c                 |  302 +-
 plugins/rbzeitgeist/Makefile.am                    |   14 +
 plugins/rbzeitgeist/rbzeitgeist.rb-plugin.in       |    9 +
 plugins/rbzeitgeist/rbzeitgeist/__init__.py        |  149 +
 plugins/status-icon/rb-status-icon-plugin.c        |  154 +-
 po/POTFILES.in                                     |    5 +-
 po/cs.po                                           |  841 +-
 po/da.po                                           | 1635 ++--
 po/de.po                                           | 2074 ++---
 po/es.po                                           | 1632 ++--
 po/et.po                                           |  790 +-
 po/gl.po                                           | 1653 ++--
 po/ja.po                                           | 1636 ++--
 po/lt.po                                           | 2006 ++--
 po/nl.po                                           | 5529 ++++++-----
 po/pl.po                                           | 1553 ++--
 po/ru.po                                           | 1889 ++--
 po/sl.po                                           |11434 ++++++++++----------
 po/sv.po                                           | 2495 +++--
 podcast/Makefile.am                                |    6 +-
 podcast/rb-podcast-main-source.c                   |  422 +
 podcast/rb-podcast-main-source.h                   |   65 +
 podcast/rb-podcast-manager.c                       |   23 +-
 podcast/rb-podcast-properties-dialog.c             |   19 +
 {sources => podcast}/rb-podcast-source.c           | 2190 ++---
 {sources => podcast}/rb-podcast-source.h           |   12 +-
 remote/dbus/rb-client.c                            |   13 +
 rhythmdb/rhythmdb-property-model.c                 |    2 +
 shell/rb-shell-player.c                            |   52 +-
 shell/rb-shell.c                                   |   22 +-
 shell/rb-shell.h                                   |    2 +-
 sources/Makefile.am                                |    4 +-
 sources/rb-library-source.c                        |   17 +-
 sources/rb-source.c                                |    7 +-
 sources/rb-source.h                                |    4 +-
 sources/rb-sourcelist-model.c                      |    4 +-
 sources/rb-sourcelist.c                            |   10 +-
 widgets/rb-property-view.c                         |    8 +-
 widgets/rb-rating-helper.c                         |    8 +-
 widgets/rb-rating-helper.h                         |    4 +-
 62 files changed, 22444 insertions(+), 18232 deletions(-)
---
diff --cc configure.ac
index 13d1d0e,a1979c6..bc8c869
--- a/configure.ac
+++ b/configure.ac
@@@ -52,8 -47,12 +52,8 @@@ GLIB_REQS=2.18.
  LIBGPOD_REQS=0.6
  MUSICBRAINZ_REQS=2.1.0
  MUSICBRAINZ3_REQS=3.0.2
- TOTEM_PLPARSER_REQS=2.30.2
 -NCB_MIN_REQS=2.21.6
 -BRASERO_MIN_REQS=0.9.1
+ TOTEM_PLPARSER_REQS=2.32.1
 -VALA_REQS=0.1.0
 +VALA_REQS=0.9.4
  AVAHI_REQS=0.6
  LIBSOUP_REQS=2.26.0
  GUDEV_REQS=143
@@@ -946,9 -925,10 +951,10 @@@ plugins/replaygain/Makefil
  plugins/replaygain/replaygain/Makefile
  plugins/mpris/Makefile
  plugins/dbus-media-server/Makefile
+ plugins/rbzeitgeist/Makefile
  bindings/Makefile
 -bindings/python/Makefile
  bindings/vala/Makefile
 +bindings/gi/Makefile
  help/Makefile
  po/Makefile.in
  tests/Makefile