[banshee: 174/174] Merge branch 'gtk3'
- From: Andrés Aragoneses <aaragoneses src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee: 174/174] Merge branch 'gtk3'
- Date: Mon, 9 Sep 2013 12:31:09 +0000 (UTC)
commit ca240160c3fb34c103aa92c5a002ee389ab257ae
Merge: 2f088f3 3a72268
Author: Andrés G. Aragoneses <knocte gmail com>
Date: Mon Sep 9 14:29:20 2013 +0200
Merge branch 'gtk3'
Conflicts:
build/m4/banshee/gio.m4
configure.ac
src/Hyena
.gitmodules | 1 +
build/GConfSchemaExtractor.cs | 39 +-
build/GConfSchemaExtractor.csproj | 54 ++
build/GConfSchemaExtractorTests.cs | 268 ++++++++
build/GSettingsSchemaExtractor.cs | 345 +++++++++++
build/GSettingsSchemaExtractorTests.cs | 292 +++++++++
build/build.environment.mk | 8 +-
build/m4/banshee/bnpx11.m4 | 47 +-
build/m4/banshee/gio.m4 | 46 +--
build/m4/banshee/gtk-sharp.m4 | 12 +-
build/m4/banshee/libbanshee.m4 | 29 +-
build/m4/banshee/libwebkit.m4 | 2 +-
build/m4/banshee/notify-sharp.m4 | 10 +-
build/m4/banshee/soundmenu.m4 | 10 -
configure.ac | 30 +-
libbanshee/banshee-player-missing-elements.c | 2 +-
po/POTFILES.in | 1 -
.../DeviceMediaCapabilities.cs | 11 +-
.../LowLevel/GioDriveMetadetaSource.cs | 4 +-
.../LowLevel/GioVolumeMetadataSource.cs | 4 +-
.../Banshee.Hardware.Gio/LowLevel/Manager.cs | 11 +-
.../LowLevel/RawBlockDevice.cs | 4 +-
.../Banshee.Hardware.Gio/LowLevel/RawVolume.cs | 4 +-
.../Banshee.Gio/Banshee.IO.Gio/DemuxVfs.cs | 2 +-
.../Banshee.Gio/Banshee.IO.Gio/Directory.cs | 10 +-
src/Backends/Banshee.Gio/Makefile.am | 14 -
.../Banshee.GnomeBackend/GnomeService.cs | 4 +-
.../libbnpx11/bacon-resize.c | 4 +-
.../GtkWindowThumbnailToolbarManager.cs | 2 +-
src/Clients/Booter/Booter/Entry.cs | 11 +-
src/Clients/Muinshee/Muinshee/AlbumDialog.cs | 31 +-
src/Clients/Muinshee/Muinshee/BaseDialog.cs | 8 +-
src/Clients/Muinshee/Muinshee/PlayerInterface.cs | 34 +-
src/Clients/Muinshee/Muinshee/SongDialog.cs | 11 +-
src/Clients/Nereid/Nereid/PlayerInterface.cs | 34 +-
src/Clients/Nereid/Nereid/ViewContainer.cs | 2 +-
.../Banshee.Configuration/ConfigurationClient.cs | 63 +--
.../Banshee.Configuration/SchemaEntry.cs | 6 +-
src/Core/Banshee.Core/Banshee.Core.csproj | 1 +
src/Core/Banshee.Core/Banshee.IO/Provider.cs | 12 +-
.../Banshee.IO/ProviderConfiguration.cs | 45 ++
src/Core/Banshee.Core/Makefile.am | 1 +
.../Banshee.Equalizer/EqualizerManager.cs | 2 +-
.../Banshee.Library/LibrarySchema.cs | 7 -
.../Banshee.Library/LibrarySource.cs | 1 +
.../Banshee.Library/MusicLibrarySource.cs | 4 +-
.../Banshee.MediaProfiles/ProfileConfiguration.cs | 12 +-
.../Banshee.Services/Banshee.Sources/Source.cs | 4 +-
.../Banshee.Addins.Gui/AddinView.cs | 6 +-
.../Banshee.CairoGlyphs/BansheeLineLogo.cs | 4 +-
.../Banshee.Collection.Gui/AlbumListView.cs | 9 +-
.../Banshee.Collection.Gui/ArtworkManager.cs | 23 +-
.../Banshee.Collection.Gui/ArtworkRenderer.cs | 18 +-
.../Banshee.Collection.Gui/BaseTrackListView.cs | 4 +-
.../Banshee.Collection.Gui/ColumnCellAlbum.cs | 11 +-
.../ColumnCellCreativeCommons.cs | 2 +-
.../ColumnCellStatusIndicator.cs | 4 +-
.../Banshee.Collection.Gui/ColumnCellTrack.cs | 10 +-
.../Banshee.Collection.Gui/CoverArtEditor.cs | 6 +-
.../PersistentColumnController.cs | 10 +-
.../Tests/ArtworkManagerTests.cs | 102 +++
.../Banshee.ContextPane/ContextPane.cs | 8 +-
.../Banshee.Equalizer.Gui/EqualizerBandScale.cs | 5 +-
.../Banshee.Equalizer.Gui/EqualizerLevelsBox.cs | 4 +-
.../EqualizerPresetComboBox.cs | 6 +-
.../Banshee.Equalizer.Gui/EqualizerWindow.cs | 21 +-
.../Banshee.Gui.Dialogs/AboutDialog.cs | 10 +-
.../Banshee.Gui.Dialogs/BansheeDialog.cs | 11 +-
.../Banshee.Gui.Dialogs/ErrorListDialog.cs | 8 +-
.../Banshee.Gui.Dialogs/OpenLocationDialog.cs | 4 +-
.../Banshee.Gui.Dialogs/SeekDialog.cs | 5 +-
.../Banshee.Gui.TrackEditor/AlbumArtistEntry.cs | 9 +-
.../EditorEditableUndoAdapter.cs | 2 +-
.../Banshee.Gui.TrackEditor/FieldPage.cs | 5 +-
.../Banshee.Gui.TrackEditor/GenreEntry.cs | 10 +-
.../Banshee.Gui.TrackEditor/HelpPage.cs | 6 +-
.../Banshee.Gui.TrackEditor/LicenseEntry.cs | 10 +-
.../Banshee.Gui.TrackEditor/PageNavigationEntry.cs | 3 +-
.../Banshee.Gui.TrackEditor/RangeEntry.cs | 2 +-
.../Banshee.Gui.TrackEditor/StatisticsPage.cs | 10 +-
.../Banshee.Gui.TrackEditor/TextViewEntry.cs | 9 +-
.../Banshee.Gui.TrackEditor/TrackEditorDialog.cs | 13 +-
.../Banshee.Gui.Widgets/ArtworkPopup.cs | 12 +-
.../Banshee.Gui.Widgets/ClassicTrackInfoDisplay.cs | 28 +-
.../Banshee.Gui.Widgets/ConnectedSeekSlider.cs | 4 +-
.../Banshee.Gui.Widgets/CoverArtDisplay.cs | 6 +-
.../Banshee.Gui.Widgets/LargeTrackInfoDisplay.cs | 52 +-
.../Banshee.Gui.Widgets/TitledList.cs | 6 +-
.../Banshee.Gui.Widgets/TrackInfoDisplay.cs | 56 +-
.../Banshee.Gui.Widgets/UserJobTile.cs | 8 +-
.../Banshee.Gui/BaseClientWindow.cs | 15 +-
.../Banshee.Gui/GtkBaseClient.cs | 32 +-
.../Banshee.Gui/GtkElementsService.cs | 16 +-
.../Banshee.Gui/PersistentPaneController.cs | 8 +-
.../Banshee.Gui/PersistentWindowController.cs | 70 +--
.../Banshee.Gui/SourceActions.cs | 6 +-
.../Banshee.ThickClient/Banshee.Gui/ViewActions.cs | 2 +-
.../Banshee.Gui/WindowConfiguration.cs | 104 ++++
.../Banshee.Library.Gui/ImportDialog.cs | 4 +-
.../ProfileConfigurationDialog.cs | 7 +-
.../Banshee.Preferences.Gui/NotebookPage.cs | 2 +-
.../Banshee.Preferences.Gui/SectionBox.cs | 10 +-
.../PlaybackErrorQueryValueEntry.cs | 4 +-
.../Banshee.Query.Gui/PlaylistQueryValueEntry.cs | 4 +-
.../SmartPlaylistQueryValueEntry.cs | 4 +-
.../Banshee.Sources.Gui/CellEditEntry.cs | 2 +-
.../CompositeTrackSourceContents.cs | 19 +-
.../FilteredListSourceContents.cs | 32 +-
.../Banshee.Sources.Gui/SourceModel.cs | 10 +-
.../Banshee.Sources.Gui/SourceRowRenderer.cs | 108 ++--
.../Banshee.Sources.Gui/SourceSwitcherEntry.cs | 2 +-
.../Banshee.Sources.Gui/SourceView.cs | 33 +-
.../Banshee.Sources.Gui/SourceView_DragAndDrop.cs | 10 +-
.../Banshee.ThickClient/Banshee.ThickClient.csproj | 3 +
src/Core/Banshee.ThickClient/Makefile.am | 2 +
.../Banshee.WebSource/WebBrowserShell.cs | 7 +-
src/Core/Banshee.Widgets/Banshee.Widgets.csproj | 1 -
.../Banshee.Widgets/CustomActionProxy.cs | 5 +-
.../Banshee.Widgets/Banshee.Widgets/DateButton.cs | 328 +++++-----
.../Banshee.Widgets/DiscUsageDisplay.cs | 53 +-
.../Banshee.Widgets/HoverImageButton.cs | 256 --------
.../Banshee.Widgets/LinearProgress.cs | 33 +-
.../Banshee.Widgets/Banshee.Widgets/LinkLabel.cs | 65 ++-
.../Banshee.Widgets/Banshee.Widgets/MessagePane.cs | 4 +-
.../Banshee.Widgets/Banshee.Widgets/SearchEntry.cs | 424 ++++---------
.../Banshee.Widgets/Banshee.Widgets/SeekSlider.cs | 1 -
.../Banshee.Widgets/StreamPositionLabel.cs | 80 ++-
src/Core/Banshee.Widgets/Banshee.Widgets/Tile.cs | 9 +-
.../Banshee.Widgets/Banshee.Widgets/TileView.cs | 4 +-
src/Core/Banshee.Widgets/Makefile.am | 1 -
.../Banshee.Dap.AppleDevice/AppleDeviceSource.cs | 2 +-
.../Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs | 2 +-
src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapContent.cs | 14 +-
src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs | 6 +-
.../Banshee.Dap.Gui/DapPropertiesDialog.cs | 4 +-
.../Banshee.Dap.Gui/DapPropertiesDisplay.cs | 16 +-
.../StoreWebBrowserShell.cs | 1 +
.../Banshee.Audiobook/BookView.cs | 14 +-
src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs | 12 +-
.../Banshee.Daap/Banshee.Daap/DaapLoginDialog.cs | 6 +-
.../Banshee.Daap/Banshee.Daap/OpenRemoteServer.cs | 4 +-
.../Banshee.InternetArchive/DetailsView.cs | 24 +-
.../Banshee.InternetArchive/HeaderFilters.cs | 7 +-
.../Banshee.InternetArchive/HomeView.cs | 4 +-
.../InternetRadioSourceContents.cs | 13 +-
.../Banshee.InternetRadio/StationEditor.cs | 9 +-
.../AudioscrobblerService.cs | 12 +-
.../RecommendationPane.cs | 11 +-
.../Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs | 14 +-
.../Banshee.Lastfm/LastfmSourceContents.cs | 12 +-
.../LastfmStreamingActions.cs | 18 +-
.../Banshee.LastfmStreaming/StationEditor.cs | 10 +-
.../Banshee.MiniMode/MiniModeWindow.cs | 29 +-
.../GtkNotificationAreaBox.cs | 226 +++++++-
.../NotificationAreaService.cs | 128 +++--
.../Banshee.NotificationArea/TrackInfoPopup.cs | 21 +-
.../X11NotificationArea.cs | 647 --------------------
.../X11NotificationAreaBox.cs | 411 -------------
.../Banshee.NotificationArea/Makefile.am | 6 -
.../Notifications/Notification.cs | 2 +-
.../Banshee.NowPlaying/FullscreenWindow.cs | 42 +-
.../Banshee.NowPlaying/NowPlayingContents.cs | 26 +-
.../Banshee.NowPlaying/NowPlayingInterface.cs | 14 +-
.../Banshee.NowPlaying/OverlayWindow.cs | 53 +-
.../Banshee.NowPlaying/VideoDisplay.cs | 14 +-
.../Banshee.NowPlaying/XOverlayVideoDisplay.cs | 18 +-
.../Banshee.PlayQueue/PlayQueueActions.cs | 10 +-
.../Banshee.PlayQueue/PlayQueueSource.cs | 2 +-
.../ItunesPlayerImportDialogs.cs | 14 +-
.../Banshee.Podcasting.Gui/ColumnCellPodcast.cs | 11 +-
.../ColumnCellPodcastStatusIndicator.cs | 2 +-
.../Banshee.Podcasting.Gui/PodcastActions.cs | 12 +-
.../Dialog/PodcastFeedPropertiesDialog.cs | 10 +-
.../Dialog/PodcastPropertiesDialog.cs | 5 +-
.../Dialog/PodcastSubscribeDialog.cs | 6 +-
.../PodcastSourceContents.cs | 12 +-
.../Banshee.SoundMenu/SoundMenuProxy.cs | 13 -
src/Extensions/Banshee.SoundMenu/Makefile.am | 6 +-
.../Banshee.YouTube.Gui/VideoStreamTile.cs | 8 +-
.../Banshee.YouTube/Banshee.YouTube/YouTubePane.cs | 6 +-
src/Hyena | 2 +-
.../Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs | 9 +-
182 files changed, 2930 insertions(+), 2931 deletions(-)
---
diff --cc build/m4/banshee/gio.m4
index c8b724d,cb9e3e6..5327c10
--- a/build/m4/banshee/gio.m4
+++ b/build/m4/banshee/gio.m4
@@@ -1,64 -1,17 +1,31 @@@
AC_DEFUN([BANSHEE_CHECK_GIO_SHARP],
[
- GNOMESHARP_REQUIRED=2.8
- GIOSHARP_REQUIRED=2.22.3
-
- GUDEVSHARP_REQUIRED=0.1
- GKEYFILESHARP_REQUIRED=0.1
++ GIOSHARP_REQUIRED=2.99
++ GUDEVSHARP_REQUIRED=0.2
+
AC_ARG_ENABLE(gio, AC_HELP_STRING([--disable-gio], [Disable GIO for IO operations]),
,enable_gio="yes")
AC_ARG_ENABLE(gio_hardware, AC_HELP_STRING([--disable-gio-hardware], [Disable GIO Hardware backend]),
,enable_gio_hardware="yes")
if test "x$enable_gio" = "xyes"; then
+
- has_gtk_beans=no
- PKG_CHECK_MODULES(GTKSHARP_BEANS,
- gtk-sharp-beans-2.0 >= $GNOMESHARP_REQUIRED,
- has_gtk_beans=yes, has_gtk_beans=no)
-
- if test "x$has_gtk_beans" = "xno"; then
- AC_MSG_ERROR([gtk-sharp-beans-2.0 was not found or is not up to date. Please install
gtk-sharp-beans-2.0 of at least version $GNOMESHARP_REQUIRED, or disable GIO support by passing
--disable-gio])
- fi
-
+ has_gio_sharp=no
PKG_CHECK_MODULES(GIOSHARP,
- gio-sharp-2.0 >= $GIOSHARP_REQUIRED,
- gio-sharp-3.0 >= 2.99,
- enable_gio="$enable_gio", enable_gio=no)
++ gio-sharp-3.0 >= $GIOSHARP_REQUIRED,
+ has_gio_sharp=yes, has_gio_sharp=no)
+ if test "x$has_gio_sharp" = "xno"; then
- AC_MSG_ERROR([gio-sharp-2.0 was not found or is not up to date. Please install
gio-sharp-2.0 of at least version $GIOSHARP_REQUIRED, or disable GIO support by passing --disable-gio])
++ AC_MSG_ERROR([gio-sharp-3.0 was not found or is not up to date. Please install
gio-sharp-3.0 of at least version $GIOSHARP_REQUIRED, or disable GIO support by passing --disable-gio])
+ fi
- asms="`$PKG_CONFIG --variable=Libraries gio-sharp-2.0` `$PKG_CONFIG --variable=Libraries
gtk-sharp-beans-2.0`"
- for asm in $asms; do
- FILENAME=`basename $asm`
- if [[ "`echo $SEENBEFORE | grep $FILENAME`" = "" ]]; then
- GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm"
- [[ -r "$asm.config" ]] && GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES
$asm.config"
- [[ -r "$asm.mdb" ]] && GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm.mdb"
- SEENBEFORE="$SEENBEFORE $FILENAME"
- fi
- done
- AC_SUBST(GIOSHARP_ASSEMBLIES)
-
if test "x$enable_gio_hardware" = "xyes"; then
+
+ has_gudev_sharp=no
PKG_CHECK_MODULES(GUDEV_SHARP,
- gudev-sharp-1.0 >= $GUDEVSHARP_REQUIRED,
- gudev-sharp-3.0 >= 0.2,
- enable_gio_hardware="$enable_gio", enable_gio_hardware=no)
++ gudev-sharp-3.0 >= $GUDEVSHARP_REQUIRED,
+ has_gudev_sharp=yes, has_gudev_sharp=no)
+
+ if test "x$has_gudev_sharp" = "xno"; then
- AC_MSG_ERROR([gudev-sharp-1.0 was not found or is not up to date. Please
install gudev-sharp-1.0 of at least version $GUDEVSHARP_REQUIRED, or disable GIO Hardware support by passing
--disable-gio-hardware])
- fi
-
- has_gkeyfile_sharp=no
- PKG_CHECK_MODULES(GKEYFILE_SHARP,
- gkeyfile-sharp >= $GKEYFILESHARP_REQUIRED,
- has_gkeyfile_sharp=yes, has_gkeyfile_sharp=no)
-
- if test "x$has_gkeyfile_sharp" = "xno"; then
- AC_MSG_ERROR([gkeyfile-sharp was not found or is not up to date. Please
install gkeyfile-sharp of at least version $GKEYFILESHARP_REQUIRED, or disable GIO Hardware support by
passing --disable-gio-hardware])
++ AC_MSG_ERROR([gudev-sharp-3.0 was not found or is not up to date. Please
install gudev-sharp-3.0 of at least version $GUDEVSHARP_REQUIRED, or disable GIO Hardware support by passing
--disable-gio-hardware])
+ fi
if test "x$enable_gio_hardware" = "xno"; then
GUDEV_SHARP_LIBS=''
diff --cc configure.ac
index 4f5a9da,2751b13..1270323
--- a/configure.ac
+++ b/configure.ac
@@@ -1,7 -1,7 +1,7 @@@
dnl Granularly define the version components
dnl Remember to also update the Display Version
m4_define([banshee_version_major], [2])
- m4_define([banshee_version_minor], [7])
-m4_define([banshee_version_minor], [6])
++m4_define([banshee_version_minor], [9])
m4_define([banshee_version_micro], [0])
dnl this can sometimes differ manually
@@@ -66,17 -64,17 +66,17 @@@ dnl User hel
SHAMROCK_CHECK_GNOME_DOC_UTILS(0.17.3)
dnl Mono and gmcs
-SHAMROCK_CHECK_MONO_MODULE(2.4.3)
-SHAMROCK_FIND_MONO_2_0_COMPILER
+SHAMROCK_CHECK_MONO_MODULE(2.8.2)
+SHAMROCK_FIND_MONO_2_0_COMPILER_OR_HIGHER
SHAMROCK_FIND_MONO_RUNTIME
- SHAMROCK_CHECK_MONO_2_0_GAC_ASSEMBLIES([Mono.Cairo Mono.Posix ICSharpCode.SharpZipLib])
+ SHAMROCK_CHECK_MONO_2_0_GAC_ASSEMBLIES([
+ Mono.Posix
+ ICSharpCode.SharpZipLib
+ ])
- dnl Check for GNOME >= 2.28 to see if we should remove
- dnl 'Media Player' from the app Name, bgo#596242, except
- dnl in MeeGo where GNOME >= 2.28, but we want the full name
- PKG_CHECK_MODULES(GNOME_2_28, gnome-desktop-2.0 >= 2.28, HAVE_GNOME_2_28=yes, HAVE_GNOME_2_28=no)
+ dnl In MeeGo we want the full name, but not in GNOME 3 (see bgo#596242)
PKG_CHECK_MODULES(MEEGO_PANEL, meego-panel, HAVE_MEEGO_PANEL=yes, HAVE_MEEGO_PANEL=no)
- if test "x$HAVE_GNOME_2_28" = "xno" -o "x$HAVE_MEEGO_PANEL" = "xyes"; then
+ if "x$HAVE_MEEGO_PANEL" = "xyes"; then
BANSHEE_DESKTOP_NAME="_Name=Banshee Media Player"
else
BANSHEE_DESKTOP_NAME="_Name=Banshee"
@@@ -392,14 -387,14 +390,14 @@@ ${PACKAGE}-${VERSION
Extra Features:
Web Browser: ${have_libwebkit} (webkit-1.0 >= $WEBKIT_MIN_VERSION, libsoup-2.4 >=
$SOUP_MIN_VERSION)
+ GNOME Proxy ${have_libsoup_gnome} (libsoup-gnome-2.4 >= $SOUP_GNOME_MIN_VERSION)
- Boo Scripting: ${enable_boo}
DAAP: ${enable_daap}
- GIO Backend: ${enable_gio} (gio-sharp >= $GIOSHARP_REQUIRED, gtk-sharp-beans >=
$GNOMESHARP_REQUIRED)
- GIO Hardware: ${enable_gio_hardware} (gudev-sharp >= $GUDEVSHARP_REQUIRED, gkeyfile-sharp >=
$GKEYFILESHARP_REQUIRED)
- GIO Backend: ${enable_gio} (gio-sharp >= 2.99)
- GIO Hardware: ${enable_gio_hardware} (gudev-sharp)
- YouTube: ${enable_youtube} (gdata-sharp >= 1.4)
++ GIO Backend: ${enable_gio} (gio-sharp >= $GIOSHARP_REQUIRED)
++ GIO Hardware: ${enable_gio_hardware} (gudev-sharp >= $GUDEVSHARP_REQUIRED)
+ YouTube: ${enable_youtube} (gdata-sharp >= $GDATASHARP_REQUIRED_VERSION)
Sound Menu: ${enable_soundmenu}
- Ubuntu One Store: ${enable_ubuntuone} (ubuntuone-sharp >= 0.3.2)
+ Ubuntu One Store: ${enable_ubuntuone} (ubuntuone-sharp >= $UBUNTUONESHARP_REQUIRED)
UPnP: ${enable_upnp} (mono-upnp >= $MONOUPNP_REQUIRED)
+ Boo Scripting: ${enable_boo} (boo >= $BOO_REQUIRED)
Build/Development:
Unit Tests: ${do_tests} (nunit >= ${NUNIT_REQUIRED})
diff --cc src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs
index 6285e48,f8e90b4..4d99aec
--- a/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs
@@@ -101,10 -101,10 +101,10 @@@ namespace Banshee.Gui.TrackEdito
public void UpdateWrapWidth ()
{
- if (view.IsRealized) {
+ if (view.IsRealized && model != null) {
var width = GetValueWidth ();
- model.Foreach ((TreeModel m, TreePath path, TreeIter iter) => {
+ model.Foreach ((ITreeModel m, TreePath path, TreeIter iter) => {
if ((Pango.EllipsizeMode) model.GetValue (iter, 3) != Pango.EllipsizeMode.End) {
model.SetValue (iter, 5, width);
}
diff --cc src/Core/Banshee.ThickClient/Banshee.Gui/GtkBaseClient.cs
index c3891c1,60817e7..e056768
--- a/src/Core/Banshee.ThickClient/Banshee.Gui/GtkBaseClient.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui/GtkBaseClient.cs
@@@ -111,21 -103,24 +107,31 @@@ namespace Banshee.Gu
if (!GLib.Thread.Supported) {
GLib.Thread.Init ();
}
+
+#if HAVE_DBUS_GLIB
+ // Using GConf from multiple threads causes crashes if multithreading is not initialized
explictly in dbus
+ // This is a workaround for bgo#692374
+ dbus_g_thread_init ();
+#endif
+
Gtk.Application.Init ();
- if (ApplicationContext.CommandLine.Contains ("debug-gtkrc")) {
- Log.Information ("Note: gtkrc files will be checked for reload every 5 seconds!");
+ // This could go into GtkBaseClient, but it's probably something we
+ // should really only support at each client level
+ if (File.Exists (user_css) && !ApplicationContext.CommandLine.Contains ("no-gtkcss")) {
+ custom_provider = new Gtk.CssProvider ();
+ custom_provider.LoadFromPath (user_css);
+ Gtk.StyleContext.AddProviderForScreen (Gdk.Screen.Default,
(Gtk.IStyleProvider)custom_provider,
+ 600 /* GTK_STYLE_PROVIDER_PRIORITY_APPLICATION*/ );
+ }
+
+ if (ApplicationContext.CommandLine.Contains ("debug-gtkcss")) {
+ Log.Information ("Note: gtk.css file will be checked for reload every 5 seconds!");
GLib.Timeout.Add (5000, delegate {
- if (Gtk.Rc.ReparseAll ()) {
- Gtk.Rc.ResetStyles (Gtk.Settings.Default);
- Log.Information ("gtkrc has been reloaded");
+ if (custom_provider != null) {
+ custom_provider.LoadFromPath (user_css);
+ Gtk.StyleContext.ResetWidgets (Gdk.Screen.Default);
+ Log.Information ("gtk.css has been reloaded");
}
return true;
});
diff --cc src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs
index ce97b09,682b0d6..5ee8726
--- a/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs
+++ b/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs
@@@ -483,22 -441,8 +483,14 @@@ namespace Banshee.Lastfm.Audioscrobble
}
}
+ private void OnScrobbleJobCancelRequest (object source, EventArgs args)
+ {
+ scrobble_job.Finish ();
+ scrobble_job = null;
+ }
+
#endregion
- public static readonly SchemaEntry<string> LastUserSchema = new SchemaEntry<string> (
- "plugins.lastfm", "username", "", "Last.fm user", "Last.fm username"
- );
-
- public static readonly SchemaEntry<string> LastSessionKeySchema = new SchemaEntry<string> (
- "plugins.lastfm", "session_key", "", "Last.fm session key", "Last.fm sessions key used in
authenticated calls"
- );
-
public static readonly SchemaEntry<string> LastScrobbleUrlSchema = new SchemaEntry<string> (
"plugins.audioscrobbler", "api_url",
null,
diff --cc src/Hyena
index 11687d9,fa67b29..0cc9eb2
--- a/src/Hyena
+++ b/src/Hyena
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 11687d9788fe585f4b3ae743d3e1b6bd86729f75
-Subproject commit fa67b296a577d5ee3a555fc9396b142b85dc9e9a
++Subproject commit 0cc9eb27cee0e22608ed24e716b1a1266db23788
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
