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



commit fbadd17422c8aad8b42f4fb8eae4430bc4818807
Merge: dff68a4 8bc5c55
Author: Jonathan Matthew <jonathan d14n org>
Date:   Tue Sep 7 19:23:20 2010 +1000

    Merge branch 'master' into gobject-introspection
    
    Conflicts:
    	bindings/python/Makefile.am
    	bindings/python/rb.defs
    	bindings/vala/rb.vapi
    	bindings/vala/rhythmdb.vapi
    	configure.ac
    	plugins/im-status/im-status/__init__.py

 .gitignore                                         |    1 +
 bindings/vala/rb.deps                              |    1 +
 configure.ac                                       |    6 +-
 data/playlists.xml.in                              |    6 +-
 data/rhythmbox.schemas                             |   22 +
 data/ui/general-prefs.ui                           |   12 +
 data/ui/playback-prefs.ui                          |   13 +
 help/gl/figures/rb-iradio-main.png                 |  Bin 76001 -> 0 bytes
 help/gl/figures/rb-notification-area-menu.png      |  Bin 9577 -> 0 bytes
 help/gl/figures/rb-notification-window.png         |  Bin 11131 -> 0 bytes
 help/gl/figures/rb-notification-zone.png           |  Bin 4238 -> 0 bytes
 help/gl/figures/rb-podcast-main.png                |  Bin 55302 -> 0 bytes
 help/gl/figures/rb-statusbar.png                   |  Bin 5433 -> 0 bytes
 help/gl/figures/rb-toolbar-prevplaynext.png        |  Bin 1549 -> 0 bytes
 help/gl/figures/rb-toolbar-repeat.png              |  Bin 4614 -> 0 bytes
 help/gl/figures/rb-toolbar-shuffle.png             |  Bin 4579 -> 0 bytes
 help/gl/figures/rb-toolbar.png                     |  Bin 7469 -> 0 bytes
 help/gl/figures/rb-volume-changer.png              |  Bin 5916 -> 0 bytes
 help/gl/figures/rb-window-small.png                |  Bin 16694 -> 0 bytes
 help/gl/figures/rb-window.png                      |  Bin 84361 -> 0 bytes
 lib/rb-util.c                                      |    2 +-
 lib/rb-util.h                                      |    2 +-
 plugins/Makefile.am                                |    4 +-
 plugins/audioscrobbler/rb-lastfm-source.c          |    8 +-
 plugins/dbus-media-server/Makefile.am              |   39 +
 plugins/dbus-media-server/dbus-media-server-spec.h |   63 +
 .../dbus-media-server.rb-plugin.in                 |    8 +
 .../rb-dbus-media-server-plugin.c                  | 1066 ++++++++++
 plugins/im-status/im-status/__init__.py            |    2 +-
 plugins/iradio/rb-iradio-source.c                  |    8 +-
 plugins/lirc/rb-lirc-plugin.c                      |    4 +-
 plugins/mmkeys/rb-mmkeys-plugin.c                  |    4 +-
 plugins/mpris/rb-mpris-plugin.c                    |  145 +-
 plugins/mtpdevice/rb-mtp-source.c                  |   15 +-
 plugins/power-manager/rb-power-manager-plugin.c    |    2 +-
 plugins/visualizer/rb-visualizer-plugin.c          |   25 +
 po/POTFILES.in                                     |    2 +
 po/POTFILES.skip                                   |    1 +
 po/cs.po                                           |  804 ++++----
 po/de.po                                           |  979 +++++-----
 po/en_GB.po                                        | 2038 +++++++++++---------
 po/es.po                                           |  268 ++--
 po/fr.po                                           |  843 +++++----
 po/gl.po                                           |  821 +++++----
 po/hu.po                                           |  846 +++++----
 po/pl.po                                           |  848 +++++----
 po/pt.po                                           | 1936 +++++++++++--------
 po/pt_BR.po                                        | 1716 ++++++++++-------
 po/sl.po                                           |  620 +++---
 po/sr.po                                           |  899 +++++-----
 po/sr latin po                                     |  899 +++++-----
 po/sv.po                                           |  712 ++++----
 po/zh_CN.po                                        |  849 +++++----
 remote/dbus/rb-client.c                            |   11 +-
 rhythmdb/Makefile.am                               |    2 +
 rhythmdb/rhythmdb-import-job.c                     |    2 +-
 rhythmdb/rhythmdb-monitor.c                        |  125 +-
 rhythmdb/rhythmdb-query-result-list.c              |  152 ++
 rhythmdb/rhythmdb-query-result-list.h              |   72 +
 rhythmdb/rhythmdb-tree.c                           |    4 -
 rhythmdb/rhythmdb.h                                |    2 -
 shell/rb-shell-player.c                            |   35 +-
 shell/rb-shell-player.h                            |    4 +-
 shell/rb-shell-player.xml                          |    5 +
 shell/rb-shell-preferences.c                       |   93 +
 shell/rb-shell-preferences.h                       |   17 +
 shell/rb-shell.c                                   |  264 ++-
 shell/rb-shell.h                                   |    2 +
 sources/rb-import-errors-source.c                  |    2 +-
 tests/test-utils.c                                 |    6 +-
 widgets/rb-entry-view.c                            |   18 +-
 71 files changed, 10182 insertions(+), 7173 deletions(-)
---
diff --cc bindings/vala/rb.deps
index 4ea28fe,26d4d69..cbaaca8
--- a/bindings/vala/rb.deps
+++ b/bindings/vala/rb.deps
@@@ -1,5 -1,3 +1,6 @@@
  gtk+-2.0
 +gdk-pixbuf-2.0
 +libxml-2.0
 +glib-2.0
  rhythmdb
+ gstreamer-0.10
diff --cc configure.ac
index 4b4417e,794ee74..4f117b8
--- 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.26.0
 -NCB_MIN_REQS=2.21.6
 -BRASERO_MIN_REQS=0.9.1
+ TOTEM_PLPARSER_REQS=2.28.0
 -VALA_REQS=0.1.0
 +VALA_REQS=0.9.4
  AVAHI_REQS=0.6
  LIBSOUP_REQS=2.26.0
  GUDEV_REQS=143
@@@ -929,9 -901,10 +926,10 @@@ plugins/sendto/Makefil
  plugins/replaygain/Makefile
  plugins/replaygain/replaygain/Makefile
  plugins/mpris/Makefile
+ plugins/dbus-media-server/Makefile
  bindings/Makefile
 -bindings/python/Makefile
  bindings/vala/Makefile
 +bindings/gi/Makefile
  help/Makefile
  po/Makefile.in
  tests/Makefile
diff --cc plugins/im-status/im-status/__init__.py
index b6a90c5,c2b6251..42af58e
--- a/plugins/im-status/im-status/__init__.py
+++ b/plugins/im-status/im-status/__init__.py
@@@ -136,11 -133,11 +136,11 @@@ class IMStatusPlugin (RB.Plugin)
  
    def set_status_from_entry (self):
      db = self.shell.get_property ("db")
 -    self.current_artist = db.entry_get (self.current_entry, rhythmdb.PROP_ARTIST)
 -    self.current_title  = db.entry_get (self.current_entry, rhythmdb.PROP_TITLE)
 -    self.current_album  = db.entry_get (self.current_entry, rhythmdb.PROP_ALBUM)
 +    self.current_artist = db.entry_get_string (self.current_entry, RhythmDB.PropType.ARTIST)
 +    self.current_title  = db.entry_get_string (self.current_entry, RhythmDB.PropType.TITLE)
 +    self.current_album  = db.entry_get_string (self.current_entry, RhythmDB.PropType.ALBUM)
  
-     if self.current_entry.get_entry_type().category == RhythmDB.EntryCategory.STREAM:
 -    if self.current_entry.get_entry_type().props.category == rhythmdb.ENTRY_STREAM:
++    if self.current_entry.get_entry_type().props.category == RhythmDB.EntryCategory.STREAM:
        if not self.current_artist:
          self.current_artist = db.entry_request_extra_metadata (self.current_entry, STREAM_SONG_ARTIST)
        if not self.current_title:



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]