GitLab repository storage has been migrated to hashed layout. Please contact Infrastructure team if you notice any issues with repositories or hooks.

Commit 6cd07eae authored by Rodney Dawes's avatar Rodney Dawes

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.
parent d37178f5
......@@ -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])
......
......@@ -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");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment