[banshee: 27/27] Merge branch 'lastfm-split'
- From: Bertrand Lorentz <blorentz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee: 27/27] Merge branch 'lastfm-split'
- Date: Sat, 22 May 2010 18:53:49 +0000 (UTC)
commit 54c11dcba7c46f8c15efb360153d58d0e07a9da8
Merge: 606b028 235a438
Author: Bertrand Lorentz <bertrand lorentz gmail com>
Date: Sat May 22 20:53:35 2010 +0200
Merge branch 'lastfm-split'
Banshee.sln | 7 +
build/build.environment.mk | 2 +
configure.ac | 1 +
data/addin-xml-strings.cs | 9 +-
po/POTFILES.in | 16 +-
.../Banshee.Lastfm.Audioscrobbler/Queue.cs | 6 +-
.../Banshee.Lastfm.Radio/LastfmActions.cs | 431 --------------------
.../RecommendationPane.cs | 2 -
.../Banshee.Lastfm/Banshee.Lastfm.addin.xml | 8 +-
.../Banshee.Lastfm/Banshee.Lastfm.csproj | 44 +-
.../Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs | 271 ++++++++++++
.../LastfmColumnController.cs | 2 +-
.../LastfmPreferences.cs | 11 +-
.../LastfmSource.cs | 66 +--
.../LastfmSourceContents.cs | 2 +-
src/Extensions/Banshee.Lastfm/Makefile.am | 18 +-
.../Banshee.Lastfm/Resources/GlobalUI.xml | 34 +--
.../Banshee.LastfmStreaming.addin.xml | 24 ++
.../Banshee.LastfmStreaming.csproj | 96 +++++
.../LastfmStreamingActions.cs | 269 ++++++++++++
.../LastfmStreamingService.cs | 145 +++++++
.../Banshee.LastfmStreaming}/LastfmTrackInfo.cs | 5 +-
.../Banshee.LastfmStreaming}/StationEditor.cs | 3 +-
.../Banshee.LastfmStreaming}/StationSource.cs | 7 +-
.../Banshee.LastfmStreaming}/StationType.cs | 2 +-
src/Extensions/Banshee.LastfmStreaming/Makefile.am | 21 +
.../Resources/ActiveSourceUI.xml | 0
.../Banshee.LastfmStreaming/Resources/GlobalUI.xml | 51 +++
.../Resources/LastfmTrackActions.xml | 0
src/Extensions/Makefile.am | 1 +
.../Lastfm/Lastfm.Data/ILastfmInfo.cs} | 28 +-
src/Libraries/Lastfm/Lastfm.csproj | 1 +
src/Libraries/Lastfm/Makefile.am | 1 +
33 files changed, 995 insertions(+), 589 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]