[banshee] Create the U1MS widget earlier
- From: Rodney Dawes <dobey src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee] Create the U1MS widget earlier
- Date: Thu, 14 Apr 2011 19:16:19 +0000 (UTC)
commit 6cd07eae5648319bc6bd6bac36fbe576c8ab8202
Author: Rodney Dawes <dobey gnome org>
Date: Thu Apr 14 15:12:42 2011 -0400
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.
build/m4/banshee/ubuntuonemusicstore.m4 | 2 +-
.../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 95bc0cd..50c8cb7 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 4d2da1f..e06ea9c 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");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]