[banshee/dbus-sharp: 418/418] Merge branch 'master' into dbus-sharp
- From: Peter James Johanson <petej src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee/dbus-sharp: 418/418] Merge branch 'master' into dbus-sharp
- Date: Wed, 2 Feb 2011 20:15:09 +0000 (UTC)
commit 7cabac1bb2d6e7151ae6b04fd0b0550b4cd5f954
Merge: d4461ac 3e571f4
Author: Pete Johanson <peter peterjohanson com>
Date: Wed Feb 2 14:39:52 2011 -0500
Merge branch 'master' into dbus-sharp
Conflicts:
configure.ac
src/Backends/Banshee.Gnome/Banshee.Gnome.csproj
src/Backends/Banshee.Hal/Banshee.Hal.csproj
src/Clients/Beroe/Beroe.csproj
src/Clients/Booter/Booter.csproj
src/Clients/Halie/Halie.csproj
src/Clients/Muinshee/Muinshee.csproj
src/Core/Banshee.CollectionIndexer/Banshee.CollectionIndexer.csproj
src/Core/Banshee.Core/Banshee.Core.csproj
src/Core/Banshee.Services/Banshee.Services.csproj
src/Core/Banshee.ThickClient/Banshee.ThickClient.csproj
src/Extensions/Banshee.Mpris/Banshee.Mpris.csproj
src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys.csproj
src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.csproj
src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue.csproj
.gitignore | 6 +
AUTHORS | 11 +-
Banshee.sln | 35 +-
Makefile.am | 5 +-
NEWS | 135 +-
README.l10n | 10 +
autogen.sh | 9 +-
banshee.doap | 18 +-
build/TranslatorExtractor.cs | 9 +-
build/build.environment.mk | 17 +-
build/m4/banshee/dap-karma.m4 | 7 +-
build/m4/banshee/gstreamer.m4 | 9 +-
build/m4/banshee/mono-addins.m4 | 3 -
build/m4/banshee/soundmenu.m4 | 20 +
build/m4/banshee/ubuntuonemusicstore.m4 | 20 +
build/pkg-config/Makefile.am | 2 +-
build/pkg-config/banshee-1-hyena-data-sqlite.pc.in | 2 +-
build/windows/Bitmaps/bannrbmp.bmp | Bin 0 -> 114430 bytes
build/windows/Bitmaps/banshee.ico | Bin 0 -> 167206 bytes
build/windows/Bitmaps/dlgbmp.bmp | Bin 0 -> 615318 bytes
build/windows/Installer.wixproj | 47 +
build/windows/InstallerDefinition.wxs | 100 +
build/windows/README.txt | 13 +
build/windows/build-installer.js | 81 +
build/windows/license.rtf | Bin 0 -> 1254 bytes
build/windows/post-build.bat | 140 +
build/windows/update-scripts | 22 +
configure.ac | 22 +-
data/addin-xml-strings.cs | 10 +
data/audio-profiles/mp3-lame.xml.in | 40 +-
extras/README.releasing | 8 +-
extras/create-authors | 2 +-
extras/create-contributors-paragraph | 2 +-
extras/create-release-notes | 127 +
extras/make-release | 2 +-
extras/metrics.py | 2 +-
extras/metrics/fetch-metrics | 2 +-
extras/metrics/metrics.csproj | 4 -
gstreamer/equalizer/gstiirequalizer.c | 12 +-
help/C/add-radio.page | 2 +-
help/C/amazon.page | 2 +-
help/C/import.page | 2 +-
help/C/introduction.page | 2 +-
help/C/lastfm.page | 6 +-
help/C/manage-playlists.page | 2 +-
help/C/play.page | 2 +-
help/C/search.page | 6 +-
help/C/sort.page | 8 +-
help/C/sync.page | 2 +-
help/C/ui.page | 2 +-
help/Makefile.am | 2 +-
help/ca/ca.po | 2165 +++
help/da/da.po | 1776 +++
help/de/de.po | 576 +-
help/el/el.po | 1270 ++
help/es/es.po | 1689 +++
help/fr/fr.po | 2137 +++
help/sl/sl.po | 1274 ++
libbanshee/banshee-bpmdetector.c | 6 +-
libbanshee/banshee-player-pipeline.c | 39 +-
libbanshee/banshee-player-private.h | 1 +
libbanshee/banshee-player-video.c | 61 +-
libbanshee/banshee-player.c | 118 +
libbanshee/banshee-transcoder.c | 4 +-
libbanshee/libbanshee.sln | 47 +-
po/LINGUAS | 2 +
po/POTFILES.in | 8 +-
po/ast.po | 3005 +++--
po/ca.po | 2251 ++--
po/ca valencia po | 9916 +++++++++++++
po/cs.po | 1857 ++--
po/da.po | 576 +-
po/de.po | 1822 ++-
po/el.po | 3307 +++---
po/es.po | 2136 ++--
po/eu.po | 2891 +++--
po/fi.po | 1853 ++-
po/fr.po | 1869 ++-
po/gl.po | 1625 ++-
po/he.po | 7406 ++++++----
po/hu.po | 1699 ++-
po/id.po | 7719 ++++++++++
po/it.po | 2486 ++--
po/ja.po | 901 +-
po/lt.po | 2470 ++--
po/nb.po | 6132 ++++++---
po/pt_BR.po | 4008 ++----
po/sl.po | 1793 ++-
po/sort-potfiles | 2 +-
po/sv.po | 2289 ++--
po/th.po | 9067 ++++++++++---
po/uk.po | 2416 ++--
po/zh_CN.po | 2408 ++--
release-rc | 2 +-
.../Banshee.GStreamer/Banshee.GStreamer.csproj | 3 -
.../Banshee.GStreamer/AudioCdRipper.cs | 7 +
.../Banshee.GStreamer/PlayerEngine.cs | 65 +-
.../Banshee.GStreamer/Banshee.GStreamer/Service.cs | 26 +-
.../Banshee.GStreamerSharp/PlayerEngine.cs | 44 +
src/Backends/Banshee.Gio/Banshee.Gio.csproj | 3 -
.../Banshee.Hardware.Gio/BlockDevice.cs | 3 +-
.../DeviceMediaCapabilities.cs | 4 +-
.../Banshee.Hardware.Gio/HardwareManager.cs | 6 +-
.../Banshee.Hardware.Gio/LowLevel/Manager.cs | 2 +-
.../LowLevel/RawBlockDevice.cs | 6 -
.../Banshee.Hardware.Gio/LowLevel/RawDevice.cs | 6 +-
.../Banshee.Hardware.Gio/LowLevel/RawUsbDevice.cs | 6 -
.../Banshee.Hardware.Gio/LowLevel/RawVolume.cs | 4 -
.../Banshee.Gio/Banshee.Hardware.Gio/UsbDevice.cs | 49 +-
.../Banshee.Gio/Banshee.IO.Gio/Directory.cs | 4 +-
src/Backends/Banshee.Gio/Banshee.IO.Gio/File.cs | 10 +-
src/Backends/Banshee.Gio/Makefile.am | 1 -
src/Backends/Banshee.Gnome/Banshee.Gnome.csproj | 4 +-
.../Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs | 9 +-
.../GConfConfigurationClient.cs | 36 +-
src/Backends/Banshee.Hal/Banshee.Hal.csproj | 2 +
.../Banshee.NowPlaying.X11.csproj | 3 -
src/Backends/Banshee.Osx/Banshee.Osx.csproj | 1 -
src/Backends/Banshee.Unix/Banshee.Unix.csproj | 1 -
src/Clients/Beroe/Beroe.csproj | 2 +-
src/Clients/Booter/Booter.csproj | 1 +
src/Clients/Booter/Booter/Entry.cs | 6 +-
src/Clients/Booter/banshee-1.darwin.in | 3 +
src/Clients/Booter/banshee-1.linux.in | 7 +-
src/Clients/Halie/Halie.csproj | 1 +
src/Clients/Muinshee/Muinshee.csproj | 6 +-
src/Clients/Nereid/Nereid.csproj | 5 -
src/Clients/Nereid/Nereid/PlayerInterface.cs | 74 +-
src/Clients/Nereid/Nereid/ViewContainer.cs | 97 +-
.../Banshee.CollectionIndexer.csproj | 1 +
src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs | 9 +-
.../Banshee.Base/Tests/CoverArtSpecTests.cs | 4 +
.../Banshee.Core/Banshee.Collection/TrackInfo.cs | 5 +
.../Banshee.Collection/UnknownTrackInfo.cs | 2 +-
.../Banshee.Configuration/ConfigurationClient.cs | 26 +-
.../Banshee.Configuration/IConfigurationClient.cs | 42 +-
.../MemoryConfigurationClient.cs | 40 +-
.../XmlConfigurationClient.cs | 38 +-
src/Core/Banshee.Core/Banshee.Core.csproj | 55 +-
.../Banshee.IO/DirectoryScannerPipelineElement.cs | 8 +-
.../Banshee.Core/Banshee.Streaming/StreamTagger.cs | 2 +-
src/Core/Banshee.Core/Resources/contributors.xml | 11 +-
src/Core/Banshee.Core/Resources/translators.xml | 32 +-
.../Banshee.Collection.Database/Bookmark.cs | 1 -
.../DatabaseAlbumInfo.cs | 1 -
.../DatabaseAlbumListModel.cs | 1 -
.../DatabaseArtistInfo.cs | 1 -
.../DatabaseArtistListModel.cs | 1 -
.../DatabaseFilterListModel.cs | 1 -
.../DatabaseImportManager.cs | 4 +-
.../DatabaseTrackInfo.cs | 11 +-
.../DatabaseTrackListModel.cs | 23 +-
.../IDatabaseTrackModelCache.cs | 3 +-
.../Banshee.Collection.Database/RandomBy.cs | 98 +-
.../Banshee.Collection.Database/RandomByAlbum.cs | 21 +-
.../Banshee.Collection.Database/RandomByArtist.cs | 19 +-
.../Banshee.Collection.Database/RandomByOff.cs | 12 +-
.../Banshee.Collection.Database/RandomByRating.cs | 19 +-
.../Banshee.Collection.Database/RandomByScore.cs | 26 +-
.../Banshee.Collection.Database/RandomBySlot.cs | 1 +
.../Banshee.Collection.Database/RandomByTrack.cs | 13 +-
.../Banshee.Collection.Database/Shuffler.cs | 27 +-
.../Banshee.Collection/ImportManager.cs | 6 +
.../Banshee.Collection/RescanPipeline.cs | 1 -
.../DatabaseConfigurationClient.cs | 40 +-
.../Banshee.Database/BansheeDbConnection.cs | 65 +-
.../Banshee.Database/BansheeDbFormatMigrator.cs | 8 +-
.../Banshee.Database/BansheeModelCache.cs | 1 -
.../Banshee.Database/BansheeModelProvider.cs | 1 -
.../Banshee.Database/SortKeyUpdater.cs | 1 +
.../Banshee.Services/Banshee.Database/Tests.cs | 6 +
.../Banshee.Library/ImportSourceManager.cs | 3 -
.../Banshee.Library/LibrarySchema.cs | 2 +-
.../Banshee.Library/LibrarySource.cs | 12 +-
.../Banshee.Library/MusicFileNamePattern.cs | 8 +-
.../Banshee.Library/MusicLibrarySource.cs | 12 +-
.../Banshee.Library/Tests/FileNamePatternTests.cs | 12 +
.../Banshee.Library/VideoLibrarySource.cs | 4 +
.../Banshee.MediaEngine/NullPlayerEngine.cs | 17 +
.../Banshee.MediaEngine/PlayerEngine.cs | 72 +-
.../Banshee.MediaEngine/PlayerEngineService.cs | 40 +-
.../Banshee.Services/Banshee.MediaEngine/Tests.cs | 316 +
.../MusicBrainzQueryJob.cs | 153 +-
.../Banshee.Metadata/SaveTrackMetadataJob.cs | 5 +-
.../Banshee.Metrics/BansheeMetrics.cs | 36 +-
.../Banshee.Playlist/AbstractPlaylistSource.cs | 5 +-
.../Banshee.Playlist/PlaylistSource.cs | 5 +-
.../PlaylistFormatBase.cs | 10 +-
.../Banshee.Playlists.Formats/PlaylistParser.cs | 8 +-
.../Banshee.Preferences/PreferenceService.cs | 4 +-
.../Banshee.Services/Banshee.Query/BansheeQuery.cs | 9 +-
.../Banshee.ServiceStack/ServiceManager.cs | 3 +
src/Core/Banshee.Services/Banshee.Services.csproj | 17 +-
.../Banshee.SmartPlaylist/Migrator.cs | 148 -
.../SmartPlaylistDefinition.cs | 4 +-
.../Banshee.SmartPlaylist/SmartPlaylistSource.cs | 26 +-
.../Banshee.Sources/DatabaseSource.cs | 52 +-
.../Banshee.Sources/ITrackModelSource.cs | 5 +-
.../Banshee.Sources/PrimarySource.cs | 36 +-
.../Banshee.Sources/SourceManager.cs | 6 +-
src/Core/Banshee.Services/Banshee.Sources/Tests.cs | 88 +
.../Banshee.Streaming/RadioTrackInfo.cs | 2 +-
src/Core/Banshee.Services/Makefile.am | 3 +-
.../Banshee.Collection.Gui/AlbumListView.cs | 2 +
.../Banshee.Collection.Gui/ArtworkManager.cs | 15 +
.../ColumnCellStatusIndicator.cs | 19 +-
.../Banshee.Collection.Gui/DataViewChildAlbum.cs | 326 +-
.../PersistentColumnController.cs | 74 +-
.../Banshee.Collection.Gui/TrackFilterListView.cs | 41 +-
.../Banshee.Collection.Gui/TrackListView.cs | 20 +-
.../Banshee.Gui.Dialogs/BansheeDialog.cs | 4 +-
.../Banshee.Gui.Dialogs/FileChooserDialog.cs | 36 +-
.../Banshee.Gui.TrackEditor/EditorTrackInfo.cs | 7 +-
.../Banshee.Gui.TrackEditor/RangeEntry.cs | 19 +-
.../Banshee.Gui.TrackEditor/StatisticsPage.cs | 61 +-
.../Banshee.Gui.TrackEditor/TrackEditorDialog.cs | 55 +-
.../Banshee.Gui.Widgets/ConnectedSeekSlider.cs | 25 +-
.../Banshee.Gui.Widgets/MainMenu.cs | 3 +
.../Banshee.Gui.Widgets/TrackInfoDisplay.cs | 6 +-
.../Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs | 26 +-
.../Banshee.Gui/BookmarksService.cs | 5 +-
.../Banshee.Gui/GlobalActions.cs | 20 -
.../Banshee.Gui/IconThemeUtils.cs | 18 +
.../Banshee.Gui/InterfaceActionService.cs | 3 +-
.../Banshee.Gui/PlaybackActions.cs | 19 +-
.../Banshee.Gui/PlaybackSubtitleActions.cs | 220 +
.../Banshee.Gui/TrackActions.cs | 151 +-
.../Banshee.Library.Gui/FileImportSource.cs | 2 +-
.../Banshee.Library.Gui/FolderImportSource.cs | 2 +-
.../Banshee.Library.Gui/PhotoFolderImportSource.cs | 97 -
.../Banshee.Preferences.Gui/PageComboBox.cs | 2 +-
.../Banshee.SmartPlaylist.Gui/Editor.cs | 1 -
.../Banshee.Sources.Gui/SourceComboBox.cs | 3 +-
.../Banshee.Sources.Gui/SourceModel.cs | 39 +-
.../Banshee.Sources.Gui/SourceRowRenderer.cs | 134 +-
.../Banshee.Sources.Gui/SourceView.cs | 153 +-
.../Banshee.Sources.Gui/SourceView_DragAndDrop.cs | 1 +
.../Banshee.ThickClient.addin.xml | 1 -
.../Banshee.ThickClient/Banshee.ThickClient.csproj | 17 +-
src/Core/Banshee.ThickClient/Makefile.am | 3 +-
.../Resources/core-ui-actions-layout.xml | 16 +-
.../Banshee.WebBrowser/Banshee.WebBrowser.csproj | 47 +-
.../Banshee.WebBrowser/OssiferSession.cs | 2 +-
.../JavaScriptCore.Bridge/Runtime.cs | 82 +
.../JavaScriptCore.Bridge/Tests/RuntimeTests.cs} | 67 +-
.../Banshee.WebBrowser/JavaScriptCore/JSClass.cs} | 45 +-
.../JavaScriptCore/JSClassAttribute.cs} | 51 +-
.../JavaScriptCore/JSClassDefinition.cs | 290 +
.../Banshee.WebBrowser/JavaScriptCore/JSContext.cs | 109 +
.../Banshee.WebBrowser/JavaScriptCore/JSError.cs} | 57 +-
.../JavaScriptCore/JSErrorException.cs} | 46 +-
.../JavaScriptCore/JSException.cs} | 60 +-
.../JavaScriptCore/JSFunction.cs | 65 +
.../Banshee.WebBrowser/JavaScriptCore/JSObject.cs | 223 +
.../JavaScriptCore/JSPropertyAttribute.cs} | 53 +-
.../JavaScriptCore/JSPropertyNameAccumulator.cs} | 51 +-
.../JavaScriptCore/JSPropertyNameArray.cs | 83 +
.../JavaScriptCore/JSStaticFunction.cs} | 51 +-
.../JavaScriptCore/JSStaticFunctionAttribute.cs} | 53 +-
.../Banshee.WebBrowser/JavaScriptCore/JSString.cs | 128 +
.../Banshee.WebBrowser/JavaScriptCore/JSType.cs} | 52 +-
.../Banshee.WebBrowser/JavaScriptCore/JSValue.cs | 290 +
.../JavaScriptCore/ManagedPropertyBagClass.cs | 80 +
.../JavaScriptCore/Tests/JSClassTests.cs | 178 +
.../JavaScriptCore/Tests/JSFunctionTests.cs | 120 +
.../JavaScriptCore/Tests/JSObjectTests.cs | 198 +
.../JavaScriptCore/Tests/JSStringTests.cs} | 62 +-
.../JavaScriptCore/Tests/JSValueTests.cs | 248 +
src/Core/Banshee.WebBrowser/Makefile.am | 27 +-
src/Core/Banshee.Widgets/Banshee.Widgets.csproj | 5 -
.../Banshee.Dap.AppleDevice.csproj | 6 +-
.../Banshee.Dap.AppleDevice/AppleDeviceSource.cs | 214 +-
.../AppleDeviceTrackInfo.cs | 166 +-
src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod.csproj | 5 -
.../Banshee.Dap.MassStorage.addin.xml | 11 +-
.../Banshee.Dap.MassStorage.csproj | 3 -
.../Banshee.Dap.MassStorage/AndroidDevice.cs | 2 +-
.../Banshee.Dap.MassStorage/MassStorageSource.cs | 2 +-
src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp.csproj | 2 -
.../Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs | 3 +-
src/Dap/Banshee.Dap/Banshee.Dap.csproj | 5 -
src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs | 2 +-
src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs | 14 +-
.../Banshee.AmazonMp3.Store.csproj | 6 +-
.../16x16/categories/amazon-mp3-store-source.png | Bin 0 -> 757 bytes
.../Banshee.AmazonMp3.Store/server/redirect.c | 3 +-
.../Banshee.AmazonMp3/Banshee.AmazonMp3.csproj | 18 +-
.../Banshee.AmazonMp3/AmazonDownloadManager.cs | 16 +-
.../Banshee.AudioCd/Banshee.AudioCd.csproj | 5 -
.../Banshee.AudioCd/AudioCdSource.cs | 9 +-
.../Banshee.Audiobook/Banshee.Audiobook.csproj | 5 -
.../Banshee.Audiobook/AudiobookFileNamePattern.cs | 1 +
.../Banshee.Audiobook/AudiobookGrid.cs | 5 -
.../Banshee.Audiobook/AudiobookLibrarySource.cs | 6 +-
.../Banshee.Audiobook/BookView.cs | 4 +-
.../ThemeIcons/256x256/categories/audiobook.png | Bin 0 -> 37754 bytes
.../ThemeIcons/audiobook-source.svg |15138 ++++++++++++++++++++
.../ThemeIcons/scalable/categories/audiobook.svg | 83 -
.../Banshee.BooScript/Banshee.BooScript.csproj | 4 -
src/Extensions/Banshee.Bpm/Banshee.Bpm.csproj | 11 +-
src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs | 18 +-
.../Banshee.Bpm/Banshee.Bpm/BpmService.cs | 1 -
.../Banshee.CoverArt/Banshee.CoverArt.csproj | 4 -
.../Banshee.CoverArt/CoverArtService.cs | 2 +-
src/Extensions/Banshee.Daap/Banshee.Daap.csproj | 5 -
.../Banshee.Daap/Banshee.Daap/DaapService.cs | 24 +-
.../Banshee.Daap/Banshee.Daap/OpenRemoteServer.cs | 56 +-
.../Banshee.Emusic/Banshee.Emusic.csproj | 5 -
.../Banshee.Emusic/Banshee.Emusic/EmusicImport.cs | 1 -
.../Banshee.FileSystemQueue.csproj | 2 -
src/Extensions/Banshee.Fixup/Banshee.Fixup.csproj | 3 +-
.../Banshee.Fixup/ColumnCellSolutionOptions.cs | 15 +-
.../Banshee.Fixup/Banshee.Fixup/Problem.cs | 15 +-
.../Banshee.Fixup/Banshee.Fixup/ProblemModel.cs | 1 +
.../Banshee.InternetArchive.csproj | 5 -
.../Banshee.InternetArchive/Actions.cs | 17 +-
.../Banshee.InternetArchive/DetailsSource.cs | 4 +-
.../Banshee.InternetArchive/HeaderFilters.cs | 3 +-
.../InternetArchive/Search.cs | 9 +
.../Resources/SearchSourceActiveUI.xml | 1 +
.../16x16/categories/internet-archive.png | Bin 0 -> 906 bytes
.../22x22/categories/internet-archive.png | Bin 1304 -> 807 bytes
.../Banshee.InternetRadio.csproj | 4 -
.../Banshee.InternetRadio/InternetRadioSource.cs | 20 +-
.../ThemeIcons/16x16/categories/radio.png | Bin 0 -> 781 bytes
.../AudioscrobblerService.cs | 3 +-
.../Banshee.Lastfm/Banshee.Lastfm.csproj | 7 -
.../16x16/categories/lastfm-audioscrobbler.png | Bin 0 -> 768 bytes
.../16x16/categories/lastfm-neighbour.png | Bin 0 -> 703 bytes
.../16x16/categories/lastfm-personal.png | Bin 0 -> 654 bytes
.../16x16/categories/lastfm-recommended.png | Bin 0 -> 677 bytes
.../ThemeIcons/16x16/categories/lastfm-tag.png | Bin 0 -> 673 bytes
.../Banshee.LastfmStreaming.csproj | 5 -
.../Banshee.LastfmStreaming/StationSource.cs | 11 +-
.../Banshee.LastfmStreaming/StationType.cs | 12 +-
.../Banshee.LibraryWatcher.csproj | 4 -
.../LibraryWatcherService.cs | 10 +-
.../Banshee.LibraryWatcher/SourceWatcher.cs | 1 -
src/Extensions/Banshee.MeeGo/Banshee.MeeGo.csproj | 2 -
.../Banshee.MeeGo/MediaPanelContents.cs | 12 +
.../Banshee.MiniMode/Banshee.MiniMode.csproj | 4 -
.../Banshee.MiroGuide/Banshee.MiroGuide.csproj | 3 -
src/Extensions/Banshee.Mpris/Banshee.Mpris.csproj | 10 +-
.../Banshee.Mpris/Banshee.Mpris/IPlaylists.cs} | 60 +-
.../Banshee.Mpris/Banshee.Mpris/MediaPlayer.cs | 187 +-
.../Banshee.Mpris/Banshee.Mpris/MprisService.cs | 32 +
src/Extensions/Banshee.Mpris/Makefile.am | 1 +
.../Banshee.MultimediaKeys.csproj | 1 +
.../Banshee.NotificationArea.csproj | 11 +-
.../NotificationAreaService.cs | 2 +-
.../X11NotificationArea.cs | 31 +-
.../Banshee.NotificationArea/Makefile.am | 4 +
.../Banshee.NowPlaying/Banshee.NowPlaying.csproj | 5 -
.../Banshee.NowPlaying/FullscreenWindow.cs | 13 +-
.../Banshee.NowPlaying/OverlayWindow.cs | 4 +-
.../Banshee.PlayQueue/Banshee.PlayQueue.csproj | 9 +-
.../Banshee.PlayQueue/HeaderWidget.cs | 23 +-
.../Banshee.PlayQueue/IPlayQueue.cs | 1 +
.../Banshee.PlayQueue/PlayQueueActions.cs | 74 +-
.../Banshee.PlayQueue/PlayQueueSource.cs | 165 +-
.../Banshee.PlayQueue/QueueMode.cs} | 48 +-
src/Extensions/Banshee.PlayQueue/Makefile.am | 3 +-
.../Banshee.PlayQueue/Resources/GlobalUI.xml | 5 +
.../Banshee.PlayerMigration.csproj | 5 -
.../AmarokPlayerImportSource.cs | 5 +-
.../ItunesPlayerImportSource.cs | 1 -
.../RhythmboxPlayerImportSource.cs | 1 -
.../DownloadStatusFilterModel.cs | 95 -
.../Banshee.Podcasting.Data/PodcastFeedModel.cs | 2 +-
.../Banshee.Podcasting.Data/PodcastSource.cs | 27 +-
.../PodcastTrackListModel.cs | 11 +
.../PodcastUnheardFilterModel.cs | 6 +-
.../ColumnCellDownloadStatus.cs | 64 -
.../ColumnCellPodcastStatusIndicator.cs | 25 +-
.../Banshee.Podcasting.Gui/ColumnCellUnheard.cs | 1 -
.../DownloadStatusFilterView.cs | 59 -
.../Banshee.Podcasting.Gui/Grid.cs | 109 +
.../Banshee.Podcasting.Gui/PodcastActions.cs | 58 +-
.../Banshee.Podcasting.Gui/PodcastFeedView.cs | 85 +-
.../Dialog/PodcastFeedPropertiesDialog.cs | 309 +-
.../Dialog/PodcastSubscribeDialog.cs | 81 +-
.../PodcastSourceContents.cs | 16 +-
.../Banshee.Podcasting/Banshee.Podcasting.csproj | 15 +-
.../Banshee.Podcasting/PodcastService.cs | 24 +-
src/Extensions/Banshee.Podcasting/Makefile.am | 4 +-
.../Resources/ActiveSourceUI.xml | 21 +-
.../Banshee.Sample/Banshee.Sample.csproj | 2 -
.../Banshee.SoundMenu/Banshee.SoundMenu.addin.xml | 24 +
.../Banshee.SoundMenu/Banshee.SoundMenu.csproj | 89 +
.../Banshee.SoundMenu/SoundMenuProxy.cs | 112 +
.../Banshee.SoundMenu/SoundMenuService.cs | 410 +
src/Extensions/Banshee.SoundMenu/Makefile.am | 27 +
.../Banshee.SqlDebugConsole.csproj | 1 -
.../Banshee.UbuntuOneMusicStore.addin.xml | 23 +
.../Banshee.UbuntuOneMusicStore.csproj | 91 +
.../Tests/MusicStoreTests.cs} | 56 +-
.../UbuntuOneMusicStoreSource.cs | 132 +
.../Banshee.UbuntuOneMusicStore/Makefile.am | 16 +
.../ThemeIcons/16x16/categories/ubuntuone.png | Bin 0 -> 1037 bytes
.../ThemeIcons/22x22/categories/ubuntuone.png | Bin 0 -> 1131 bytes
.../Banshee.Wikipedia/Banshee.Wikipedia.csproj | 3 -
.../Banshee.YouTube/Banshee.YouTube.csproj | 8 -
src/Extensions/Makefile.am | 2 +
src/Hyena | 2 +-
src/Libraries/Lastfm.Gui/Lastfm.Gui.csproj | 4 -
src/Libraries/Lastfm/Lastfm.csproj | 2 -
src/Libraries/Lastfm/Lastfm/LastfmRequest.cs | 4 +-
src/Libraries/Migo/Migo.Net/AsyncWebClient.cs | 1 -
.../Migo/Migo.Syndication/EnclosureManager.cs | 20 -
src/Libraries/Migo/Migo.Syndication/Feed.cs | 26 +-
src/Libraries/Migo/Migo.Syndication/FeedItem.cs | 9 +-
src/Libraries/Migo/Migo.Syndication/FeedManager.cs | 14 +-
.../Migo/Migo.Syndication/FeedsManager.cs | 1 -
.../TablesManagers/EnclosuresTableManager.cs | 1 -
.../TablesManagers/FeedsTableManager.cs | 2 -
.../TablesManagers/ItemsTableManager.cs | 1 -
src/Libraries/Migo/Migo.Syndication/MigoItem.cs | 2 +-
.../Migo/Migo.Syndication/MigoModelProvider.cs | 13 +-
src/Libraries/Migo/Migo.csproj | 1 -
tests/Makefile.am | 5 +
tests/Performance/PerformanceTests.cs | 40 +-
tests/data/A_boy.ogg | Bin 0 -> 40553 bytes
tests/data/A_girl.ogg | Bin 0 -> 18632 bytes
tests/data/A_man.ogg | Bin 0 -> 32410 bytes
tests/data/Banana.ogg | Bin 0 -> 14405 bytes
tests/data/banshee-1.0.0.db | Bin 0 -> 41984 bytes
tests/test-a11y | 2 +-
tests/test-perf | 3 +-
428 files changed, 91940 insertions(+), 29817 deletions(-)
---
diff --cc configure.ac
index 8d5e475,40e724a..051c1ae
--- a/configure.ac
+++ b/configure.ac
@@@ -99,8 -98,12 +98,12 @@@ els
fi
AC_SUBST(BANSHEE_DESKTOP_NAME)
+ dnl Check for gdk-x11 >= 2.22 for NotificationArea extension, bgo#638477
+ PKG_CHECK_MODULES(GDK_2_22, gdk-x11-2.0 >= 2.22, have_gdk_2_22=yes, have_gdk_2_22=no)
+ AM_CONDITIONAL(HAVE_GDK_2_22, test "x$have_gdk_2_22" = "xyes")
+
-dnl NDesk DBus libraries
-BANSHEE_CHECK_NDESK_DBUS
+dnl DBus Sharp libraries
+BANSHEE_CHECK_DBUS_SHARP
dnl Mono.Addins libraries
BANSHEE_CHECK_MONO_ADDINS
diff --cc src/Backends/Banshee.Gnome/Banshee.Gnome.csproj
index fb299e8,3e9090e..f2e1bd5
--- a/src/Backends/Banshee.Gnome/Banshee.Gnome.csproj
+++ b/src/Backends/Banshee.Gnome/Banshee.Gnome.csproj
@@@ -82,11 -80,13 +80,13 @@@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..bin\Mono.Posix.dll</HintPath>
</Reference>
- <Reference Include="NDesk.DBus">
+ <Reference Include="dbus-sharp">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\bin\NDesk.DBus.dll</HintPath>
++ <HintPath>..\..\..\bin\dbus-sharp.dll</HintPath>
</Reference>
- <Reference Include="NDesk.DBus.GLib">
+ <Reference Include="dbus-sharp-glib">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\bin\NDesk.DBus.GLib.dll</HintPath>
++ <HintPath>..\..\..\bin\dbus-sharp-glib.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
diff --cc src/Backends/Banshee.Hal/Banshee.Hal.csproj
index 0d816ff,40bfdb9..f000591
--- a/src/Backends/Banshee.Hal/Banshee.Hal.csproj
+++ b/src/Backends/Banshee.Hal/Banshee.Hal.csproj
@@@ -53,11 -53,13 +53,13 @@@
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
- <Reference Include="NDesk.DBus">
+ <Reference Include="dbus-sharp">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\bin\NDesk.DBus.dll</HintPath>
++ <HintPath>..\..\..\bin\dbus-sharp.dll</HintPath>
</Reference>
- <Reference Include="NDesk.DBus.GLib">
+ <Reference Include="dbus-sharp-glib">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\bin\NDesk.DBus.GLib.dll</HintPath>
++ <HintPath>..\..\..\bin\dbus-sharp-glib.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
diff --cc src/Clients/Beroe/Beroe.csproj
index 8a9ab01,c2bafae..597fd60
--- a/src/Clients/Beroe/Beroe.csproj
+++ b/src/Clients/Beroe/Beroe.csproj
@@@ -39,11 -39,11 +39,11 @@@
<ItemGroup>
<Reference Include="glib-sharp">
<SpecificVersion>False</SpecificVersion>
- <Package>glib-sharp-2.0</Package>
</Reference>
<Reference Include="System" />
- <Reference Include="NDesk.DBus">
+ <Reference Include="dbus-sharp">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\bin\NDesk.DBus.dll</HintPath>
++ <HintPath>..\..\..\bin\dbus-sharp.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
diff --cc src/Clients/Booter/Booter.csproj
index 39fd7c0,405c553..66de21d
--- a/src/Clients/Booter/Booter.csproj
+++ b/src/Clients/Booter/Booter.csproj
@@@ -38,8 -38,9 +38,9 @@@
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
- <Reference Include="NDesk.DBus">
+ <Reference Include="dbus-sharp">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\bin\NDesk.DBus.dll</HintPath>
++ <HintPath>..\..\..\bin\dbus-sharp.dll</HintPath>
</Reference>
<Reference Include="Mono.Posix">
<SpecificVersion>False</SpecificVersion>
diff --cc src/Clients/Halie/Halie.csproj
index 751367e,4695798..735a8c8
--- a/src/Clients/Halie/Halie.csproj
+++ b/src/Clients/Halie/Halie.csproj
@@@ -38,8 -38,9 +38,9 @@@
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
- <Reference Include="NDesk.DBus">
+ <Reference Include="dbus-sharp">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\bin\NDesk.DBus.dll</HintPath>
++ <HintPath>..\..\..\bin\dbus-sharp.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
diff --cc src/Clients/Muinshee/Muinshee.csproj
index 1836bfe,ec40308..cf4e192
--- a/src/Clients/Muinshee/Muinshee.csproj
+++ b/src/Clients/Muinshee/Muinshee.csproj
@@@ -62,13 -59,14 +59,14 @@@
<Reference Include="System" />
<Reference Include="gdk-sharp">
<SpecificVersion>False</SpecificVersion>
- <Package>gtk-sharp-2.0</Package>
</Reference>
- <Reference Include="NDesk.DBus">
+ <Reference Include="dbus-sharp">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\bin\NDesk.DBus.dll</HintPath>
++ <HintPath>..\..\..\bin\dbus-sharp.dll</HintPath>
</Reference>
- <Reference Include="NDesk.DBus.GLib">
+ <Reference Include="dbus-sharp-glib">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\bin\NDesk.DBus.GLib.dll</HintPath>
++ <HintPath>..\..\..\bin\dbus-sharp-glib.dll</HintPath>
</Reference>
<Reference Include="Mono.Posix">
<SpecificVersion>False</SpecificVersion>
diff --cc src/Core/Banshee.CollectionIndexer/Banshee.CollectionIndexer.csproj
index 021daec,4190d2e..ab15118
--- a/src/Core/Banshee.CollectionIndexer/Banshee.CollectionIndexer.csproj
+++ b/src/Core/Banshee.CollectionIndexer/Banshee.CollectionIndexer.csproj
@@@ -34,8 -34,9 +34,9 @@@
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
- <Reference Include="NDesk.DBus">
+ <Reference Include="dbus-sharp">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..bin\NDesk.DBus.dll</HintPath>
++ <HintPath>..\..\..bin\dbus-sharp.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
diff --cc src/Core/Banshee.Core/Banshee.Core.csproj
index 12b86b9,a1e978c..3742806
--- a/src/Core/Banshee.Core/Banshee.Core.csproj
+++ b/src/Core/Banshee.Core/Banshee.Core.csproj
@@@ -95,6 -62,18 +62,18 @@@
<Name>Hyena</Name>
<Private>False</Private>
</ProjectReference>
+ <Reference Include="Mono.Addins, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\bin\Mono.Addins.dll</HintPath>
+ </Reference>
- <Reference Include="NDesk.DBus, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f6716e4f9b2ed099">
++ <Reference Include="dbus-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f6716e4f9b2ed099">
+ <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\bin\NDesk.DBus.dll</HintPath>
++ <HintPath>..\..\..\bin\dbus-sharp.dll</HintPath>
+ </Reference>
+ <Reference Include="taglib-sharp, Version=2.0.3.7, Culture=neutral, PublicKeyToken=db62eba44689b5b0">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\bin\taglib-sharp.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<Reference Include="Mono.Posix">
diff --cc src/Core/Banshee.Services/Banshee.Services.csproj
index 551f4d6,3facee8..207bc32
--- a/src/Core/Banshee.Services/Banshee.Services.csproj
+++ b/src/Core/Banshee.Services/Banshee.Services.csproj
@@@ -41,15 -41,15 +41,15 @@@
<Reference Include="System.Core" />
<Reference Include="glib-sharp">
<SpecificVersion>False</SpecificVersion>
- <Package>glib-sharp-2.0</Package>
</Reference>
<Reference Include="System.Xml" />
- <Reference Include="NDesk.DBus">
+ <Reference Include="dbus-sharp">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\bin\NDesk.DBus.dll</HintPath>
++ <HintPath>..\..\..\bin\dbus-sharp.dll</HintPath>
</Reference>
- <Reference Include="NDesk.DBus.GLib">
+ <Reference Include="dbus-sharp-glib">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\bin\NDesk.DBus.GLib.dll</HintPath>
++ <HintPath>..\..\..\bin\dbus-sharp-glib.dll</HintPath>
</Reference>
<Reference Include="taglib-sharp">
<SpecificVersion>False</SpecificVersion>
diff --cc src/Core/Banshee.Services/Banshee.Sources/ITrackModelSource.cs
index 19aa3bf,4bdb627..3f2a1f2
--- a/src/Core/Banshee.Services/Banshee.Sources/ITrackModelSource.cs
+++ b/src/Core/Banshee.Services/Banshee.Sources/ITrackModelSource.cs
@@@ -29,9 -29,10 +29,10 @@@
using System;
using System.Collections.Generic;
-using NDesk.DBus;
+using DBus;
using Banshee.Collection;
+ using Hyena.Collections;
namespace Banshee.Sources
{
diff --cc src/Core/Banshee.ThickClient/Banshee.ThickClient.csproj
index 49df7a8,60e8371..c9dcf4e
--- a/src/Core/Banshee.ThickClient/Banshee.ThickClient.csproj
+++ b/src/Core/Banshee.ThickClient/Banshee.ThickClient.csproj
@@@ -107,13 -99,14 +99,14 @@@
<Reference Include="Mono.Addins.Setup">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\bin\Mono.Addins.Setup.dll</HintPath>
- <Package>mono-addins-setup</Package>
</Reference>
- <Reference Include="NDesk.DBus">
+ <Reference Include="dbus-sharp">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\bin\NDesk.DBus.dll</HintPath>
++ <HintPath>..\..\..\bin\dbus-sharp.dll</HintPath>
</Reference>
- <Reference Include="NDesk.DBus.GLib">
+ <Reference Include="dbus-sharp-glib">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\bin\NDesk.DBus.GLib.dll</HintPath>
++ <HintPath>..\..\..\bin\dbus-sharp-glib.dll</HintPath>
</Reference>
<Reference Include="taglib-sharp">
<SpecificVersion>False</SpecificVersion>
diff --cc src/Extensions/Banshee.Mpris/Banshee.Mpris.csproj
index 7f44471,d3e3454..632bca6
--- a/src/Extensions/Banshee.Mpris/Banshee.Mpris.csproj
+++ b/src/Extensions/Banshee.Mpris/Banshee.Mpris.csproj
@@@ -37,12 -38,11 +38,11 @@@
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
- <Reference Include="dbus-sharp">
- <SpecificVersion>False</SpecificVersion>
- <Reference Include="NDesk.DBus, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f6716e4f9b2ed099">
++ <Reference Include="dbus-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f6716e4f9b2ed099">
</Reference>
- <Reference Include="dbus-sharp-glib">
- <SpecificVersion>False</SpecificVersion>
- <Reference Include="NDesk.DBus.GLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f6716e4f9b2ed099">
++ <Reference Include="dbus-sharp-glib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f6716e4f9b2ed099">
</Reference>
+ <Reference Include="System.Core" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Core\Banshee.Core\Banshee.Core.csproj">
@@@ -83,4 -83,4 +83,4 @@@
<LogicalName>Banshee.Mpris.addin.xml</LogicalName>
</EmbeddedResource>
</ItemGroup>
--</Project>
++</Project>
diff --cc src/Extensions/Banshee.Mpris/Banshee.Mpris/IPlaylists.cs
index 7eab0a6,99bb68a..1c95ad7
--- a/src/Extensions/Banshee.Mpris/Banshee.Mpris/IPlaylists.cs
+++ b/src/Extensions/Banshee.Mpris/Banshee.Mpris/IPlaylists.cs
@@@ -24,35 -24,37 +24,37 @@@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
- #if ENABLE_GIO_HARDWARE
using System;
-using NDesk.DBus;
++using DBus;
- using Banshee.Hardware;
- using System.Collections.Generic;
-
- namespace Banshee.Hardware.Gio
+ namespace Banshee.Mpris
{
- class DiskDevice : BlockDevice, IDiskDevice
+ public delegate void PlaylistChangedHandler (Playlist playlist);
+
+ public struct Playlist
+ {
+ public ObjectPath Id;
+ public string Name;
+ public string Icon;
+ }
+
+ public struct MaybePlaylist
{
- // This tells us the actual type of the block device
- // i.e. 'disk' == HD. 'cd' == dvd/cd drive
- const string DeviceType = "ID_TYPE";
-
- public static new IDiskDevice Resolve (IDevice device)
- {
- var raw = device as IRawDevice;
- if (raw != null) {
- if (raw.Device.UdevMetadata.GetPropertyString ("ID_TYPE") == "disk") {
- return new DiskDevice (raw.Device);
- }
- }
- return null;
- }
-
- DiskDevice (RawDevice device)
- : base (device)
- {
- }
+ public bool Valid;
+ public Playlist Playlist;
+ }
+
+ [Interface ("org.mpris.MediaPlayer2.Playlists")]
+ public interface IPlaylists
+ {
+ event PlaylistChangedHandler PlaylistChanged;
+
+ uint PlaylistCount { get; }
+ string [] Orderings { get; }
+ MaybePlaylist ActivePlaylist { get; }
+
+ void ActivatePlaylist (ObjectPath playlist_id);
+ Playlist [] GetPlaylists (uint index, uint max_count, string order, bool reverse_order);
}
}
- #endif
+
diff --cc src/Extensions/Banshee.Mpris/Banshee.Mpris/MediaPlayer.cs
index bdc56b7,af28a85..49148c6
--- a/src/Extensions/Banshee.Mpris/Banshee.Mpris/MediaPlayer.cs
+++ b/src/Extensions/Banshee.Mpris/Banshee.Mpris/MediaPlayer.cs
@@@ -30,8 -30,10 +30,10 @@@
using System;
using System.Collections.Generic;
+ using System.Linq;
+ using System.Text;
-using NDesk.DBus;
+using DBus;
using Hyena;
using Banshee.Gui;
diff --cc src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys.csproj
index 75a1022,07c6bfa..d5375e9
--- a/src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys.csproj
+++ b/src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys.csproj
@@@ -41,8 -41,9 +41,9 @@@
<Project>{B28354F0-BA87-44E8-989F-B864A3C7C09F}</Project>
<Name>Banshee.Services</Name>
</ProjectReference>
- <Reference Include="NDesk.DBus">
+ <Reference Include="dbus-sharp">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\bin\NDesk.DBus.dll</HintPath>
++ <HintPath>..\..\..\bin\dbus-sharp.dll</HintPath>
</Reference>
<Reference Include="Mono.Posix">
<SpecificVersion>False</SpecificVersion>
diff --cc src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.csproj
index b1111af,0ad7874..727ef0e
--- a/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.csproj
+++ b/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.csproj
@@@ -58,11 -57,13 +57,13 @@@
<Reference Include="Mono.Cairo">
<SpecificVersion>False</SpecificVersion>
</Reference>
- <Reference Include="NDesk.DBus">
+ <Reference Include="dbus-sharp">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\bin\NDesk.DBus.dll</HintPath>
++ <HintPath>..\..\..\bin\dbus-sharp.dll</HintPath>
</Reference>
- <Reference Include="NDesk.DBus.GLib">
+ <Reference Include="dbus-sharp-glib">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\bin\NDesk.DBus.GLib.dll</HintPath>
++ <HintPath>..\..\..\bin\dbus-sharp-glib.dll</HintPath>
</Reference>
<ProjectReference Include="..\..\Hyena\Hyena.Gui\Hyena.Gui.csproj">
<Project>{C856EFD8-E812-4E61-8B76-E3583D94C233}</Project>
diff --cc src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue.csproj
index 7bd2a2f,770dfa2..6d18e99
--- a/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue.csproj
+++ b/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue.csproj
@@@ -64,11 -61,13 +61,13 @@@
<Project>{A3701765-E571-413D-808C-9788A22791AF}</Project>
<Name>Banshee.Widgets</Name>
</ProjectReference>
- <Reference Include="NDesk.DBus">
+ <Reference Include="dbus-sharp">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\bin\NDesk.DBus.dll</HintPath>
++ <HintPath>..\..\..\bin\dbus-sharp.dll</HintPath>
</Reference>
- <Reference Include="NDesk.DBus.GLib">
+ <Reference Include="dbus-sharp-glib">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\bin\NDesk.DBus.GLib.dll</HintPath>
++ <HintPath>..\..\..\bin\dbus-sharp.dll</HintPath>
</Reference>
<Reference Include="Mono.Posix">
<SpecificVersion>False</SpecificVersion>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
