[banshee/dbus-sharp: 209/209] Merge branch 'master' into dbus-sharp
- From: Gabriel Burt <gburt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee/dbus-sharp: 209/209] Merge branch 'master' into dbus-sharp
- Date: Fri, 29 Apr 2011 04:49:44 +0000 (UTC)
commit f46659dbf905bd4196ecda8b29ecc7c0396fe326
Merge: fbefead 1e3da78
Author: Gabriel Burt <gabriel burt gmail com>
Date: Thu Apr 28 23:25:23 2011 -0500
Merge branch 'master' into dbus-sharp
Conflicts:
build/pkg-config/banshee-core.pc.in
src/Backends/Banshee.Hal/Banshee.Hal.csproj
src/Backends/Banshee.Hal/Banshee.HalBackend/DkDisk.cs
src/Backends/Banshee.Hal/Hal/Device.cs
src/Backends/Banshee.Hal/Hal/Manager.cs
src/Backends/Banshee.Hal/Hal/Volume.cs
src/Hyena
.gitignore | 6 +-
AUTHORS | 6 +
Banshee.sln | 20 +-
MAINTAINERS | 2 +-
Makefile.am | 3 +-
NEWS | 188 +-
README | 66 +-
banshee.doap | 29 +-
build/Makefile.am | 2 -
build/TranslatorExtractor.cs | 2 +
build/build.environment.mk | 5 +-
build/build.rules.mk | 12 +-
build/m4/banshee/dap-ipod.m4 | 30 -
build/m4/banshee/gstreamer.m4 | 15 +-
build/m4/banshee/gtk-sharp.m4 | 35 +-
build/m4/banshee/hal.m4 | 6 -
build/m4/banshee/nautilus-burn.m4 | 35 -
build/m4/banshee/ubuntuonemusicstore.m4 | 2 +-
build/pkg-config/Makefile.am | 4 +-
...exer.pc.in => banshee-collection-indexer.pc.in} | 2 +-
.../{banshee-1-core.pc.in => banshee-core.pc.in} | 4 +-
...qlite.pc.in => banshee-hyena-data-sqlite.pc.in} | 4 +-
...e-1-hyena-gui.pc.in => banshee-hyena-gui.pc.in} | 4 +-
.../{banshee-1-hyena.pc.in => banshee-hyena.pc.in} | 2 +-
...1-lastfm-gui.pc.in => banshee-lastfm-gui.pc.in} | 4 +-
...banshee-1-lastfm.pc.in => banshee-lastfm.pc.in} | 4 +-
...1-mono-media.pc.in => banshee-mono-media.pc.in} | 2 +-
...musicbrainz.pc.in => banshee-musicbrainz.pc.in} | 2 +-
...1-nowplaying.pc.in => banshee-nowplaying.pc.in} | 2 +-
...hee-1-services.pc.in => banshee-services.pc.in} | 4 +-
...thickclient.pc.in => banshee-thickclient.pc.in} | 4 +-
...1-webbrowser.pc.in => banshee-webbrowser.pc.in} | 4 +-
build/windows/Installer.wixproj | 2 +-
build/windows/InstallerDefinition.wxs | 25 +-
build/windows/build-installer.js | 23 +-
configure.ac | 149 +-
data/addin-xml-strings.cs | 10 +-
data/audio-profiles/mp3-lame.xml.in | 2 +-
data/desktop-files/banshee-1-audiocd.desktop.in.in | 3 -
.../banshee-1-media-player.desktop.in.in | 3 -
data/desktop-files/banshee-1.desktop.in.in | 1 -
data/desktop-files/banshee-audiocd.desktop.in.in | 3 +
.../banshee-media-player.desktop.in.in | 3 +
data/desktop-files/banshee.desktop.in.in | 1 +
...banshee-1.desktop.mime => banshee.desktop.mime} | 1 +
data/org.bansheeproject.Banshee.service.in | 2 +-
...org.bansheeproject.CollectionIndexer.service.in | 2 +-
extras/YeOldeChangeLog | 9 +-
extras/banshee-gather-debug | 6 +-
extras/create-release-notes | 6 +-
extras/make-release | 6 +-
extras/push-meego | 4 +-
gstreamer/COPYING | 504 -
gstreamer/Makefile.am | 7 -
gstreamer/equalizer/Makefile.am | 17 -
gstreamer/equalizer/gstiirequalizer.c | 738 -
gstreamer/equalizer/gstiirequalizer.h | 77 -
gstreamer/equalizer/gstiirequalizer10bands.c | 230 -
gstreamer/equalizer/gstiirequalizer10bands.h | 51 -
gstreamer/equalizer/remove-n-and-3-bands.diff | 28 -
gstreamer/gst-package.mk | 5 -
help/C/add-radio.page | 6 +-
help/C/keyboardshortcuts.page | 6 +-
help/C/lastfm.page | 2 +-
help/C/manage-playlists.page | 4 +-
help/C/manage-tags.page | 2 +-
help/C/play-queue.page | 2 +-
help/C/play.page | 2 +-
help/C/search.page | 12 +-
help/C/sync.page | 4 +-
help/Makefile.am | 2 +-
help/ca/ca.po | 80 +-
help/de/de.po | 300 +-
help/el/el.po | 1660 ++-
help/es/es.po | 691 +-
help/fr/fr.po | 130 +-
help/hu/hu.po | 2094 +++
help/ja/ja.po | 2086 +++
help/sl/sl.po | 85 +-
libbanshee/banshee-player-pipeline.c | 47 +-
libbanshee/banshee-player-private.h | 6 +-
libbanshee/banshee-player-vis.c | 5 +-
libbanshee/banshee-player.c | 34 +-
po/LINGUAS | 2 +
po/POTFILES.in | 6 +-
po/ca.po | 24 +-
po/cs.po | 258 +-
po/da.po | 1834 ++--
po/de.po | 363 +-
po/el.po | 2326 ++--
po/en_GB.po | 3382 +++--
po/eo.po | 2996 +++--
po/es.po | 318 +-
po/fr.po | 593 +-
po/gl.po | 695 +-
po/hu.po | 599 +-
po/it.po | 2069 ++--
po/ja.po | 3780 ++----
po/ko.po | 6687 +++++++---
po/lt.po | 2003 ++--
po/lv.po | 1437 +--
po/nl.po | 3873 +++---
po/pt.po | 2402 ++--
po/ro.po | 7155 ++++++++++
po/ru.po | 1663 ++--
po/sl.po |14342 ++++++++++----------
po/sv.po | 896 +-
po/te.po | 6980 ++++++++++
po/uk.po | 10 +-
po/zh_CN.po | 188 +-
po/zh_HK.po | 75 +-
po/zh_TW.po | 75 +-
.../Banshee.GStreamer/Banshee.GStreamer.csproj | 1 -
.../Banshee.GStreamer/PlayerEngine.cs | 21 +-
.../Banshee.GStreamerSharp.csproj | 2 +-
.../Banshee.Gio/Banshee.Hardware.Gio/UsbDevice.cs | 56 +-
.../GnomeScreensaverManager.cs | 22 +-
src/Backends/Banshee.Hal/Banshee.Hal.addin.xml | 19 -
src/Backends/Banshee.Hal/Banshee.Hal.csproj | 101 -
.../Banshee.Hal/Banshee.HalBackend/BlockDevice.cs | 91 -
.../Banshee.Hal/Banshee.HalBackend/CdromDevice.cs | 96 -
.../Banshee.Hal/Banshee.HalBackend/Device.cs | 205 -
.../Banshee.HalBackend/DeviceMediaCapabilities.cs | 182 -
.../Banshee.Hal/Banshee.HalBackend/DiscVolume.cs | 72 -
.../Banshee.Hal/Banshee.HalBackend/DiskDevice.cs | 52 -
.../Banshee.Hal/Banshee.HalBackend/DkDisk.cs | 178 -
.../Banshee.HalBackend/HardwareManager.cs | 147 -
.../Banshee.Hal/Banshee.HalBackend/UsbDevice.cs | 75 -
.../Banshee.Hal/Banshee.HalBackend/Volume.cs | 249 -
src/Backends/Banshee.Hal/Hal/Device.cs | 398 -
src/Backends/Banshee.Hal/Hal/Manager.cs | 210 -
src/Backends/Banshee.Hal/Hal/Volume.cs | 81 -
src/Backends/Banshee.Hal/Makefile.am | 29 -
src/Backends/Banshee.Unix/Banshee.IO.Unix/File.cs | 2 +-
.../Banshee.Windows/Banshee.Windows.csproj | 7 +-
.../Banshee.Windows/VersionUpdater.cs | 198 +
.../Banshee.Windows/WindowsService.cs | 28 +
src/Backends/Makefile.am | 1 -
src/Clients/Beroe/Beroe/IndexerClient.cs | 4 +-
src/Clients/Booter/Booter/Entry.cs | 4 +-
src/Clients/Booter/Makefile.am | 10 +-
.../{banshee-1.darwin.in => banshee.darwin.in} | 4 +-
.../{banshee-1.linux.in => banshee.linux.in} | 9 +-
src/Clients/Nereid/Nereid/PlayerInterface.cs | 17 +-
src/Core/Banshee.Core/Banshee.Core.csproj | 1 -
src/Core/Banshee.Core/Resources/contributors.xml | 6 +
src/Core/Banshee.Core/Resources/translators.xml | 19 +-
.../DatabaseTrackInfo.cs | 4 +
.../DatabaseTrackListModel.cs | 8 +
.../Banshee.Services/Banshee.Database/Tests.cs | 2 +-
.../Banshee.Services/Banshee.Hardware/IDevice.cs | 11 -
.../Banshee.MediaEngine/PlayerEngineService.cs | 4 +-
.../Banshee.Services/Banshee.MediaEngine/Tests.cs | 62 +-
.../Banshee.Metadata.Rhapsody/RhapsodyQueryJob.cs | 7 +-
.../Banshee.Metadata/MetadataService.cs | 6 +
.../Banshee.Metrics/BansheeMetrics.cs | 6 +-
.../Banshee.Networking/NetworkManager.cs | 21 +-
.../Banshee.Playlists.Formats/M3uPlaylistFormat.cs | 2 +-
.../Banshee.ServiceStack/Application.cs | 17 +-
.../Banshee.Sources/DatabaseSource.cs | 46 +
.../Banshee.Sources/PrimarySource.cs | 2 +
.../Banshee.Streaming/RadioTrackInfo.cs | 1 +
.../Banshee.Services/Banshee.Web/BaseHttpServer.cs | 2 +-
.../Banshee.Collection.Gui/AlbumListView.cs | 2 +-
.../Banshee.Collection.Gui/ArtworkManager.cs | 18 +
.../ColumnCellStatusIndicator.cs | 2 -
.../Banshee.Collection.Gui/DataViewChildAlbum.cs | 4 +-
.../Banshee.Gui/GlobalActions.cs | 2 +
.../Banshee.Gui/GtkBaseClient.cs | 4 +-
.../Banshee.Gui/InterfaceActionService.cs | 2 +
.../Banshee.Gui/TrackActions.cs | 13 -
src/Core/Banshee.ThickClient/Makefile.am | 4 -
.../Resources/core-ui-actions-layout.xml | 1 +
.../libossifer/ossifer-web-view.c | 2 +-
.../Banshee.Widgets/HoverImageButton.cs | 2 +-
.../Banshee.Widgets/Banshee.Widgets/SearchEntry.cs | 2 +-
.../Banshee.Widgets/StreamPositionLabel.cs | 9 +-
.../Banshee.Widgets/VolumeButton.cs | 6 +-
.../Banshee.Dap.AppleDevice/AppleDeviceSource.cs | 16 +-
.../AppleDeviceTrackInfo.cs | 15 +-
.../devices/multimedia-player-ipod-U2-color.png | Bin 493 -> 493 bytes
.../multimedia-player-ipod-U2-monochrome.png | Bin 471 -> 471 bytes
.../devices/multimedia-player-ipod-mini-blue.png | Bin 440 -> 440 bytes
.../devices/multimedia-player-ipod-mini-gold.png | Bin 435 -> 435 bytes
.../devices/multimedia-player-ipod-mini-green.png | Bin 432 -> 432 bytes
.../devices/multimedia-player-ipod-mini-pink.png | Bin 446 -> 446 bytes
.../devices/multimedia-player-ipod-mini-silver.png | Bin 392 -> 392 bytes
.../devices/multimedia-player-ipod-nano-black.png | Bin 370 -> 370 bytes
.../devices/multimedia-player-ipod-nano-white.png | Bin 327 -> 327 bytes
.../devices/multimedia-player-ipod-shuffle.png | Bin 292 -> 292 bytes
.../multimedia-player-ipod-standard-color.png | Bin 460 -> 460 bytes
.../multimedia-player-ipod-standard-monochrome.png | Bin 443 -> 443 bytes
.../devices/multimedia-player-ipod-video-black.png | Bin 490 -> 490 bytes
.../devices/multimedia-player-ipod-video-white.png | Bin 446 -> 446 bytes
.../devices/multimedia-player-ipod-U2-color.png | Bin 737 -> 737 bytes
.../multimedia-player-ipod-U2-monochrome.png | Bin 679 -> 679 bytes
.../devices/multimedia-player-ipod-mini-blue.png | Bin 702 -> 702 bytes
.../devices/multimedia-player-ipod-mini-gold.png | Bin 702 -> 702 bytes
.../devices/multimedia-player-ipod-mini-green.png | Bin 700 -> 700 bytes
.../devices/multimedia-player-ipod-mini-pink.png | Bin 686 -> 686 bytes
.../devices/multimedia-player-ipod-mini-silver.png | Bin 655 -> 655 bytes
.../devices/multimedia-player-ipod-nano-black.png | Bin 562 -> 562 bytes
.../devices/multimedia-player-ipod-nano-white.png | Bin 582 -> 582 bytes
.../devices/multimedia-player-ipod-shuffle.png | Bin 521 -> 521 bytes
.../multimedia-player-ipod-standard-color.png | Bin 720 -> 720 bytes
.../multimedia-player-ipod-standard-monochrome.png | Bin 614 -> 614 bytes
.../devices/multimedia-player-ipod-video-black.png | Bin 701 -> 701 bytes
.../devices/multimedia-player-ipod-video-white.png | Bin 643 -> 643 bytes
.../devices/multimedia-player-ipod-U2-color.svg | 0
.../multimedia-player-ipod-U2-monochrome.svg | 0
.../devices/multimedia-player-ipod-mini-blue.svg | 0
.../devices/multimedia-player-ipod-mini-gold.svg | 0
.../devices/multimedia-player-ipod-mini-green.svg | 0
.../devices/multimedia-player-ipod-mini-pink.svg | 0
.../devices/multimedia-player-ipod-mini-silver.svg | 0
.../devices/multimedia-player-ipod-nano-black.svg | 0
.../devices/multimedia-player-ipod-nano-white.svg | 0
.../devices/multimedia-player-ipod-shuffle.svg | 0
.../multimedia-player-ipod-standard-color.svg | 0
.../multimedia-player-ipod-standard-monochrome.svg | 0
.../devices/multimedia-player-ipod-video-black.svg | 0
.../devices/multimedia-player-ipod-video-white.svg | 0
.../Banshee.Dap.Ipod/Banshee.Dap.Ipod.addin.xml | 27 -
.../Banshee.Dap.Ipod/DatabaseRebuilder.cs | 244 -
.../Banshee.Dap.Ipod/IpodSource.cs | 758 --
.../Banshee.Dap.Ipod/IpodTrackInfo.cs | 316 -
.../Banshee.Dap.Ipod/PodSleuthDevice.cs | 386 -
.../Banshee.Dap.Ipod/PodSleuthDeviceProvider.cs | 81 -
.../Banshee.Dap.Ipod/UnsupportedDatabaseView.cs | 174 -
src/Dap/Banshee.Dap.Ipod/Makefile.am | 36 -
.../Banshee.Dap.MassStorage.addin.xml | 15 +
.../Banshee.Dap.MassStorage/MassStorageSource.cs | 2 +-
.../Banshee.Dap.MassStorage/WebOSDevice.cs | 14 +-
.../Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs | 4 +-
src/Dap/Makefile.am | 1 -
.../StoreSourcePreferences.cs | 9 +
.../Banshee.AmazonMp3.Store/StoreView.cs | 14 +-
.../Banshee.AmazonMp3.Store/server/redirect.c | 22 +-
.../Banshee.Audiobook/AudiobookLibrarySource.cs | 1 +
.../Banshee.CoverArt/CoverArtJob.cs | 2 +-
.../Banshee.CoverArt/CoverArtService.cs | 1 +
.../Banshee.Daap/DaapProxyWebServer.cs | 4 +-
.../Banshee.Daap/Banshee.Daap/OpenRemoteServer.cs | 2 +-
.../Banshee.Emusic.Store.addin.xml | 20 +
.../Banshee.Emusic.Store.csproj} | 129 +-
.../Banshee.Emusic.Store/StoreSource.cs | 56 +
.../Banshee.Emusic.Store/StoreView.cs | 141 +
.../Banshee.Emusic.Store/StoreWebBrowserShell.cs | 63 +
src/Extensions/Banshee.Emusic.Store/Makefile.am | 17 +
.../Banshee.Emusic/Banshee.Emusic.addin.xml | 2 +-
src/Extensions/Banshee.Emusic/Makefile.am | 5 +
src/Extensions/Banshee.Emusic/banshee-emx.xml | 9 +
.../Banshee.Lastfm/LastfmSourceContents.cs | 13 +-
.../Banshee.LibraryWatcher/SourceWatcher.cs | 13 +
src/Extensions/Banshee.LibraryWatcher/Makefile.am | 4 -
.../Banshee.MeeGo/MediaPanelContents.cs | 10 +-
src/Extensions/Banshee.MeeGo/Makefile.am | 2 +-
src/Extensions/Banshee.MeeGo/meego-panel-banshee | 2 +-
.../Banshee.MiroGuide/Banshee.MiroGuide/View.cs | 53 +-
.../Banshee.Mpris/Banshee.Mpris/MediaPlayer.cs | 5 +-
.../Banshee.NotificationArea.csproj | 2 +-
.../GtkNotificationAreaBox.cs | 5 -
.../NotificationAreaService.cs | 14 +-
src/Extensions/Banshee.Podcasting/Makefile.am | 5 -
.../Banshee.SoundMenu/SoundMenuProxy.cs | 3 +-
.../UbuntuOneMusicStoreSource.cs | 15 +-
.../Banshee.Wikipedia/ContextPage.cs | 13 +-
.../Banshee.Wikipedia/WikipediaView.cs | 21 +-
src/Extensions/Makefile.am | 1 +
src/Hyena | 2 +-
.../Lastfm/Lastfm/AudioscrobblerConnection.cs | 49 +-
src/Libraries/Lastfm/Lastfm/LastfmRequest.cs | 3 +
.../Mono.Media/Media.Playlists.Xspf/Playlist.cs | 11 +-
273 files changed, 49904 insertions(+), 32518 deletions(-)
---
diff --cc build/build.environment.mk
index 92e0d6e,daf8717..0ba40dc
--- a/build/build.environment.mk
+++ b/build/build.environment.mk
@@@ -19,10 -19,9 +19,9 @@@ LINK_GCONF = $(GCONFSHARP_LIBS
LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
LINK_GUDEV = $(GUDEV_SHARP_LIBS)
-LINK_DBUS = $(NDESK_DBUS_LIBS) $(NDESK_DBUS_GLIB_LIBS)
-LINK_DBUS_NO_GLIB = $(NDESK_DBUS_LIBS)
+LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
+LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
LINK_TAGLIB = $(TAGLIB_SHARP_LIBS)
- LINK_IPOD = $(IPODSHARP_LIBS)
LINK_BOO = $(BOO_LIBS)
LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
diff --cc build/pkg-config/banshee-core.pc.in
index 8b4b006,38f3d2e..9d4c3b9
--- a/build/pkg-config/banshee-core.pc.in
+++ b/build/pkg-config/banshee-core.pc.in
@@@ -6,5 -6,5 +6,5 @@@ bansheedir=${libdir}/@PACKAGE
Name: Banshee Core
Description: Core APIs for the Banshee Media Framework
Version: @VERSION@
- Requires: taglib-sharp dbus-sharp-1.0 dbus-sharp-glib-1.0 glib-sharp-2.0 mono-addins banshee-1-hyena banshee-1-hyena-data-sqlite banshee-1-musicbrainz
-Requires: taglib-sharp ndesk-dbus-1.0 ndesk-dbus-glib-1.0 glib-sharp-2.0 mono-addins banshee-hyena banshee-hyena-data-sqlite banshee-musicbrainz
++Requires: taglib-sharp dbus-sharp-1.0 dbus-sharp-glib-1.0 glib-sharp-2.0 mono-addins banshee-hyena banshee-hyena-data-sqlite banshee-musicbrainz
Libs: -r:${bansheedir}/Banshee.Core.dll
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
