[banshee/podcast-ng: 111/111] Merge branch 'master' into podcast-ng

From: Michael C. Urbanski <murbanski src gnome org>
To: commits-list gnome org
Cc:
Subject: [banshee/podcast-ng: 111/111] Merge branch 'master' into podcast-ng
Date: Fri, 30 Apr 2010 02:30:17 +0000 (UTC)
commit fe5df58de1326341da2942373b499d89e70c7160
Merge: 7e6654e 5caf780
Author: Mike Urbanski <michael c urbanski gmail com>
Date:   Thu Apr 29 21:29:52 2010 -0500

    Merge branch 'master' into podcast-ng
    
    Conflicts:
    	src/Core/Banshee.ThickClient/Banshee.ThickClient.csproj

 AUTHORS                                            |    2 +
 Banshee.sln                                        |    4 +-
 NEWS                                               |  198 +-
 banshee.doap                                       |    8 +-
 build/m4/banshee/dap-ipod.m4                       |    2 +-
 build/m4/shamrock/mono.m4                          |   10 +
 configure.ac                                       |    6 +-
 extras/metrics/Database.cs                         |    1 +
 extras/metrics/Main.cs                             |   26 +-
 libbanshee/banshee-player-cdda.c                   |   16 +-
 libbanshee/banshee-player-equalizer.c              |   13 +-
 libbanshee/banshee-player-missing-elements.c       |    6 +-
 libbanshee/banshee-player-pipeline.c               |   42 +-
 libbanshee/banshee-player-private.h                |   34 +-
 libbanshee/banshee-player-replaygain.c             |   21 +-
 libbanshee/banshee-player-video.c                  |  103 +-
 libbanshee/banshee-player-video.h                  |    5 +-
 libbanshee/banshee-player.c                        |   54 +-
 libbanshee/banshee-ripper.c                        |    6 +-
 po/POTFILES.in                                     |    3 +
 po/cs.po                                           |  352 +-
 po/de.po                                           |  365 +-
 po/es.po                                           |  621 +-
 po/eu.po                                           |   60 +-
 po/lt.po                                           |  317 +-
 po/pt.po                                           |  447 +-
 po/sl.po                                           |13749 +++++++++-----------
 po/uk.po                                           | 5287 +++++----
 profile-configure                                  |    3 +
 .../Banshee.GStreamer/PlayerEngine.cs              |   54 +-
 .../Banshee.GStreamer/Banshee.GStreamer/Service.cs |    1 +
 .../Banshee.NowPlaying.X11/FullscreenAdapter.cs    |   89 +-
 src/Clients/Beroe/Beroe/IndexerClient.cs           |    2 +
 src/Clients/Booter/Booter/Entry.cs                 |    7 +-
 src/Clients/Halie/Halie/Client.cs                  |   46 +-
 src/Clients/Nereid/Nereid/PlayerInterface.cs       |    3 -
 src/Clients/Nereid/Nereid/ViewContainer.cs         |    1 +
 src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs |    4 +-
 src/Core/Banshee.Core/Banshee.Base/LegacyPaths.cs  |   46 +
 src/Core/Banshee.Core/Banshee.Base/SafeUri.cs      |    2 +-
 src/Core/Banshee.Core/Banshee.Base/UriList.cs      |  135 -
 .../Banshee.Collection/TrackFilterType.cs          |    1 +
 .../XmlConfigurationClient.cs                      |    2 +
 src/Core/Banshee.Core/Banshee.Core.csproj          |    2 -
 src/Core/Banshee.Core/Banshee.IO/Tests.cs          |   19 +-
 src/Core/Banshee.Core/Makefile.am                  |    3 +-
 src/Core/Banshee.Core/Resources/contributors.xml   |    2 +
 src/Core/Banshee.Core/Resources/translators.xml    |    4 +-
 .../DatabaseTrackInfo.cs                           |    1 +
 .../Banshee.Database/BansheeDbFormatMigrator.cs    |   24 +-
 .../Banshee.Library/Tests/FileNamePatternTests.cs  |   12 +-
 .../Banshee.MediaEngine/TranscoderService.cs       |    1 +
 .../Banshee.MediaProfiles/MediaProfileManager.cs   |    2 +-
 .../Banshee.Metadata.LastFM/LastFMQueryJob.cs      |    6 +-
 .../MusicBrainzQueryJob.cs                         |    5 +-
 .../PlaylistFormatBase.cs                          |   15 +-
 .../Banshee.Services/Banshee.Query/BansheeQuery.cs |    2 +-
 .../Banshee.ServiceStack/Application.cs            |    2 +-
 .../Banshee.Addins.Gui/AddinView.cs                |   31 +-
 .../Banshee.Collection.Gui/ArtworkManager.cs       |   15 +-
 .../Banshee.Collection.Gui/ColumnCellAlbum.cs      |   10 +-
 .../Banshee.Collection.Gui/DataViewChildAlbum.cs   |   10 +-
 .../PersistentColumnController.cs                  |   17 +-
 .../Banshee.Collection.Gui/SearchableListView.cs   |   42 +-
 .../Banshee.Gui.Dialogs/BansheeDialog.cs           |    4 +-
 .../Banshee.Gui.Widgets/NextButton.cs              |    6 +-
 .../Banshee.Gui.Widgets/UserJobTile.cs             |    5 +-
 .../Banshee.Gui/BansheeIconFactory.cs              |    2 +-
 .../Banshee.Gui/BaseClientWindow.cs                |   31 +-
 .../Banshee.Gui/GlobalActions.cs                   |   54 +-
 .../Banshee.Gui/GtkBaseClient.cs                   |    7 +-
 .../Banshee.Gui/IClientWindow.cs                   |    1 +
 .../Banshee.Gui/IGlobalUIActions.cs                |   42 +
 .../Banshee.Gui/InterfaceActionService.cs          |    4 +-
 .../Banshee.Gui/SourceActions.cs                   |    7 +
 .../Banshee.Gui/TrackActions.cs                    |    7 +-
 .../Banshee.Library.Gui/PhotoFolderImportSource.cs |    2 +
 .../Banshee.Sources.Gui/SourceSwitcherEntry.cs     |  191 +
 .../Banshee.Sources.Gui/SourceView.cs              |   12 +
 .../Banshee.ThickClient/Banshee.ThickClient.csproj |    2 +
 src/Core/Banshee.ThickClient/Makefile.am           |    2 +
 .../Resources/core-ui-actions-layout.xml           |    5 +
 .../Banshee.Widgets/Banshee.Widgets/SearchEntry.cs |    4 +
 src/Core/Banshee.Widgets/Banshee.Widgets/Tile.cs   |   43 +-
 .../Banshee.Dap.Ipod/IpodSource.cs                 |   13 +-
 .../Banshee.Dap.Ipod/UnsupportedDatabaseView.cs    |    2 +-
 .../Banshee.Dap.MassStorage.addin.xml              |    6 +-
 .../Banshee.Dap.MassStorage.csproj                 |    4 +-
 .../Banshee.Dap.MassStorage/MaemoDevice.cs         |    9 +-
 .../Banshee.Dap.MassStorage/MassStorageDevice.cs   |    9 +
 .../Banshee.Dap.MassStorage/MassStorageSource.cs   |   15 +-
 .../Banshee.Bpm/Banshee.Bpm/BpmService.cs          |    2 +-
 src/Extensions/Banshee.Daap/Banshee.Daap.csproj    |    5 +
 .../Banshee.Daap/Banshee.Daap/DaapResolverJob.cs   |   79 +
 .../Banshee.Daap/Banshee.Daap/DaapService.cs       |   75 +-
 .../Banshee.Daap/Banshee.Daap/OpenRemoteServer.cs  |   90 +
 src/Extensions/Banshee.Daap/Makefile.am            |    5 +-
 src/Extensions/Banshee.Daap/Resources/GlobalUI.xml |    9 +
 .../Banshee.InternetRadio/XspfMigrator.cs          |    2 +-
 .../Banshee.Lastfm.Audioscrobbler/Queue.cs         |    2 +-
 .../Banshee.Lastfm.Radio/LastfmSource.cs           |    2 +-
 .../RecommendationPane.cs                          |   20 +-
 .../Banshee.Lastfm/Banshee.Lastfm.csproj           |    1 +
 src/Extensions/Banshee.MeeGo/Banshee.MeeGo.csproj  |    3 +-
 .../Banshee.MeeGo/MediaPanelContents.cs            |  347 +-
 .../Banshee.MeeGo/Banshee.MeeGo/MeeGoHeaderBox.cs  |  196 +
 .../Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs      |   68 +-
 .../Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs    |    8 +-
 .../Banshee.MeeGo/MeeGoSourceContents.cs           |  200 -
 .../Banshee.MeeGo/Banshee.MeeGo/MeeGoTheme.cs      |   75 +
 .../Banshee.MeeGo/MeeGoTrackInfoDisplay.cs         |    4 +
 .../Banshee.MeeGo/Banshee.MeeGo/PlaybackBox.cs     |   22 +-
 .../Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs     |    4 +
 src/Extensions/Banshee.MeeGo/Makefile.am           |    3 +-
 .../Banshee.MeeGo/MeeGo.Panel/PanelClient.cs       |    6 -
 src/Extensions/Banshee.MeeGo/meego-panel-banshee   |    2 +-
 .../NotificationAreaService.cs                     |   31 +-
 .../Banshee.NowPlaying/FullscreenAdapter.cs        |   14 +-
 .../Banshee.NowPlaying/FullscreenWindow.cs         |    4 +-
 .../Banshee.NowPlaying/IFullscreenAdapter.cs       |    3 +-
 .../Banshee.NowPlaying/NowPlayingInterface.cs      |   33 +-
 .../Banshee.NowPlaying/OverlayWindow.cs            |    4 +-
 .../AmarokPlayerImportSource.cs                    |    1 +
 .../RhythmboxPlayerImportSource.cs                 |    8 +-
 .../Banshee.YouTube.Data/DataFetch.cs              |    3 +-
 .../Banshee.YouTube.Gui/YouTubeTile.cs             |    4 +-
 .../Banshee.YouTube/Banshee.YouTube.csproj         |   31 +-
 .../Accessibility/ListViewAccessible.cs            |    4 +-
 .../Hyena.Gui/Hyena.Data.Gui/ListView/ListView.cs  |    4 +
 .../Hyena.Data.Gui/ListView/ListViewBase.cs        |    8 +
 .../ListView/ListView_Interaction.cs               |    2 +-
 .../Hyena.Data.Gui/ListView/ListView_Model.cs      |    6 +
 src/Libraries/Hyena.Gui/Hyena.Gui.Canvas/Point.cs  |    2 +-
 src/Libraries/Hyena.Gui/Hyena.Gui.Canvas/Rect.cs   |    6 +-
 src/Libraries/Hyena.Gui/Hyena.Gui.Canvas/Size.cs   |    2 +-
 src/Libraries/Hyena.Gui/Hyena.Gui.Theming/Theme.cs |   11 +-
 .../Hyena.Gui/Hyena.Widgets/AnimatedBox.cs         |    4 +
 .../Hyena.Gui/Hyena.Widgets/AnimatedHBox.cs        |    4 +
 .../Hyena.Gui/Hyena.Widgets/AnimatedVBox.cs        |    4 +
 .../Hyena.Gui/Hyena.Widgets/ComplexMenuItem.cs     |    4 +
 .../Hyena.Gui/Hyena.Widgets/EntryPopup.cs          |   51 +-
 .../Hyena.Gui/Hyena.Widgets/RatingMenuItem.cs      |    4 +
 .../Hyena/Hyena.Collections/SelectionProxy.cs      |   22 +-
 .../Hyena/Hyena.Data.Sqlite/SqliteUtils.cs         |   13 +
 .../Hyena/Hyena.Data/ColumnDescription.cs          |    2 +
 src/Libraries/Hyena/Hyena.Data/MemoryListModel.cs  |    4 +
 .../Hyena/Hyena.Query/ExactStringQueryValue.cs     |    2 +
 .../Hyena/Hyena.Query/ExactUriStringQueryValue.cs  |    4 +-
 src/Libraries/Hyena/Hyena.csproj                   |    1 +
 .../Hyena/Hyena}/Paths.cs                          |   92 +-
 src/Libraries/Hyena/Makefile.am                    |    1 +
 151 files changed, 12978 insertions(+), 11513 deletions(-)
---
diff --cc src/Core/Banshee.ThickClient/Banshee.ThickClient.csproj
index 325d877,618346e..1183616
--- a/src/Core/Banshee.ThickClient/Banshee.ThickClient.csproj
+++ b/src/Core/Banshee.ThickClient/Banshee.ThickClient.csproj
@@@ -273,7 -274,7 +274,8 @@@
      <Compile Include="Banshee.Collection.Gui\SearchableListView.cs" />
      <Compile Include="Banshee.Gui.Widgets\CoverArtDisplay.cs" />
      <Compile Include="Banshee.CairoGlyphs\BansheeLineLogo.cs" />
 +    <Compile Include="Banshee.Sources.Gui\IImplementsCustomSearch.cs" />
+     <Compile Include="Banshee.Gui\IGlobalUIActions.cs" />
    </ItemGroup>
    <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
    <ProjectExtensions>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]