Rhythmbox

Merge lp://qastaging/~aw/rhythmbox/swedishradio into lp://qastaging/ubuntu/maverick/rhythmbox

swedishradio
Merge into maverick

Proposed by Anders Wallenquist on 2010-08-18

Status:	Needs review
Proposed branch:	lp://qastaging/~aw/rhythmbox/swedishradio
Merge into:	lp://qastaging/ubuntu/maverick/rhythmbox
Diff against target:	700160 lines (+695736/-0) (has conflicts) 790 files modified .gitignore (+121/-0) AUTHORS (+31/-0) COPYING (+352/-0) ChangeLog (+11293/-0) ChangeLog.old (+15462/-0) ChangeLog.pre-0.12 (+27335/-0) ChangeLog0.6 (+5026/-0) ChangeLog0.7 (+5575/-0) ChangeLog0.7.old (+3628/-0) ChangeLog0.8 (+6601/-0) DOCUMENTERS (+3/-0) HACKING (+62/-0) INSTALL.quick (+35/-0) INTERNALS (+178/-0) MAINTAINERS (+7/-0) MAINTAINERS.old (+3/-0) Makefile.am (+48/-0) NEWS (+2317/-0) README (+73/-0) README.daap (+268/-0) THANKS (+3/-0) autogen.sh (+21/-0) backends/Makefile.am (+39/-0) backends/gstreamer/Makefile.am (+31/-0) backends/gstreamer/rb-encoder-gst.c (+1269/-0) backends/gstreamer/rb-encoder-gst.h (+65/-0) backends/gstreamer/rb-player-gst-helper.c (+725/-0) backends/gstreamer/rb-player-gst-helper.h (+66/-0) backends/gstreamer/rb-player-gst-xfade.c (+3779/-0) backends/gstreamer/rb-player-gst-xfade.h (+74/-0) backends/gstreamer/rb-player-gst.c (+1254/-0) backends/gstreamer/rb-player-gst.h (+75/-0) backends/rb-encoder.c (+387/-0) backends/rb-encoder.h (+140/-0) backends/rb-player-gst-data-tee.c (+164/-0) backends/rb-player-gst-data-tee.h (+72/-0) backends/rb-player-gst-filter.c (+165/-0) backends/rb-player-gst-filter.h (+72/-0) backends/rb-player-gst-tee.c (+164/-0) backends/rb-player-gst-tee.h (+72/-0) backends/rb-player.c (+795/-0) backends/rb-player.h (+183/-0) bindings/Makefile.am (+9/-0) bindings/python/Makefile.am (+116/-0) bindings/python/override_common.c (+317/-0) bindings/python/override_common.h (+73/-0) bindings/python/rb.defs (+3059/-0) bindings/python/rb.override (+1716/-0) bindings/python/rhythmdb.defs (+1312/-0) bindings/python/rhythmdb.override (+818/-0) bindings/vala/Makefile.am (+11/-0) bindings/vala/rb.deps (+2/-0) bindings/vala/rb.vapi (+93/-0) bindings/vala/rhythmdb.deps (+1/-0) bindings/vala/rhythmdb.vapi (+3/-0) configure.ac (+1009/-0) data/Makefile.am (+60/-0) data/icons/Makefile.am (+2/-0) data/icons/hicolor/16x16/Makefile.am (+1/-0) data/icons/hicolor/16x16/actions/Makefile.am (+26/-0) data/icons/hicolor/16x16/actions/audio-cd-duplicate.svg (+273/-0) data/icons/hicolor/16x16/actions/audio-cd-new.svg (+426/-0) data/icons/hicolor/16x16/apps/Makefile.am (+10/-0) data/icons/hicolor/16x16/places/Makefile.am (+22/-0) data/icons/hicolor/16x16/places/library-podcast.svg (+237/-0) data/icons/hicolor/16x16/places/playlist-automatic.svg (+282/-0) data/icons/hicolor/16x16/places/playlist.svg (+346/-0) data/icons/hicolor/16x16/status/Makefile.am (+18/-0) data/icons/hicolor/16x16/status/rhythmbox-notplaying.svg (+571/-0) data/icons/hicolor/22x22/Makefile.am (+1/-0) data/icons/hicolor/22x22/actions/Makefile.am (+25/-0) data/icons/hicolor/22x22/actions/audio-cd-duplicate.svg (+292/-0) data/icons/hicolor/22x22/actions/audio-cd-new.svg (+456/-0) data/icons/hicolor/22x22/apps/Makefile.am (+10/-0) data/icons/hicolor/22x22/apps/rhythmbox.svg (+663/-0) data/icons/hicolor/22x22/places/Makefile.am (+21/-0) data/icons/hicolor/22x22/places/library-internet-radio.svg (+595/-0) data/icons/hicolor/22x22/places/library-podcast.svg (+324/-0) data/icons/hicolor/22x22/places/playlist-automatic.svg (+317/-0) data/icons/hicolor/22x22/places/playlist.svg (+299/-0) data/icons/hicolor/22x22/status/Makefile.am (+15/-0) data/icons/hicolor/22x22/status/rhythmbox-notplaying.svg (+611/-0) data/icons/hicolor/24x24/Makefile.am (+1/-0) data/icons/hicolor/24x24/apps/Makefile.am (+11/-0) data/icons/hicolor/24x24/places/Makefile.am (+11/-0) data/icons/hicolor/256x256/Makefile.am (+1/-0) data/icons/hicolor/256x256/apps/Makefile.am (+11/-0) data/icons/hicolor/32x32/Makefile.am (+1/-0) data/icons/hicolor/32x32/actions/Makefile.am (+23/-0) data/icons/hicolor/32x32/actions/audio-cd-duplicate.svg (+293/-0) data/icons/hicolor/32x32/actions/audio-cd-new.svg (+373/-0) data/icons/hicolor/32x32/actions/internet-radio-new.svg (+1308/-0) data/icons/hicolor/32x32/actions/playlist-automatic-new.svg (+1526/-0) data/icons/hicolor/32x32/actions/playlist-new.svg (+1515/-0) data/icons/hicolor/32x32/apps/Makefile.am (+10/-0) data/icons/hicolor/32x32/places/Makefile.am (+19/-0) data/icons/hicolor/32x32/places/library-internet-radio.svg (+1274/-0) data/icons/hicolor/32x32/places/playlist-automatic.svg (+318/-0) data/icons/hicolor/32x32/places/playlist.svg (+307/-0) data/icons/hicolor/32x32/status/Makefile.am (+15/-0) data/icons/hicolor/32x32/status/rhythmbox-notplaying.svg (+670/-0) data/icons/hicolor/48x48/Makefile.am (+1/-0) data/icons/hicolor/48x48/apps/Makefile.am (+11/-0) data/icons/hicolor/Makefile.am (+14/-0) data/icons/hicolor/scalable/Makefile.am (+1/-0) data/icons/hicolor/scalable/actions/Makefile.am (+18/-0) data/icons/hicolor/scalable/actions/audio-cd-duplicate.svg (+291/-0) data/icons/hicolor/scalable/actions/audio-cd-new.svg (+411/-0) data/icons/hicolor/scalable/actions/internet-radio-new.svg (+1201/-0) data/icons/hicolor/scalable/actions/playlist-automatic-new.svg (+1434/-0) data/icons/hicolor/scalable/actions/playlist-new.svg (+984/-0) data/icons/hicolor/scalable/apps/Makefile.am (+12/-0) data/icons/hicolor/scalable/apps/rhythmbox-symbolic.svg (+99/-0) data/icons/hicolor/scalable/places/Makefile.am (+16/-0) data/icons/hicolor/scalable/places/library-internet-radio.svg (+1167/-0) data/icons/hicolor/scalable/places/playlist-automatic.svg (+318/-0) data/icons/hicolor/scalable/places/playlist.svg (+327/-0) data/icons/hicolor/scalable/status/Makefile.am (+14/-0) data/icons/hicolor/scalable/status/rhythmbox-notplaying.svg (+700/-0) data/icons/src/Makefile.am (+1/-0) data/icons/src/music-library.svg (+3738/-0) data/icons/src/rhythmbox.svg (+6234/-0) data/org.gnome.Rhythmbox.service.in (+3/-0) data/playlists.xml.in (+36/-0) data/rhythmbox-client.1 (+180/-0) data/rhythmbox-device.desktop.in.in (+19/-0) data/rhythmbox.1 (+87/-0) data/rhythmbox.desktop.in.in (+18/-0) data/rhythmbox.schemas (+1662/-0) data/ui/Makefile.am (+26/-0) data/ui/create-playlist.ui (+245/-0) data/ui/general-prefs.ui (+590/-0) data/ui/library-prefs.ui (+360/-0) data/ui/media-player-properties.ui (+230/-0) data/ui/playback-prefs.ui (+188/-0) data/ui/playlist-save.ui (+132/-0) data/ui/plugins.ui (+267/-0) data/ui/podcast-feed-properties.ui (+317/-0) data/ui/podcast-prefs.ui (+176/-0) data/ui/podcast-properties.ui (+404/-0) data/ui/rhythmbox-ui.xml (+271/-0) data/ui/song-info-multiple.ui (+343/-0) data/ui/song-info.ui (+880/-0) data/ui/sync-dialog.ui (+113/-0) data/ui/sync-state.ui (+110/-0) data/ui/uri-new.ui (+37/-0) doc/Makefile.am (+1/-0) doc/reference/Makefile.am (+176/-0) doc/reference/rhythmbox-docs.sgml (+101/-0) doc/reference/rhythmbox-sections.txt (+1602/-0) doc/reference/rhythmbox.types (+147/-0) help/C/Makefile.am (+35/-0) help/C/fdl-appendix.xml (+668/-0) help/C/legal.xml (+78/-0) help/C/rhythmbox.xml (+1892/-0) help/ChangeLog (+192/-0) help/Makefile.am (+22/-0) help/cs/cs.po (+2886/-0) help/da/da.po (+3438/-0) help/de/de.po (+3232/-0) help/el/el.po (+1859/-0) help/es/es.po (+3133/-0) help/fr/fr.po (+2975/-0) help/gl/gl.po (+74/-0) help/it/it.po (+2863/-0) help/oc/oc.po (+2323/-0) help/pt/pt.po (+2933/-0) help/rhythmbox.omf.in (+9/-0) help/ru/ru.po (+1851/-0) help/sl/sl.po (+1894/-0) help/sv/sv.po (+1846/-0) help/uk/uk.po (+2916/-0) help/zh_CN/zh_CN.po (+2664/-0) lib/Makefile.am (+95/-0) lib/eel-gconf-extensions.c (+507/-0) lib/eel-gconf-extensions.h (+79/-0) lib/eggdesktopfile.c (+1520/-0) lib/eggdesktopfile.h (+163/-0) lib/eggsmclient-private.h (+53/-0) lib/eggsmclient-xsmp.c (+1370/-0) lib/eggsmclient.c (+604/-0) lib/eggsmclient.h (+117/-0) lib/gseal-gtk-compat.h (+41/-0) lib/libmediaplayerid/Makefile.am (+48/-0) lib/libmediaplayerid/mediaplayerid.h (+108/-0) lib/libmediaplayerid/mpid-device.c (+542/-0) lib/libmediaplayerid/mpid-dummy.c (+28/-0) lib/libmediaplayerid/mpid-files.c (+99/-0) lib/libmediaplayerid/mpid-hal.c (+268/-0) lib/libmediaplayerid/mpid-private.h (+42/-0) lib/libmediaplayerid/mpid-udev.c (+80/-0) lib/libmediaplayerid/mpid-util.c (+281/-0) lib/libmediaplayerid/testmpid.c (+52/-0) lib/mkdtemp.c (+201/-0) lib/mkdtemp.h (+40/-0) lib/rb-async-queue-watch.c (+148/-0) lib/rb-async-queue-watch.h (+43/-0) lib/rb-builder-helpers.c (+140/-0) lib/rb-builder-helpers.h (+44/-0) lib/rb-cut-and-paste-code.c (+368/-0) lib/rb-cut-and-paste-code.h (+42/-0) lib/rb-debug.c (+438/-0) lib/rb-debug.h (+93/-0) lib/rb-file-helpers.c (+1571/-0) lib/rb-file-helpers.h (+101/-0) lib/rb-marshal.list (+60/-0) lib/rb-missing-plugins.c (+256/-0) lib/rb-missing-plugins.h (+37/-0) lib/rb-preferences.h (+85/-0) lib/rb-stock-icons.c (+132/-0) lib/rb-stock-icons.h (+58/-0) lib/rb-string-value-map.c (+214/-0) lib/rb-string-value-map.h (+73/-0) lib/rb-text-helpers.c (+227/-0) lib/rb-text-helpers.h (+44/-0) lib/rb-thread.c (+449/-0) lib/rb-thread.h (+77/-0) lib/rb-tree-dnd.c (+1066/-0) lib/rb-tree-dnd.h (+154/-0) lib/rb-util.c (+1253/-0) lib/rb-util.h (+107/-0) macros/Makefile.am (+1/-0) macros/check.m4 (+133/-0) metadata/Makefile.am (+75/-0) metadata/rb-metadata-common.c (+241/-0) metadata/rb-metadata-dbus-client.c (+849/-0) metadata/rb-metadata-dbus-service.c (+565/-0) metadata/rb-metadata-dbus.c (+303/-0) metadata/rb-metadata-dbus.h (+71/-0) metadata/rb-metadata-gst-common.c (+276/-0) metadata/rb-metadata-gst-common.h (+54/-0) metadata/rb-metadata-gst.c (+1251/-0) metadata/rb-metadata.h (+161/-0) metadata/test-metadata.c (+191/-0) omf.make (+61/-0) plugins/Makefile.am (+64/-0) plugins/artdisplay/Makefile.am (+18/-0) plugins/artdisplay/artdisplay.rb-plugin.in (+9/-0) plugins/artdisplay/artdisplay/AmazonCoverArtSearch.py (+311/-0) plugins/artdisplay/artdisplay/CoverArtDatabase.py (+359/-0) plugins/artdisplay/artdisplay/EmbeddedCoverArtSearch.py (+134/-0) plugins/artdisplay/artdisplay/LastFMCoverArtSearch.py (+165/-0) plugins/artdisplay/artdisplay/LocalCoverArtSearch.py (+215/-0) plugins/artdisplay/artdisplay/Makefile.am (+14/-0) plugins/artdisplay/artdisplay/MusicBrainzCoverArtSearch.py (+106/-0) plugins/artdisplay/artdisplay/PodcastCoverArtSearch.py (+61/-0) plugins/artdisplay/artdisplay/__init__.py (+539/-0) plugins/artdisplay/rhythmbox-missing-artwork.svg (+832/-0) plugins/audiocd/Makefile.am (+127/-0) plugins/audiocd/album-info.ui (+200/-0) plugins/audiocd/audiocd-ui.xml (+7/-0) plugins/audiocd/audiocd.rb-plugin.in (+8/-0) plugins/audiocd/multiple-album.ui (+120/-0) plugins/audiocd/rb-audiocd-plugin.c (+399/-0) plugins/audiocd/rb-audiocd-source.c (+1413/-0) plugins/audiocd/rb-audiocd-source.h (+64/-0) plugins/audiocd/sj-error.c (+36/-0) plugins/audiocd/sj-error.h (+40/-0) plugins/audiocd/sj-metadata-getter.c (+272/-0) plugins/audiocd/sj-metadata-getter.h (+62/-0) plugins/audiocd/sj-metadata-gvfs.c (+260/-0) plugins/audiocd/sj-metadata-gvfs.h (+57/-0) plugins/audiocd/sj-metadata-marshal.list (+1/-0) plugins/audiocd/sj-metadata-musicbrainz.c (+616/-0) plugins/audiocd/sj-metadata-musicbrainz.h (+57/-0) plugins/audiocd/sj-metadata-musicbrainz3.c (+460/-0) plugins/audiocd/sj-metadata-musicbrainz3.h (+56/-0) plugins/audiocd/sj-metadata.c (+217/-0) plugins/audiocd/sj-metadata.h (+59/-0) plugins/audiocd/sj-structures.c (+59/-0) plugins/audiocd/sj-structures.h (+74/-0) plugins/audiocd/update-from-egg.sh (+25/-0) plugins/audioscrobbler/Makefile.am (+78/-0) plugins/audioscrobbler/as-icon.svg (+79/-0) plugins/audioscrobbler/audioscrobbler-prefs.ui (+347/-0) plugins/audioscrobbler/audioscrobbler-ui.xml (+14/-0) plugins/audioscrobbler/audioscrobbler.rb-plugin.in (+9/-0) plugins/audioscrobbler/rb-audioscrobbler-entry.c (+223/-0) plugins/audioscrobbler/rb-audioscrobbler-entry.h (+77/-0) plugins/audioscrobbler/rb-audioscrobbler-plugin.c (+233/-0) plugins/audioscrobbler/rb-audioscrobbler.c (+1379/-0) plugins/audioscrobbler/rb-audioscrobbler.h (+85/-0) plugins/audioscrobbler/rb-lastfm-play-order.c (+95/-0) plugins/audioscrobbler/rb-lastfm-play-order.h (+60/-0) plugins/audioscrobbler/rb-lastfm-source.c (+2312/-0) plugins/audioscrobbler/rb-lastfm-source.h (+65/-0) plugins/brasero-disc-recorder/Makefile.am (+58/-0) plugins/brasero-disc-recorder/cd-recorder.rb-plugin.in (+8/-0) plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c (+776/-0) plugins/cd-recorder/Makefile.am (+70/-0) plugins/cd-recorder/cd-recorder.rb-plugin.in (+8/-0) plugins/cd-recorder/rb-cd-recorder-plugin.c (+489/-0) plugins/cd-recorder/rb-playlist-source-recorder.c (+1654/-0) plugins/cd-recorder/rb-playlist-source-recorder.h (+90/-0) plugins/cd-recorder/rb-recorder-gst.c (+1282/-0) plugins/cd-recorder/rb-recorder.h (+139/-0) plugins/cd-recorder/recorder.ui (+198/-0) plugins/coherence/Makefile.am (+16/-0) plugins/coherence/coherence.rb-plugin.in (+9/-0) plugins/coherence/upnp_coherence/Makefile.am (+8/-0) plugins/coherence/upnp_coherence/MediaPlayer.py (+530/-0) plugins/coherence/upnp_coherence/MediaStore.py (+491/-0) plugins/coherence/upnp_coherence/UpnpSource.py (+147/-0) plugins/coherence/upnp_coherence/__init__.py (+323/-0) plugins/context/Makefile.am (+28/-0) plugins/context/context.rb-plugin.in (+9/-0) plugins/context/context/AlbumTab.py (+279/-0) plugins/context/context/ArtistTab.py (+345/-0) plugins/context/context/ContextView.py (+282/-0) plugins/context/context/LastFM.py (+49/-0) plugins/context/context/LyricsTab.py (+158/-0) plugins/context/context/Makefile.am (+11/-0) plugins/context/context/__init__.py (+41/-0) plugins/context/tmpl/album-tmpl.html (+103/-0) plugins/context/tmpl/artist-tmpl.html (+52/-0) plugins/context/tmpl/loading.html (+14/-0) plugins/context/tmpl/lyrics-tmpl.html (+13/-0) plugins/context/tmpl/main.css (+13/-0) plugins/daap/Makefile.am (+109/-0) plugins/daap/daap-prefs.ui (+165/-0) plugins/daap/daap-ui.xml (+19/-0) plugins/daap/daap.rb-plugin.in (+8/-0) plugins/daap/rb-daap-container-record.c (+183/-0) plugins/daap/rb-daap-container-record.h (+75/-0) plugins/daap/rb-daap-dialog.c (+101/-0) plugins/daap/rb-daap-dialog.h (+42/-0) plugins/daap/rb-daap-plugin.c (+954/-0) plugins/daap/rb-daap-plugin.h (+69/-0) plugins/daap/rb-daap-record-factory.c (+77/-0) plugins/daap/rb-daap-record-factory.h (+67/-0) plugins/daap/rb-daap-record.c (+412/-0) plugins/daap/rb-daap-record.h (+72/-0) plugins/daap/rb-daap-sharing.c (+263/-0) plugins/daap/rb-daap-sharing.h (+43/-0) plugins/daap/rb-daap-source.c (+799/-0) plugins/daap/rb-daap-source.h (+78/-0) plugins/daap/rb-daap-src.c (+390/-0) plugins/daap/rb-daap-src.h (+43/-0) plugins/daap/rb-daap.xml (+20/-0) plugins/daap/rb-dmap-container-db-adapter.c (+193/-0) plugins/daap/rb-dmap-container-db-adapter.h (+64/-0) plugins/daap/rb-rhythmdb-dmap-db-adapter.c (+275/-0) plugins/daap/rb-rhythmdb-dmap-db-adapter.h (+61/-0) plugins/daap/rb-rhythmdb-query-model-dmap-db-adapter.c (+156/-0) plugins/daap/rb-rhythmdb-query-model-dmap-db-adapter.h (+61/-0) plugins/fmradio/Makefile.am (+49/-0) plugins/fmradio/fmradio-ui.xml (+19/-0) plugins/fmradio/fmradio.rb-plugin.in (+8/-0) plugins/fmradio/rb-fm-radio-gst-src.c (+204/-0) plugins/fmradio/rb-fm-radio-plugin.c (+146/-0) plugins/fmradio/rb-fm-radio-source.c (+431/-0) plugins/fmradio/rb-fm-radio-source.h (+71/-0) plugins/fmradio/rb-radio-tuner-v4l2.c (+226/-0) plugins/fmradio/rb-radio-tuner.h (+82/-0) plugins/generic-player/Makefile.am (+62/-0) plugins/generic-player/generic-player-info.ui (+213/-0) plugins/generic-player/generic-player-ui.xml (+19/-0) plugins/generic-player/generic-player.rb-plugin.in (+8/-0) plugins/generic-player/rb-generic-player-playlist-source.c (+602/-0) plugins/generic-player/rb-generic-player-playlist-source.h (+65/-0) plugins/generic-player/rb-generic-player-plugin.c (+294/-0) plugins/generic-player/rb-generic-player-source.c (+1393/-0) plugins/generic-player/rb-generic-player-source.h (+99/-0) plugins/generic-player/rb-nokia770-source.c (+162/-0) plugins/generic-player/rb-nokia770-source.h (+68/-0) plugins/generic-player/rb-psp-source.c (+292/-0) plugins/generic-player/rb-psp-source.h (+68/-0) plugins/im-status/Makefile.am (+14/-0) plugins/im-status/im-status.rb-plugin.in (+9/-0) plugins/im-status/im-status/__init__.py (+298/-0) plugins/ipod/Makefile.am (+58/-0) plugins/ipod/ipod-info.ui (+309/-0) plugins/ipod/ipod-init.ui (+160/-0) plugins/ipod/ipod-ui.xml (+16/-0) plugins/ipod/ipod.rb-plugin.in (+8/-0) plugins/ipod/rb-ipod-db.c (+921/-0) plugins/ipod/rb-ipod-db.h (+80/-0) plugins/ipod/rb-ipod-helpers.c (+467/-0) plugins/ipod/rb-ipod-helpers.h (+47/-0) plugins/ipod/rb-ipod-plugin.c (+332/-0) plugins/ipod/rb-ipod-source.c (+2017/-0) plugins/ipod/rb-ipod-source.h (+77/-0) plugins/ipod/rb-ipod-static-playlist-source.c (+281/-0) plugins/ipod/rb-ipod-static-playlist-source.h (+62/-0) plugins/iradio/Makefile.am (+75/-0) plugins/iradio/iradio-initial.pls (+317/-0) plugins/iradio/iradio-ui.xml (+19/-0) plugins/iradio/iradio.rb-plugin.in (+8/-0) plugins/iradio/rb-iradio-plugin.c (+149/-0) plugins/iradio/rb-iradio-source-search.c (+71/-0) plugins/iradio/rb-iradio-source-search.h (+66/-0) plugins/iradio/rb-iradio-source.c (+1188/-0) plugins/iradio/rb-iradio-source.h (+71/-0) plugins/iradio/rb-station-properties-dialog.c (+603/-0) plugins/iradio/rb-station-properties-dialog.h (+64/-0) plugins/iradio/station-properties.ui (+293/-0) plugins/jamendo/Makefile.am (+29/-0) plugins/jamendo/jamendo-loading.ui (+195/-0) plugins/jamendo/jamendo-prefs.ui (+225/-0) plugins/jamendo/jamendo.rb-plugin.in (+9/-0) plugins/jamendo/jamendo/JamendoConfigureDialog.py (+60/-0) plugins/jamendo/jamendo/JamendoSaxHandler.py (+101/-0) plugins/jamendo/jamendo/JamendoSource.py (+353/-0) plugins/jamendo/jamendo/Makefile.am (+8/-0) plugins/jamendo/jamendo/__init__.py (+139/-0) plugins/lirc/Makefile.am (+45/-0) plugins/lirc/lirc.rb-plugin.in (+8/-0) plugins/lirc/rb-lirc-plugin.c (+265/-0) plugins/lirc/rhythmbox_lirc_default (+116/-0) plugins/lyrics/Makefile.am (+20/-0) plugins/lyrics/lyrics-prefs.ui (+198/-0) plugins/lyrics/lyrics.rb-plugin.in (+9/-0) plugins/lyrics/lyrics/AstrawebParser.py (+103/-0) plugins/lyrics/lyrics/DarkLyricsParser.py (+163/-0) plugins/lyrics/lyrics/LeoslyricsParser.py (+115/-0) plugins/lyrics/lyrics/LyrcParser.py (+86/-0) plugins/lyrics/lyrics/LyricWikiParser.py (+54/-0) plugins/lyrics/lyrics/LyricsConfigureDialog.py (+130/-0) plugins/lyrics/lyrics/LyricsParse.py (+72/-0) plugins/lyrics/lyrics/LyricsSites.py (+44/-0) plugins/lyrics/lyrics/Makefile.am (+15/-0) plugins/lyrics/lyrics/TerraParser.py (+110/-0) plugins/lyrics/lyrics/WinampcnParser.py (+103/-0) plugins/lyrics/lyrics/__init__.py (+433/-0) plugins/magnatune/Makefile.am (+29/-0) plugins/magnatune/magnatune-loading.ui (+335/-0) plugins/magnatune/magnatune-prefs.ui (+468/-0) plugins/magnatune/magnatune.rb-plugin.in (+9/-0) plugins/magnatune/magnatune/BuyAlbumHandler.py (+59/-0) plugins/magnatune/magnatune/MagnatuneSource.py (+606/-0) plugins/magnatune/magnatune/Makefile.am (+8/-0) plugins/magnatune/magnatune/TrackListHandler.py (+126/-0) plugins/magnatune/magnatune/__init__.py (+288/-0) plugins/mmkeys/Makefile.am (+47/-0) plugins/mmkeys/mmkeys.rb-plugin.in (+8/-0) plugins/mmkeys/rb-mmkeys-plugin.c (+459/-0) plugins/mpris/Makefile.am (+39/-0) plugins/mpris/mpris-spec.h (+91/-0) plugins/mpris/mpris.rb-plugin.in (+8/-0) plugins/mpris/rb-mpris-plugin.c (+1196/-0) plugins/mtpdevice/Makefile.am (+62/-0) plugins/mtpdevice/mtp-info.ui (+256/-0) plugins/mtpdevice/mtp-ui.xml (+11/-0) plugins/mtpdevice/mtpdevice.rb-plugin.in (+8/-0) plugins/mtpdevice/rb-mtp-gst-sink.c (+530/-0) plugins/mtpdevice/rb-mtp-gst-src.c (+452/-0) plugins/mtpdevice/rb-mtp-plugin.c (+507/-0) plugins/mtpdevice/rb-mtp-source.c (+1739/-0) plugins/mtpdevice/rb-mtp-source.h (+71/-0) plugins/mtpdevice/rb-mtp-thread.c (+946/-0) plugins/mtpdevice/rb-mtp-thread.h (+138/-0) plugins/power-manager/Makefile.am (+43/-0) plugins/power-manager/power-manager.rb-plugin.in (+8/-0) plugins/power-manager/rb-power-manager-plugin.c (+340/-0) plugins/pythonconsole/Makefile.am (+13/-0) plugins/pythonconsole/pythonconsole.py (+427/-0) plugins/pythonconsole/pythonconsole.rb-plugin.in (+9/-0) plugins/rb/Coroutine.py (+65/-0) plugins/rb/Loader.py (+187/-0) plugins/rb/Makefile.am (+9/-0) plugins/rb/URLCache.py (+209/-0) plugins/rb/__init__.py (+109/-0) plugins/rb/stringmatch.py (+53/-0) plugins/replaygain/Makefile.am (+17/-0) plugins/replaygain/replaygain-prefs.ui (+163/-0) plugins/replaygain/replaygain.rb-plugin.in (+9/-0) plugins/replaygain/replaygain/Makefile.am (+6/-0) plugins/replaygain/replaygain/__init__.py (+56/-0) plugins/replaygain/replaygain/config.py (+102/-0) plugins/replaygain/replaygain/player.py (+239/-0) plugins/sample-python/Makefile.am (+13/-0) plugins/sample-python/sample-python.py (+27/-0) plugins/sample-python/sample-python.rb-plugin.in (+9/-0) plugins/sample-vala/Makefile.am (+50/-0) plugins/sample-vala/rb-sample-vala-plugin.vala (+22/-0) plugins/sample-vala/sample-vala.rb-plugin.in (+8/-0) plugins/sample/Makefile.am (+41/-0) plugins/sample/rb-sample-plugin.c (+133/-0) plugins/sample/sample.rb-plugin.in (+8/-0) plugins/sendto/Makefile.am (+13/-0) plugins/sendto/__init__.py (+73/-0) plugins/sendto/sendto.rb-plugin.in (+8/-0) plugins/status-icon/Makefile.am (+72/-0) plugins/status-icon/rb-status-icon-plugin.c (+1465/-0) plugins/status-icon/rb-status-icon-plugin.h (+78/-0) plugins/status-icon/rb-tray-icon-gtk.c (+354/-0) plugins/status-icon/rb-tray-icon-gtk.h (+85/-0) plugins/status-icon/status-icon-preferences.ui (+245/-0) plugins/status-icon/status-icon-ui.xml (+26/-0) plugins/status-icon/status-icon.rb-plugin.in (+8/-0) plugins/visualizer/Makefile.am (+92/-0) plugins/visualizer/rb-vis-widget.c (+272/-0) plugins/visualizer/rb-vis-widget.h (+59/-0) plugins/visualizer/rb-visualizer-plugin.c (+2373/-0) plugins/visualizer/rb-visualizer.xml (+17/-0) plugins/visualizer/visualizer-controls.ui (+207/-0) plugins/visualizer/visualizer-ui.xml (+16/-0) plugins/visualizer/visualizer.rb-plugin.in (+8/-0) po/ChangeLog (+5552/-0) po/LINGUAS (+78/-0) po/POTFILES.in (+206/-0) po/POTFILES.skip (+3/-0) po/af.po (+5280/-0) po/am.po (+1046/-0) po/ar.po (+4662/-0) po/as.po (+4883/-0) po/az.po (+1471/-0) po/be.po (+1533/-0) po/be@latin.po (+4934/-0) po/bg.po (+5423/-0) po/bn_IN.po (+4924/-0) po/br.po (+5361/-0) po/ca.po (+5404/-0) po/cs.po (+5603/-0) po/cy.po (+1776/-0) po/da.po (+6331/-0) po/de.po (+6390/-0) po/dz.po (+4031/-0) po/el.po (+6006/-0) po/en_CA.po (+4312/-0) po/en_GB.po (+6274/-0) po/eo.po (+5540/-0) po/es.po (+6108/-0) po/et.po (+3976/-0) po/eu.po (+5412/-0) po/fi.po (+5522/-0) po/fr.po (+5615/-0) po/ga.po (+4326/-0) po/gl.po (+5735/-0) po/gu.po (+5021/-0) po/he.po (+5332/-0) po/hi.po (+5026/-0) po/hr.po (+1469/-0) po/hu.po (+5521/-0) po/id.po (+1614/-0) po/is.po (+1489/-0) po/it.po (+5862/-0) po/ja.po (+5902/-0) po/kn.po (+5049/-0) po/ko.po (+5356/-0) po/lt.po (+5939/-0) po/lv.po (+5686/-0) po/mk.po (+4623/-0) po/ml.po (+1107/-0) po/mn.po (+1313/-0) po/mr.po (+4963/-0) po/ms.po (+1290/-0) po/nb.po (+5442/-0) po/nds.po (+5027/-0) po/ne.po (+4288/-0) po/nl.po (+5562/-0) po/nn.po (+5562/-0) po/oc.po (+4370/-0) po/or.po (+4933/-0) po/pa.po (+6166/-0) po/pl.po (+5568/-0) po/ps.po (+4245/-0) po/pt.po (+6274/-0) po/pt_BR.po (+5780/-0) po/ro.po (+5449/-0) po/ru.po (+5632/-0) po/rw.po (+2091/-0) po/sk.po (+4742/-0) po/sl.po (+5594/-0) po/sr.po (+5571/-0) po/sr@latin.po (+5571/-0) po/sv.po (+6139/-0) po/ta.po (+5035/-0) po/te.po (+5009/-0) po/th.po (+6195/-0) po/tr.po (+1482/-0) po/uk.po (+5400/-0) po/vi.po (+5529/-0) po/zh_CN.po (+5420/-0) po/zh_HK.po (+5453/-0) po/zh_TW.po (+5490/-0) podcast/Makefile.am (+65/-0) podcast/npapi.h (+807/-0) podcast/npruntime.h (+351/-0) podcast/npupp.h (+719/-0) podcast/plugin.symbols (+4/-0) podcast/rb-feed-podcast-properties-dialog.c (+347/-0) podcast/rb-feed-podcast-properties-dialog.h (+64/-0) podcast/rb-podcast-entry-types.c (+135/-0) podcast/rb-podcast-entry-types.h (+45/-0) podcast/rb-podcast-manager.c (+2151/-0) podcast/rb-podcast-manager.h (+97/-0) podcast/rb-podcast-parse.c (+277/-0) podcast/rb-podcast-parse.h (+79/-0) podcast/rb-podcast-properties-dialog.c (+702/-0) podcast/rb-podcast-properties-dialog.h (+63/-0) podcast/rhythmbox-itms-plugin.c (+215/-0) podcast/test-podcast-parse.c (+118/-0) remote/Makefile.am (+2/-0) remote/dbus/Makefile.am (+23/-0) remote/dbus/rb-client.c (+826/-0) remote/dbus/rb-print-playing.py (+28/-0) remote/dbus/rb-set-rating.py (+11/-0) rhythmbox.doap (+19/-0) rhythmbox.pc.in (+14/-0) rhythmdb/DESIGN (+270/-0) rhythmdb/Makefile.am (+46/-0) rhythmdb/rb-refstring.c (+338/-0) rhythmdb/rb-refstring.h (+56/-0) rhythmdb/rhythmdb-entry-type.c (+456/-0) rhythmdb/rhythmdb-entry-type.h (+130/-0) rhythmdb/rhythmdb-entry.h (+44/-0) rhythmdb/rhythmdb-import-job.c (+675/-0) rhythmdb/rhythmdb-import-job.h (+84/-0) rhythmdb/rhythmdb-monitor.c (+535/-0) rhythmdb/rhythmdb-private.h (+253/-0) rhythmdb/rhythmdb-property-model.c (+1444/-0) rhythmdb/rhythmdb-property-model.h (+86/-0) rhythmdb/rhythmdb-query-model.c (+3361/-0) rhythmdb/rhythmdb-query-model.h (+200/-0) rhythmdb/rhythmdb-query-results.c (+120/-0) rhythmdb/rhythmdb-query-results.h (+74/-0) rhythmdb/rhythmdb-query.c (+1055/-0) rhythmdb/rhythmdb-song-entry-types.c (+272/-0) rhythmdb/rhythmdb-tree.c (+2781/-0) rhythmdb/rhythmdb-tree.h (+80/-0) rhythmdb/rhythmdb.c (+5376/-0) rhythmdb/rhythmdb.h (+466/-0) shell/Makefile.am (+176/-0) shell/main.c (+441/-0) shell/rb-history.c (+704/-0) shell/rb-history.h (+103/-0) shell/rb-module.c (+185/-0) shell/rb-module.h (+59/-0) shell/rb-play-order-linear-loop.c (+134/-0) shell/rb-play-order-linear-loop.h (+60/-0) shell/rb-play-order-linear.c (+116/-0) shell/rb-play-order-linear.h (+59/-0) shell/rb-play-order-queue.c (+194/-0) shell/rb-play-order-queue.h (+59/-0) shell/rb-play-order-random-by-age-and-rating.c (+104/-0) shell/rb-play-order-random-by-age-and-rating.h (+59/-0) shell/rb-play-order-random-by-age.c (+95/-0) shell/rb-play-order-random-by-age.h (+59/-0) shell/rb-play-order-random-by-rating.c (+79/-0) shell/rb-play-order-random-by-rating.h (+59/-0) shell/rb-play-order-random-equal-weights.c (+71/-0) shell/rb-play-order-random-equal-weights.h (+59/-0) shell/rb-play-order-random.c (+467/-0) shell/rb-play-order-random.h (+77/-0) shell/rb-play-order-shuffle.c (+553/-0) shell/rb-play-order-shuffle.h (+63/-0) shell/rb-play-order.c (+898/-0) shell/rb-play-order.h (+173/-0) shell/rb-playlist-manager.c (+1929/-0) shell/rb-playlist-manager.h (+135/-0) shell/rb-playlist-manager.xml (+42/-0) shell/rb-plugin-manager.c (+566/-0) shell/rb-plugin-manager.h (+79/-0) shell/rb-plugin.c (+397/-0) shell/rb-plugin.h (+215/-0) shell/rb-plugins-engine.c (+728/-0) shell/rb-plugins-engine.h (+64/-0) shell/rb-python-module.c (+576/-0) shell/rb-python-module.h (+71/-0) shell/rb-python-plugin.c (+282/-0) shell/rb-python-plugin.h (+52/-0) shell/rb-removable-media-manager.c (+915/-0) shell/rb-removable-media-manager.h (+78/-0) shell/rb-shell-clipboard.c (+1083/-0) shell/rb-shell-clipboard.h (+72/-0) shell/rb-shell-player.c (+3961/-0) shell/rb-shell-player.h (+174/-0) shell/rb-shell-player.xml (+84/-0) shell/rb-shell-preferences.c (+695/-0) shell/rb-shell-preferences.h (+68/-0) shell/rb-shell.c (+3887/-0) shell/rb-shell.h (+178/-0) shell/rb-shell.xml (+78/-0) shell/rb-source-header.c (+915/-0) shell/rb-source-header.h (+78/-0) shell/rb-statusbar.c (+563/-0) shell/rb-statusbar.h (+74/-0) shell/rb-track-transfer-batch.c (+905/-0) shell/rb-track-transfer-batch.h (+103/-0) shell/rb-track-transfer-queue.c (+717/-0) shell/rb-track-transfer-queue.h (+83/-0) sources/Makefile.am (+72/-0) sources/rb-auto-playlist-source.c (+931/-0) sources/rb-auto-playlist-source.h (+85/-0) sources/rb-browser-source.c (+951/-0) sources/rb-browser-source.h (+77/-0) sources/rb-import-errors-source.c (+504/-0) sources/rb-import-errors-source.h (+69/-0) sources/rb-library-source.c (+1566/-0) sources/rb-library-source.h (+69/-0) sources/rb-media-player-source.c (+749/-0) sources/rb-media-player-source.h (+100/-0) sources/rb-missing-files-source.c (+351/-0) sources/rb-missing-files-source.h (+67/-0) sources/rb-play-queue-source.c (+521/-0) sources/rb-play-queue-source.h (+70/-0) sources/rb-playlist-source.c (+1170/-0) sources/rb-playlist-source.h (+104/-0) sources/rb-playlist-xml.h (+62/-0) sources/rb-podcast-source.c (+2175/-0) sources/rb-podcast-source.h (+67/-0) sources/rb-removable-media-source.c (+1044/-0) sources/rb-removable-media-source.h (+106/-0) sources/rb-source-group.c (+254/-0) sources/rb-source-group.h (+85/-0) sources/rb-source-search-basic.c (+172/-0) sources/rb-source-search-basic.h (+74/-0) sources/rb-source-search.c (+173/-0) sources/rb-source-search.h (+87/-0) sources/rb-source.c (+2013/-0) sources/rb-source.h (+258/-0) sources/rb-sourcelist-model.c (+650/-0) sources/rb-sourcelist-model.h (+89/-0) sources/rb-sourcelist.c (+1418/-0) sources/rb-sourcelist.h (+94/-0) sources/rb-static-playlist-source.c (+1009/-0) sources/rb-static-playlist-source.h (+97/-0) sources/rb-streaming-source.c (+506/-0) sources/rb-streaming-source.h (+73/-0) sources/sync/Makefile.am (+33/-0) sources/sync/rb-sync-settings-ui.c (+416/-0) sources/sync/rb-sync-settings-ui.h (+67/-0) sources/sync/rb-sync-settings.c (+443/-0) sources/sync/rb-sync-settings.h (+99/-0) sources/sync/rb-sync-state-ui.c (+328/-0) sources/sync/rb-sync-state-ui.h (+84/-0) sources/sync/rb-sync-state.c (+553/-0) sources/sync/rb-sync-state.h (+91/-0) tests/Makefile.am (+88/-0) tests/bench-rhythmdb-load.c (+143/-0) tests/deserialization-test1.xml (+3/-0) tests/deserialization-test2.xml (+18/-0) tests/deserialization-test3.xml (+28/-0) tests/podcast-upgrade.xml (+93/-0) tests/test-audioscrobbler.c (+114/-0) tests/test-file-helpers.c (+145/-0) tests/test-rb-lib.c (+123/-0) tests/test-rhythmdb-property-model.c (+725/-0) tests/test-rhythmdb-query-model.c (+344/-0) tests/test-rhythmdb-query.c (+557/-0) tests/test-rhythmdb-tree-serialization.c (+160/-0) tests/test-rhythmdb-view.c (+157/-0) tests/test-rhythmdb.c (+579/-0) tests/test-utils.c (+196/-0) tests/test-utils.h (+56/-0) tests/test-widgets.c (+452/-0) tools/check-config-h.pl (+109/-0) tools/check-finalizers (+191/-0) tools/check-glade-visible (+67/-0) tools/check-null-false-returns (+147/-0) tools/massif.sh (+2/-0) tools/run-tests (+4/-0) widgets/Makefile.am (+65/-0) widgets/gossip-cell-renderer-expander.c (+524/-0) widgets/gossip-cell-renderer-expander.h (+57/-0) widgets/rb-alert-dialog.c (+447/-0) widgets/rb-alert-dialog.h (+60/-0) widgets/rb-cell-renderer-pixbuf.c (+335/-0) widgets/rb-cell-renderer-pixbuf.h (+62/-0) widgets/rb-cell-renderer-rating.c (+338/-0) widgets/rb-cell-renderer-rating.h (+64/-0) widgets/rb-dialog.c (+166/-0) widgets/rb-dialog.h (+49/-0) widgets/rb-entry-view.c (+2760/-0) widgets/rb-entry-view.h (+196/-0) widgets/rb-header.c (+823/-0) widgets/rb-header.h (+77/-0) widgets/rb-library-browser.c (+888/-0) widgets/rb-library-browser.h (+80/-0) widgets/rb-property-view.c (+968/-0) widgets/rb-property-view.h (+101/-0) widgets/rb-query-creator-private.h (+80/-0) widgets/rb-query-creator-properties.c (+618/-0) widgets/rb-query-creator.c (+983/-0) widgets/rb-query-creator.h (+76/-0) widgets/rb-rating-helper.c (+317/-0) widgets/rb-rating-helper.h (+55/-0) widgets/rb-rating.c (+454/-0) widgets/rb-rating.h (+67/-0) widgets/rb-search-entry.c (+382/-0) widgets/rb-search-entry.h (+76/-0) widgets/rb-segmented-bar.c (+1060/-0) widgets/rb-segmented-bar.h (+80/-0) widgets/rb-song-info.c (+1861/-0) widgets/rb-song-info.h (+72/-0) widgets/rb-uri-dialog.c (+275/-0) widgets/rb-uri-dialog.h (+68/-0) widgets/test-rb-segmented-bar.c (+76/-0) xmldocs.make (+101/-0) Conflict adding file AUTHORS. Moved existing file to AUTHORS.moved. Conflict adding file COPYING. Moved existing file to COPYING.moved. Conflict adding file ChangeLog. Moved existing file to ChangeLog.moved. Conflict adding file DOCUMENTERS. Moved existing file to DOCUMENTERS.moved. Conflict adding file INTERNALS. Moved existing file to INTERNALS.moved. Conflict adding file MAINTAINERS. Moved existing file to MAINTAINERS.moved. Conflict adding file MAINTAINERS.old. Moved existing file to MAINTAINERS.old.moved. Conflict adding file Makefile.am. Moved existing file to Makefile.am.moved. Conflict adding file NEWS. Moved existing file to NEWS.moved. Conflict adding file README. Moved existing file to README.moved. Conflict adding file THANKS. Moved existing file to THANKS.moved. Conflict adding file autogen.sh. Moved existing file to autogen.sh.moved. Conflict adding file backends. Moved existing file to backends.moved. Conflict adding file bindings. Moved existing file to bindings.moved. Conflict adding file configure.ac. Moved existing file to configure.ac.moved. Conflict adding file data. Moved existing file to data.moved. Conflict adding file doc. Moved existing file to doc.moved. Conflict adding file help. Moved existing file to help.moved. Conflict adding file lib. Moved existing file to lib.moved. Conflict adding file macros. Moved existing file to macros.moved. Conflict adding file metadata. Moved existing file to metadata.moved. Conflict adding file plugins. Moved existing file to plugins.moved. Conflict adding file po. Moved existing file to po.moved. Conflict adding file podcast. Moved existing file to podcast.moved. Conflict adding file remote. Moved existing file to remote.moved. Conflict adding file rhythmbox.pc.in. Moved existing file to rhythmbox.pc.in.moved. Conflict adding file rhythmdb. Moved existing file to rhythmdb.moved. Conflict adding file shell. Moved existing file to shell.moved. Conflict adding file sources. Moved existing file to sources.moved. Conflict adding file tests. Moved existing file to tests.moved. Conflict adding file widgets. Moved existing file to widgets.moved.
To merge this branch:	bzr merge lp://qastaging/~aw/rhythmbox/swedishradio
Related bugs:	Link a bug report