[rhythmbox/media-player-sync: 154/154] Merge branch 'master' into media-player-sync
- From: Jonathan Matthew <jmatthew src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rhythmbox/media-player-sync: 154/154] Merge branch 'master' into media-player-sync
- Date: Mon, 8 Mar 2010 11:00:54 +0000 (UTC)
commit 1b733d9cf02ef542c1a22a66d5d9346c965d8a98
Merge: fc63ab3 8915571
Author: Jonathan Matthew <jonathan d14n org>
Date: Mon Mar 8 20:58:22 2010 +1000
Merge branch 'master' into media-player-sync
ChangeLog |10524 +++++++++++++++++++-
NEWS | 105 +
README | 2 +-
backends/gstreamer/rb-player-gst-xfade.c | 173 +-
backends/gstreamer/rb-player-gst.c | 58 +-
backends/rb-player.c | 24 +-
backends/rb-player.h | 10 -
bindings/python/Makefile.am | 2 +
bindings/python/override_common.c | 4 +-
bindings/python/rb.defs | 86 +-
bindings/python/rb.override | 4 +-
bindings/python/rhythmdb.override | 3 +-
configure.ac | 47 +-
data/Makefile.am | 1 +
data/icons/Makefile.am | 2 +-
data/icons/hicolor/16x16/places/Makefile.am | 3 +-
data/icons/hicolor/16x16/places/music-library.png | Bin 0 -> 971 bytes
data/icons/hicolor/24x24/Makefile.am | 2 +-
data/icons/hicolor/24x24/places/Makefile.am | 11 +
data/icons/hicolor/24x24/places/music-library.png | Bin 0 -> 1563 bytes
data/icons/src/Makefile.am | 1 +
data/icons/src/music-library.svg | 3738 +++++++
data/rhythmbox.schemas | 91 +-
data/ui/song-info-multiple.ui | 80 +-
data/ui/song-info.ui | 89 +-
doc/reference/Makefile.am | 1 -
doc/reference/rhythmbox-docs.sgml | 1 +
doc/reference/rhythmbox-sections.txt | 8 +-
lib/Makefile.am | 4 +-
lib/rb-file-helpers.c | 65 +-
lib/rb-marshal.list | 1 +
lib/rb-preferences.h | 1 -
lib/rb-stock-icons.c | 2 +-
lib/rb-text-helpers.c | 224 +
lib/rb-text-helpers.h | 44 +
metadata/rb-metadata-dbus-client.c | 36 +-
metadata/rb-metadata-dbus-service.c | 12 +-
metadata/rb-metadata-gst.c | 192 +-
metadata/rb-metadata.h | 3 +
plugins/Makefile.am | 1 +
plugins/artdisplay/artdisplay/CoverArtDatabase.py | 3 +-
.../artdisplay/artdisplay/DiscogsCoverArtSearch.py | 287 -
plugins/artdisplay/artdisplay/Makefile.am | 1 -
plugins/audiocd/audiocd-ui.xml | 2 +-
plugins/audiocd/rb-audiocd-plugin.c | 38 +-
plugins/audiocd/rb-audiocd-source.c | 320 +-
plugins/audiocd/rb-audiocd-source.h | 2 +-
plugins/context/context/ContextView.py | 2 +-
plugins/daap/rb-daap-connection.c | 1 +
plugins/generic-player/Makefile.am | 5 +-
plugins/generic-player/generic-player-info.ui | 212 +
plugins/generic-player/generic-player-ui.xml | 1 +
.../rb-generic-player-playlist-source.c | 120 +-
plugins/generic-player/rb-generic-player-plugin.c | 16 +-
plugins/generic-player/rb-generic-player-source.c | 251 +-
plugins/generic-player/rb-generic-player-source.h | 15 +-
plugins/generic-player/rb-nokia770-source.c | 3 +-
plugins/generic-player/rb-nokia770-source.h | 6 +-
plugins/generic-player/rb-psp-source.c | 3 +-
plugins/generic-player/rb-psp-source.h | 6 +-
plugins/ipod/ipod-info.ui | 29 +-
plugins/ipod/rb-ipod-source.c | 17 +
plugins/iradio/iradio-initial.pls | 9 -
plugins/jamendo/jamendo/JamendoSaxHandler.py | 2 +-
plugins/jamendo/jamendo/JamendoSource.py | 8 +-
plugins/magnatune/Makefile.am | 1 -
plugins/magnatune/magnatune-prefs.ui | 336 +-
plugins/magnatune/magnatune-purchase.ui | 581 --
plugins/magnatune/magnatune/BuyAlbumHandler.py | 8 +-
plugins/magnatune/magnatune/MagnatuneSource.py | 675 +-
plugins/magnatune/magnatune/TrackListHandler.py | 23 +-
plugins/magnatune/magnatune/__init__.py | 278 +-
plugins/mtpdevice/mtp-info.ui | 28 +-
plugins/mtpdevice/rb-mtp-source.c | 17 +
plugins/rb/__init__.py | 8 -
plugins/replaygain/Makefile.am | 17 +
plugins/replaygain/replaygain-prefs.ui | 163 +
plugins/replaygain/replaygain.rb-plugin.in | 9 +
plugins/replaygain/replaygain/Makefile.am | 6 +
plugins/replaygain/replaygain/__init__.py | 56 +
plugins/replaygain/replaygain/config.py | 102 +
plugins/replaygain/replaygain/player.py | 228 +
plugins/sendto/Makefile.am | 6 +-
plugins/status-icon/Makefile.am | 8 -
plugins/status-icon/eggtrayicon.c | 559 --
plugins/status-icon/eggtrayicon.h | 80 -
plugins/status-icon/rb-status-icon-plugin.c | 147 +-
plugins/status-icon/rb-tray-icon.c | 479 -
plugins/status-icon/rb-tray-icon.h | 86 -
po/POTFILES.in | 11 +-
po/bg.po | 1075 ++-
po/cs.po | 4011 +++++---
po/de.po | 1122 ++-
po/el.po | 5224 +++++++----
po/en_GB.po | 2567 +++--
po/es.po | 1143 ++-
po/et.po | 512 +-
po/fr.po | 2114 +++--
po/gl.po | 2314 +++--
po/hu.po | 1058 ++-
po/it.po | 1207 ++-
po/lt.po | 1183 ++-
po/lv.po | 4915 ++++++----
po/pl.po | 2623 +++---
po/pt.po | 2532 +++--
po/ro.po | 2236 +++--
po/sl.po | 1167 ++-
po/sr.po | 1241 ++-
po/sr latin po | 1241 ++-
po/sv.po | 1261 ++-
remote/dbus/.arch-inventory | 2 -
remote/dbus/rb-client.c | 2 -
rhythmdb/Makefile.am | 2 +-
rhythmdb/rb-refstring.c | 5 +-
rhythmdb/rhythmdb-monitor.c | 2 +
rhythmdb/rhythmdb-private.h | 4 -
rhythmdb/rhythmdb-property-model.c | 188 +-
rhythmdb/rhythmdb-query-model.c | 20 +-
rhythmdb/rhythmdb-tree.c | 56 +-
rhythmdb/rhythmdb.c | 338 +-
rhythmdb/rhythmdb.h | 15 +-
shell/main.c | 2 +
shell/rb-play-order.c | 3 +-
shell/rb-python-plugin.c | 1 +
shell/rb-removable-media-manager.c | 45 -
shell/rb-shell-player.c | 33 +-
shell/rb-shell.c | 14 +-
shell/rb-source-header.c | 4 +
sources/rb-library-source.c | 170 +-
sources/rb-playlist-source.c | 77 +-
sources/rb-removable-media-source.c | 33 +-
sources/rb-removable-media-source.h | 2 +-
sources/rb-source.c | 24 +
sources/rb-source.h | 6 +
tests/test-rhythmdb-property-model.c | 231 +
widgets/Makefile.am | 10 +-
widgets/libsexy/Makefile.am | 19 -
widgets/libsexy/sexy-icon-entry.c | 960 --
widgets/libsexy/sexy-icon-entry.h | 100 -
widgets/rb-entry-view.c | 7 +-
widgets/rb-header.c | 96 +-
widgets/rb-query-creator-private.h | 2 +-
widgets/rb-query-creator-properties.c | 50 +-
widgets/rb-query-creator.c | 4 +-
widgets/rb-rating.c | 3 +-
widgets/rb-search-entry.c | 13 -
widgets/rb-segmented-bar.h | 12 +-
widgets/rb-song-info.c | 110 +-
148 files changed, 41991 insertions(+), 22346 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
