diff options
| author | Rodney Dawes <dobey@gnome.org> | 2011-04-14 15:12:42 -0400 |
|---|---|---|
| committer | Rodney Dawes <dobey@gnome.org> | 2011-04-14 15:12:42 -0400 |
| commit | 6cd07eae5648319bc6bd6bac36fbe576c8ab8202 (patch) | |
| tree | 86b6ee34721e72984fc598c619f0ef71aa898228 | |
| parent | d37178f5fa9558f19ba4a9a545fe32a003c22a20 (diff) | |
Create the U1MS widget earlier
Require libubuntuone >= 0.9.2 for new features/functionality
Initiate the store widget earlier, so things that should happen at start, can.
| -rw-r--r-- | build/m4/banshee/ubuntuonemusicstore.m4 | 2 | ||||
| -rw-r--r-- | src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs | 15 |
2 files changed, 5 insertions, 12 deletions
diff --git a/build/m4/banshee/ubuntuonemusicstore.m4 b/build/m4/banshee/ubuntuonemusicstore.m4 index 95bc0cdc9..50c8cb774 100644 --- a/build/m4/banshee/ubuntuonemusicstore.m4 +++ b/build/m4/banshee/ubuntuonemusicstore.m4 @@ -8,7 +8,7 @@ AC_DEFUN([BANSHEE_CHECK_UBUNTUONE], if test "x$enable_ubuntuone" = "xyes"; then has_ubuntuonesharp=no PKG_CHECK_MODULES(UBUNTUONESHARP, - [ubuntuone-sharp-1.0 >= 0.3.2], + [ubuntuone-sharp-1.0 >= 0.9.2], has_ubuntuonesharp=yes, has_ubuntuonesharp=no) if test "x$has_ubuntuonesharp" = "xno"; then AC_MSG_ERROR([ubuntuone-sharp was not found. Please install ubuntuone-sharp, or disable Ubuntu One support by passing --disable-ubuntuone]) diff --git a/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs b/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs index 4d2da1fe7..e06ea9c61 100644 --- a/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs +++ b/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs @@ -55,6 +55,10 @@ namespace Banshee.UbuntuOneMusicStore { Properties.SetString ("Icon.Name", "ubuntuone"); + if (custom_view == null) { + Properties.Set<ISourceContents> ("Nereid.SourceContents", custom_view = new CustomView ()); + } + // So we can handle u1ms:// URIs ServiceManager.Get<DBusCommandService> ().ArgumentPushed += OnCommandLineArgument; } @@ -84,17 +88,6 @@ namespace Banshee.UbuntuOneMusicStore get { return 0; } } - // Defer any UI creation until it's actually needed. - public override void Activate () - { - if (custom_view == null) { - Properties.Set<ISourceContents> ("Nereid.SourceContents", custom_view = new CustomView ()); - } - - base.Activate (); - Log.Debug ("U1MS: Initialized"); - } - public class StoreWrapper: UbuntuOne.U1MusicStore, IDisableKeybindings { string U1LibraryLocation = System.IO.Path.Combine (System.IO.Path.Combine (System.Environment.GetFolderPath (System.Environment.SpecialFolder.Personal), ".ubuntuone"), "Purchased from Ubuntu One"); |