[banshee/dbus-sharp: 88/88] Merge branch 'master' into dbus-sharp
- From: Peter James Johanson <petej src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee/dbus-sharp: 88/88] Merge branch 'master' into dbus-sharp
- Date: Mon, 28 Feb 2011 22:44:09 +0000 (UTC)
commit ac42a33d087a06053078897ac1dc1441aadd2da1
Merge: 7cabac1 ee07377
Author: Pete Johanson <peter peterjohanson com>
Date: Mon Feb 28 17:37:49 2011 -0500
Merge branch 'master' into dbus-sharp
Conflicts:
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.Core/Banshee.Core.csproj
src/Core/Banshee.Services/Banshee.Services.csproj
src/Core/Banshee.ThickClient/Banshee.ThickClient.csproj
src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys.csproj
src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.csproj
src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue.csproj
.gitignore | 2 +
AUTHORS | 3 +
Banshee.sln | 32 +-
COPYING | 4 +-
NEWS | 108 +-
banshee.doap | 16 +-
build/AddinXmlStringExtractor.cs | 7 +
build/build.rules.mk | 6 +-
build/m4/banshee/gio.m4 | 10 +-
build/m4/shamrock/nunit.m4 | 3 +-
build/windows/Bitmaps/bannrbmp.bmp | Bin 114430 -> 0 bytes
build/windows/Bitmaps/bannrbmp.jpg | Bin 0 -> 11856 bytes
build/windows/Bitmaps/dlgbmp.bmp | Bin 615318 -> 0 bytes
build/windows/Bitmaps/dlgbmp.jpg | Bin 0 -> 25786 bytes
build/windows/Installer.wixproj | 18 +-
build/windows/InstallerDefinition.wxs | 117 +-
build/windows/README.txt | 20 +-
build/windows/build-banshee.bat | 17 +
build/windows/build-installer.js | 104 +-
build/windows/bundle-deps.bat | 56 +
build/windows/checkout-banshee.bat | 20 +
build/windows/license.rtf | Bin 1254 -> 50148 bytes
build/windows/post-build.bat | 8 +
build/windows/update-scripts | 13 +-
configure.ac | 4 +-
data/addin-xml-strings.cs | 77 +-
data/desktop-files/banshee-1.desktop.mime | 1 +
extras/make-release | 17 +-
help/es/es.po | 279 +-
help/gl/gl.po | 5914 +++++++++++++++++++-
help/sl/sl.po | 22 +-
libbanshee/banshee-gst.c | 6 +
libbanshee/banshee-player.c | 14 +-
libbanshee/banshee-transcoder.c | 14 +-
po/ca.po | 550 +-
po/cs.po | 559 +-
po/de.po | 677 ++--
po/es.po | 562 +-
po/gl.po | 414 +-
po/pt_BR.po | 546 +-
po/sl.po | 538 +-
po/zh_HK.po | 2481 +++++----
po/zh_TW.po | 2488 +++++----
.../Banshee.GStreamer/Banshee.GStreamer.csproj | 2 +-
.../Banshee.GStreamer/PlayerEngine.cs | 23 +-
.../Banshee.GStreamerSharp.csproj | 14 +-
.../Banshee.GStreamerSharp/PlayerEngine.cs | 139 +-
src/Backends/Banshee.Gio/Banshee.Gio.csproj | 2 +-
.../Banshee.Gio/Banshee.Hardware.Gio/UsbDevice.cs | 2 +
src/Backends/Banshee.Gnome/Banshee.Gnome.csproj | 6 +-
src/Backends/Banshee.Hal/Banshee.Hal.csproj | 6 +-
.../Banshee.NowPlaying.X11.csproj | 2 +-
src/Backends/Banshee.Unix/Banshee.Unix.csproj | 4 +-
.../Banshee.Windows.Hardware/Device.cs | 46 +
.../Banshee.Windows.Hardware/HardwareManager.cs | 147 +
.../Banshee.Windows.Hardware/UsbDevice.cs | 53 +
.../Banshee.Windows.Hardware/Volume.cs | 94 +
.../Banshee.Windows/Banshee.Windows.addin.xml | 24 +
.../Banshee.Windows/Banshee.Windows.csproj | 127 +
.../Banshee.Windows/ExtensionsForGtkAction.cs | 73 +
.../GtkWindowThumbnailToolbarManager.cs | 75 +
.../Banshee.Windows/WindowsService.cs | 127 +
.../Windows7Support/TaskbarInterop.cs | 151 +
.../Windows7Support/ThumbnailToolbar.cs | 130 +
.../Windows7Support/ThumbnailToolbarButton.cs | 163 +
.../Windows7Support/ThumbnailToolbarManager.cs | 125 +
.../Banshee.Windows/media-playback-pause.ico | Bin 0 -> 1150 bytes
.../Banshee.Windows/media-playback-start.ico | Bin 0 -> 1150 bytes
.../Banshee.Windows/media-skip-backward.ico | Bin 0 -> 1150 bytes
.../Banshee.Windows/media-skip-forward.ico | Bin 0 -> 1150 bytes
src/Clients/Beroe/Beroe.csproj | 4 +-
src/Clients/Booter/Booter.csproj | 6 +-
src/Clients/Halie/Halie.csproj | 4 +-
src/Clients/MeeGo/MeeGo.csproj | 2 +-
src/Clients/Muinshee/Muinshee.csproj | 8 +-
src/Clients/Nereid/Nereid.csproj | 5 +-
.../Banshee.CollectionIndexer.csproj | 2 +-
src/Core/Banshee.Core/Banshee.Core.csproj | 8 +-
src/Core/Banshee.Core/Resources/contributors.xml | 3 +
.../DatabaseTrackInfo.cs | 2 +-
.../Banshee.Services/Banshee.Hardware/IDevice.cs | 2 +
.../Banshee.Library/LibrarySource.cs | 1 -
.../Banshee.MediaEngine/NullPlayerEngine.cs | 2 +-
.../Banshee.MediaEngine/PlayerEngine.cs | 11 +-
.../PlaybackControllerService.cs | 22 +
.../Banshee.ServiceStack/Application.cs | 6 +-
src/Core/Banshee.Services/Banshee.Services.csproj | 15 +-
.../Banshee.SmartPlaylist/SmartPlaylistSource.cs | 2 +
.../Banshee.Gui.Dialogs/AboutDialog.cs | 2 +-
.../Banshee.Gui.Widgets/ClassicTrackInfoDisplay.cs | 6 +-
.../Banshee.Gui.Widgets/TrackInfoDisplay.cs | 9 +-
.../Banshee.ThickClient/Banshee.ThickClient.csproj | 20 +-
.../Banshee.WebBrowser/Banshee.WebBrowser.csproj | 2 +-
src/Core/Banshee.Widgets/Banshee.Widgets.csproj | 2 +-
.../Banshee.Dap.AppleDevice.addin.xml | 2 +-
.../Banshee.Dap.AppleDevice.csproj | 4 +-
src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod.csproj | 8 +-
.../Banshee.Dap.MassStorage.csproj | 6 +-
src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp.csproj | 4 +-
src/Dap/Banshee.Dap/Banshee.Dap.csproj | 4 +-
.../Banshee.AmazonMp3.Store.addin.xml | 4 +-
.../Banshee.AmazonMp3.Store.csproj | 2 +-
.../Banshee.AmazonMp3.Store/server/redirect.c | 2 +-
.../Banshee.AmazonMp3/Banshee.AmazonMp3.addin.xml | 4 +-
.../Banshee.AmazonMp3/Banshee.AmazonMp3.csproj | 4 +-
.../Banshee.AudioCd/Banshee.AudioCd.csproj | 8 +-
.../Banshee.Audiobook/Banshee.Audiobook.csproj | 4 +-
.../Banshee.BooScript/Banshee.BooScript.csproj | 10 +-
src/Extensions/Banshee.Bpm/Banshee.Bpm.csproj | 6 +-
.../Banshee.CoverArt/Banshee.CoverArt.csproj | 4 +-
src/Extensions/Banshee.Daap/Banshee.Daap.csproj | 8 +-
.../Banshee.Emusic/Banshee.Emusic.addin.xml | 2 +-
.../Banshee.Emusic/Banshee.Emusic.csproj | 2 +-
.../Banshee.FileSystemQueue.csproj | 4 +-
.../Banshee.Fixup/Banshee.Fixup.addin.xml | 2 +-
src/Extensions/Banshee.Fixup/Banshee.Fixup.csproj | 47 +-
.../Banshee.InternetArchive.csproj | 4 +-
.../Banshee.InternetRadio.csproj | 4 +-
.../Banshee.InternetRadio/InternetRadioSource.cs | 1 -
.../Banshee.Lastfm/Banshee.Lastfm.csproj | 8 +-
.../Banshee.LastfmStreaming.csproj | 4 +-
.../Banshee.LibraryWatcher.addin.xml | 2 +-
.../Banshee.LibraryWatcher.csproj | 6 +-
src/Extensions/Banshee.MeeGo/Banshee.MeeGo.csproj | 2 +-
.../Banshee.MiniMode/Banshee.MiniMode.csproj | 4 +-
.../Banshee.MiroGuide/Banshee.MiroGuide.csproj | 2 +-
src/Extensions/Banshee.Mpris/Banshee.Mpris.csproj | 2 +-
.../Banshee.MultimediaKeys.csproj | 6 +-
.../MultimediaKeysService.cs | 19 +
.../Banshee.NotificationArea.csproj | 8 +-
.../Banshee.NowPlaying/Banshee.NowPlaying.csproj | 4 +-
.../Banshee.PlayQueue/Banshee.PlayQueue.csproj | 8 +-
.../Banshee.PlayerMigration.csproj | 2 +-
.../Banshee.Podcasting.Data/PodcastSource.cs | 1 -
.../Banshee.Podcasting/Banshee.Podcasting.csproj | 6 +-
.../Banshee.Sample/Banshee.Sample.csproj | 2 +-
.../Banshee.SoundMenu/Banshee.SoundMenu.addin.xml | 2 +-
.../Banshee.SoundMenu/SoundMenuProxy.cs | 8 +-
.../Banshee.SoundMenu/SoundMenuService.cs | 4 +-
.../Banshee.Torrent/Banshee.Torrent.csproj | 4 +-
.../Banshee.Wikipedia/Banshee.Wikipedia.csproj | 2 +-
.../Banshee.YouTube/Banshee.YouTube.addin.xml | 2 +-
.../Banshee.YouTube/Banshee.YouTube.csproj | 12 +-
src/Hyena | 2 +-
src/Libraries/Lastfm.Gui/Lastfm.Gui.csproj | 2 +-
src/Libraries/Lastfm/Lastfm.csproj | 6 +-
src/Libraries/Migo/Migo.csproj | 8 +-
src/Libraries/Mono.Media/Mono.Media.csproj | 2 +-
src/Libraries/Mtp/Mtp.csproj | 2 +-
src/Libraries/MusicBrainz/MusicBrainz.csproj | 2 +-
150 files changed, 12719 insertions(+), 4983 deletions(-)
---
diff --cc src/Backends/Banshee.Gnome/Banshee.Gnome.csproj
index f2e1bd5,494d516..a25fd52
--- a/src/Backends/Banshee.Gnome/Banshee.Gnome.csproj
+++ b/src/Backends/Banshee.Gnome/Banshee.Gnome.csproj
@@@ -80,13 -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\dbus-sharp.dll</HintPath>
- <HintPath>..\..\..\bin\bin\NDesk.DBus.dll</HintPath>
++ <HintPath>..\..\..\bin\bin\dbus-sharp.dll</HintPath>
</Reference>
- <Reference Include="NDesk.DBus.GLib">
+ <Reference Include="dbus-sharp-glib">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\bin\dbus-sharp-glib.dll</HintPath>
- <HintPath>..\..\..\bin\bin\NDesk.DBus.GLib.dll</HintPath>
++ <HintPath>..\..\..\bin\bin\dbus-sharp-glib.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
diff --cc src/Backends/Banshee.Hal/Banshee.Hal.csproj
index f000591,da0e314..181aa24
--- a/src/Backends/Banshee.Hal/Banshee.Hal.csproj
+++ b/src/Backends/Banshee.Hal/Banshee.Hal.csproj
@@@ -53,13 -53,13 +53,13 @@@
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
- <Reference Include="NDesk.DBus">
+ <Reference Include="dbus-sharp">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\bin\dbus-sharp.dll</HintPath>
- <HintPath>..\..\..\bin\bin\NDesk.DBus.dll</HintPath>
++ <HintPath>..\..\..\bin\bin\dbus-sharp.dll</HintPath>
</Reference>
- <Reference Include="NDesk.DBus.GLib">
+ <Reference Include="dbus-sharp-glib">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\bin\dbus-sharp-glib.dll</HintPath>
- <HintPath>..\..\..\bin\bin\NDesk.DBus.GLib.dll</HintPath>
++ <HintPath>..\..\..\bin\bin\dbus-sharp-glib.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
diff --cc src/Clients/Beroe/Beroe.csproj
index 597fd60,69ca6da..c505673
--- a/src/Clients/Beroe/Beroe.csproj
+++ b/src/Clients/Beroe/Beroe.csproj
@@@ -41,9 -41,9 +41,9 @@@
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="System" />
- <Reference Include="NDesk.DBus">
+ <Reference Include="dbus-sharp">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\bin\dbus-sharp.dll</HintPath>
- <HintPath>..\..\..\bin\bin\NDesk.DBus.dll</HintPath>
++ <HintPath>..\..\..\bin\bin\dbus-sharp.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
diff --cc src/Clients/Booter/Booter.csproj
index 66de21d,8c406de..6ed7e45
--- a/src/Clients/Booter/Booter.csproj
+++ b/src/Clients/Booter/Booter.csproj
@@@ -38,9 -38,9 +38,9 @@@
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
- <Reference Include="NDesk.DBus">
+ <Reference Include="dbus-sharp">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\bin\dbus-sharp.dll</HintPath>
- <HintPath>..\..\..\bin\bin\NDesk.DBus.dll</HintPath>
++ <HintPath>..\..\..\bin\bin\dbus-sharp.dll</HintPath>
</Reference>
<Reference Include="Mono.Posix">
<SpecificVersion>False</SpecificVersion>
diff --cc src/Clients/Halie/Halie.csproj
index 735a8c8,1531111..ed713e2
--- a/src/Clients/Halie/Halie.csproj
+++ b/src/Clients/Halie/Halie.csproj
@@@ -38,9 -38,9 +38,9 @@@
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
- <Reference Include="NDesk.DBus">
+ <Reference Include="dbus-sharp">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\bin\dbus-sharp.dll</HintPath>
- <HintPath>..\..\..\bin\bin\NDesk.DBus.dll</HintPath>
++ <HintPath>..\..\..\bin\bin\dbus-sharp.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
diff --cc src/Clients/Muinshee/Muinshee.csproj
index cf4e192,c7b286d..e4d17c9
--- a/src/Clients/Muinshee/Muinshee.csproj
+++ b/src/Clients/Muinshee/Muinshee.csproj
@@@ -60,13 -60,13 +60,13 @@@
<Reference Include="gdk-sharp">
<SpecificVersion>False</SpecificVersion>
</Reference>
- <Reference Include="NDesk.DBus">
+ <Reference Include="dbus-sharp">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\bin\dbus-sharp.dll</HintPath>
- <HintPath>..\..\..\bin\bin\NDesk.DBus.dll</HintPath>
++ <HintPath>..\..\..\bin\bin\dbus-sharp.dll</HintPath>
</Reference>
- <Reference Include="NDesk.DBus.GLib">
+ <Reference Include="dbus-sharp-glib">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\bin\dbus-sharp-glib.dll</HintPath>
- <HintPath>..\..\..\bin\bin\NDesk.DBus.GLib.dll</HintPath>
++ <HintPath>..\..\..\bin\bin\dbus-sharp-glib.dll</HintPath>
</Reference>
<Reference Include="Mono.Posix">
<SpecificVersion>False</SpecificVersion>
diff --cc src/Core/Banshee.Core/Banshee.Core.csproj
index 3742806,b26223e..d68ddba
--- a/src/Core/Banshee.Core/Banshee.Core.csproj
+++ b/src/Core/Banshee.Core/Banshee.Core.csproj
@@@ -64,11 -64,11 +64,11 @@@
</ProjectReference>
<Reference Include="Mono.Addins, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\bin\Mono.Addins.dll</HintPath>
+ <HintPath>..\..\..\bin\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\dbus-sharp.dll</HintPath>
- <HintPath>..\..\..\bin\bin\NDesk.DBus.dll</HintPath>
++ <HintPath>..\..\..\bin\bin\dbus-sharp.dll</HintPath>
</Reference>
<Reference Include="taglib-sharp, Version=2.0.3.7, Culture=neutral, PublicKeyToken=db62eba44689b5b0">
<SpecificVersion>False</SpecificVersion>
diff --cc src/Core/Banshee.Services/Banshee.Services.csproj
index 207bc32,b766ad7..49644a4
--- a/src/Core/Banshee.Services/Banshee.Services.csproj
+++ b/src/Core/Banshee.Services/Banshee.Services.csproj
@@@ -43,13 -44,13 +44,13 @@@
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="System.Xml" />
- <Reference Include="NDesk.DBus">
+ <Reference Include="dbus-sharp">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\bin\dbus-sharp.dll</HintPath>
- <HintPath>..\..\..\bin\bin\NDesk.DBus.dll</HintPath>
++ <HintPath>..\..\..\bin\bin\dbus-sharp.dll</HintPath>
</Reference>
- <Reference Include="NDesk.DBus.GLib">
+ <Reference Include="dbus-sharp-glib">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\bin\dbus-sharp-glib.dll</HintPath>
- <HintPath>..\..\..\bin\bin\NDesk.DBus.GLib.dll</HintPath>
++ <HintPath>..\..\..\bin\bin\dbus-sharp-glib.dll</HintPath>
</Reference>
<Reference Include="taglib-sharp">
<SpecificVersion>False</SpecificVersion>
diff --cc src/Core/Banshee.ThickClient/Banshee.ThickClient.csproj
index c9dcf4e,2977bb7..d23eb92
--- a/src/Core/Banshee.ThickClient/Banshee.ThickClient.csproj
+++ b/src/Core/Banshee.ThickClient/Banshee.ThickClient.csproj
@@@ -98,15 -98,15 +98,15 @@@
</Reference>
<Reference Include="Mono.Addins.Setup">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\bin\Mono.Addins.Setup.dll</HintPath>
+ <HintPath>..\..\..\bin\bin\Mono.Addins.Setup.dll</HintPath>
</Reference>
- <Reference Include="NDesk.DBus">
+ <Reference Include="dbus-sharp">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\bin\dbus-sharp.dll</HintPath>
- <HintPath>..\..\..\bin\bin\NDesk.DBus.dll</HintPath>
++ <HintPath>..\..\..\bin\bin\dbus-sharp.dll</HintPath>
</Reference>
- <Reference Include="NDesk.DBus.GLib">
+ <Reference Include="dbus-sharp-glib">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\bin\dbus-sharp-glib.dll</HintPath>
- <HintPath>..\..\..\bin\bin\NDesk.DBus.GLib.dll</HintPath>
++ <HintPath>..\..\..\bin\bin\dbus-sharp-glib.dll</HintPath>
</Reference>
<Reference Include="taglib-sharp">
<SpecificVersion>False</SpecificVersion>
diff --cc src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys.csproj
index d5375e9,0632508..78c387e
--- a/src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys.csproj
+++ b/src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys.csproj
@@@ -41,9 -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\dbus-sharp.dll</HintPath>
- <HintPath>..\..\..\bin\bin\NDesk.DBus.dll</HintPath>
++ <HintPath>..\..\..\bin\bin\dbus-sharp.dll</HintPath>
</Reference>
<Reference Include="Mono.Posix">
<SpecificVersion>False</SpecificVersion>
diff --cc src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.csproj
index 727ef0e,8eb1240..52f5fec
--- a/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.csproj
+++ b/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.csproj
@@@ -57,13 -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\dbus-sharp.dll</HintPath>
- <HintPath>..\..\..\bin\bin\NDesk.DBus.dll</HintPath>
++ <HintPath>..\..\..\bin\bin\dbus-sharp.dll</HintPath>
</Reference>
- <Reference Include="NDesk.DBus.GLib">
+ <Reference Include="dbus-sharp-glib">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\bin\dbus-sharp-glib.dll</HintPath>
- <HintPath>..\..\..\bin\bin\NDesk.DBus.GLib.dll</HintPath>
++ <HintPath>..\..\..\bin\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 6d18e99,df6aa80..86e07b5
--- a/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue.csproj
+++ b/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue.csproj
@@@ -61,13 -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\dbus-sharp.dll</HintPath>
- <HintPath>..\..\..\bin\bin\NDesk.DBus.dll</HintPath>
++ <HintPath>..\..\..\bin\bin\dbus-sharp.dll</HintPath>
</Reference>
- <Reference Include="NDesk.DBus.GLib">
+ <Reference Include="dbus-sharp-glib">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\bin\dbus-sharp.dll</HintPath>
- <HintPath>..\..\..\bin\bin\NDesk.DBus.GLib.dll</HintPath>
++ <HintPath>..\..\..\bin\bin\dbus-sharp.dll</HintPath>
</Reference>
<Reference Include="Mono.Posix">
<SpecificVersion>False</SpecificVersion>
diff --cc src/Extensions/Banshee.Torrent/Banshee.Torrent.csproj
index 2322197,2b7de49..d47adc3
--- a/src/Extensions/Banshee.Torrent/Banshee.Torrent.csproj
+++ b/src/Extensions/Banshee.Torrent/Banshee.Torrent.csproj
@@@ -35,10 -35,11 +35,10 @@@
<Reference Include="Banshee.Services, Version=1.3.3.0, Culture=neutral" />
<Reference Include="Migo, Version=1.4.0.1, Culture=neutral, PublicKeyToken=null">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\bin\Migo.dll</HintPath>
+ <HintPath>..\..\..\bin\bin\Migo.dll</HintPath>
</Reference>
- <Reference Include="NDesk.DBus">
+ <Reference Include="dbus-sharp">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..bin\NDesk.DBus.dll</HintPath>
</Reference>
<Reference Include="Hyena, Version=1.3.3.0, Culture=neutral" />
<Reference Include="monotorrent-dbus">
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
