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

[Jonathan Matthew <jmatthew src gnome org>]

commit 09bbfbc0fe1e22770874a9208cead407324fdbb5
Merge: 17a5727 3fdd4e3
Author: Jonathan Matthew <jonathan d14n org>
Date:   Wed Sep 22 21:54:51 2010 +1000

    Merge branch 'master' into gobject-introspection
    
    Conflicts:
    	configure.ac
    	plugins/audioscrobbler/rb-audioscrobbler-plugin.c
    	plugins/coherence/upnp_coherence/__init__.py

 backends/gstreamer/rb-encoder-gst.c                |   48 +-
 backends/gstreamer/rb-encoder-gst.h                |    1 +
 configure.ac                                       |   40 +-
 data/rhythmbox.schemas                             |   26 +-
 help/Makefile.am                                   |    2 +-
 help/ja/ja.po                                      | 2898 ++++++++++++++++++++
 lib/rb-marshal.list                                |    1 +
 lib/rb-preferences.h                               |    2 -
 plugins/Makefile.am                                |    4 +-
 .../{as-icon.png => Last.fm-icon.png}              |  Bin 1014 -> 1014 bytes
 .../{as-icon.svg => Last.fm-icon.svg}              |    0
 plugins/audioscrobbler/Libre.fm-icon.png           |  Bin 0 -> 803 bytes
 plugins/audioscrobbler/Makefile.am                 |   35 +-
 .../audioscrobbler/audioscrobbler-preferences.ui   |  137 +
 plugins/audioscrobbler/audioscrobbler-prefs.ui     |  347 ---
 .../audioscrobbler/audioscrobbler-profile-ui.xml   |    5 +
 plugins/audioscrobbler/audioscrobbler-profile.ui   |  671 +++++
 plugins/audioscrobbler/audioscrobbler-radio-ui.xml |    6 +
 plugins/audioscrobbler/audioscrobbler-ui.xml       |   14 -
 plugins/audioscrobbler/rb-audioscrobbler-account.c |  742 +++++
 plugins/audioscrobbler/rb-audioscrobbler-account.h |   88 +
 plugins/audioscrobbler/rb-audioscrobbler-entry.c   |   30 +-
 plugins/audioscrobbler/rb-audioscrobbler-entry.h   |    3 +-
 ...play-order.c => rb-audioscrobbler-play-order.c} |   26 +-
 ...play-order.h => rb-audioscrobbler-play-order.h} |   26 +-
 plugins/audioscrobbler/rb-audioscrobbler-plugin.c  |  284 ++-
 .../rb-audioscrobbler-profile-source.c             | 1939 +++++++++++++
 .../rb-audioscrobbler-profile-source.h             |   69 +
 .../rb-audioscrobbler-radio-source.c               | 1494 ++++++++++
 .../rb-audioscrobbler-radio-source.h               |   91 +
 .../rb-audioscrobbler-radio-track-entry-type.c     |   65 +
 .../rb-audioscrobbler-radio-track-entry-type.h     |   53 +
 plugins/audioscrobbler/rb-audioscrobbler-service.c |  325 +++
 plugins/audioscrobbler/rb-audioscrobbler-service.h |   70 +
 plugins/audioscrobbler/rb-audioscrobbler-user.c    | 1791 ++++++++++++
 plugins/audioscrobbler/rb-audioscrobbler-user.h    |  109 +
 plugins/audioscrobbler/rb-audioscrobbler.c         |  519 ++---
 plugins/audioscrobbler/rb-audioscrobbler.h         |   30 +-
 plugins/audioscrobbler/rb-lastfm-source.c          | 2316 ----------------
 plugins/audioscrobbler/rb-lastfm-source.h          |   65 -
 plugins/coherence/upnp_coherence/__init__.py       |    1 +
 plugins/daap/rb-daap-record.c                      |   10 +
 plugins/iradio/Makefile.am                         |    4 +-
 plugins/iradio/iradio-initial.pls                  |   96 -
 plugins/iradio/iradio-initial.xspf                 |  151 +
 plugins/iradio/rb-iradio-source.c                  |    2 +-
 po/POTFILES.in                                     |    8 +-
 po/da.po                                           | 1710 +++++++-----
 po/de.po                                           |  652 +++--
 po/el.po                                           | 2341 ++++++++---------
 po/et.po                                           |  428 +++-
 po/it.po                                           |  885 ++++---
 po/ja.po                                           |  787 +++---
 sources/rb-sourcelist.c                            |    3 +-
 tests/Makefile.am                                  |    5 +-
 widgets/rb-cell-renderer-pixbuf.c                  |   39 +-
 56 files changed, 15013 insertions(+), 6481 deletions(-)
---
diff --cc configure.ac
index f992b01,8fd1b6b..98ae688
--- 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.28.0
 -NCB_MIN_REQS=2.21.6
 -BRASERO_MIN_REQS=0.9.1
+ TOTEM_PLPARSER_REQS=2.30.2
 -VALA_REQS=0.1.0
 +VALA_REQS=0.9.4
  AVAHI_REQS=0.6
  LIBSOUP_REQS=2.26.0
  GUDEV_REQS=143
diff --cc plugins/coherence/upnp_coherence/__init__.py
index a6e8b87,61e1803..388324d
--- a/plugins/coherence/upnp_coherence/__init__.py
+++ b/plugins/coherence/upnp_coherence/__init__.py
@@@ -39,9 -42,10 +39,10 @@@ class CoherencePlugin(RB.Plugin, log.Lo
      logCategory = 'rb_coherence_plugin'
  
      def __init__(self):
 -        rb.Plugin.__init__(self)
 +        RB.Plugin.__init__(self)
          self.coherence = None
 -        self.config = gconf.client_get_default()
 +        self.config = GConf.Client.get_default()
+         self.entry_type = None
  
          if self.config.get(gconf_keys['dmc_active']) is None:
              # key not yet found represented by "None"