← Back to branch summary

~kelemeng/banshee/bug743928

« back to all changes in this revision

Viewing changes to debian/patches/91_u1ms-initialize-earlier.patch

  • Committer: Bazaar Package Importer
  • Author(s): Chow Loong Jin
  • Date: 2011-05-14 22:25:36 UTC
  • mfrom: (6.3.15 experimental)
  • Revision ID: james.westby@ubuntu.com-20110514222536-u1x7ikxdqkmfvyuz
Tags: 2.1.0-1ubuntu1
* [2396c18] Merge from Debian Unstable, remaining changes:
  + Enable SoundMenu and Disable NotificationArea by default
  + Disable boo and karma extensions
  + Enable and recommnd u1ms and soundmenu extensions
  + Move desktop file for Meego UI to /usr/share/une/applications
  + Change the url for the Amazon store redirector
  + Create the U1MS widget earlier and bump libu1 requirement
* [9d7c600] Drop upstreamed u1ms-initialize-earlier patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/91_u1ms-initialize-earlier.patch
1
 
=== modified file 'banshee/build/m4/banshee/ubuntuonemusicstore.m4'
2
 
--- banshee/build/m4/banshee/ubuntuonemusicstore.m4     2011-03-29 08:16:04 +0000
3
 
+++ banshee/build/m4/banshee/ubuntuonemusicstore.m4     2011-04-07 20:59:22 +0000
4
 
@@ -8,7 +8,7 @@ AC_DEFUN([BANSHEE_CHECK_UBUNTUONE],
5
 
        if test "x$enable_ubuntuone" = "xyes"; then
6
 
                has_ubuntuonesharp=no
7
 
                PKG_CHECK_MODULES(UBUNTUONESHARP,
8
 
-                       [ubuntuone-sharp-1.0 >= 0.3.2],
9
 
+                       [ubuntuone-sharp-1.0 >= 0.9.2],
10
 
                        has_ubuntuonesharp=yes, has_ubuntuonesharp=no)
11
 
                if test "x$has_ubuntuonesharp" = "xno"; then
12
 
                        AC_MSG_ERROR([ubuntuone-sharp was not found. Please install ubuntuone-sharp, or disable Ubuntu One support by passing --disable-ubuntuone])
13
 
 
14
 
=== modified file 'banshee/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs'
15
 
--- banshee/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs 2011-04-06 20:19:13 +0000
16
 
+++ banshee/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs 2011-04-07 20:58:44 +0000
17
 
@@ -55,6 +55,10 @@ namespace Banshee.UbuntuOneMusicStore
18
 
         {
19
 
             Properties.SetString ("Icon.Name", "ubuntuone");
20
 
 
21
 
+            if (custom_view == null) {
22
 
+                Properties.Set<ISourceContents> ("Nereid.SourceContents", custom_view = new CustomView ());
23
 
+            }
24
 
+
25
 
             // So we can handle u1ms:// URIs
26
 
             ServiceManager.Get<DBusCommandService> ().ArgumentPushed += OnCommandLineArgument;
27
 
         }
28
 
@@ -84,17 +88,6 @@ namespace Banshee.UbuntuOneMusicStore
29
 
             get { return 0; }
30
 
         }
31
 
 
32
 
-        // Defer any UI creation until it's actually needed.
33
 
-        public override void Activate ()
34
 
-        {
35
 
-            if (custom_view == null) {
36
 
-                Properties.Set<ISourceContents> ("Nereid.SourceContents", custom_view = new CustomView ());
37
 
-            }
38
 
-
39
 
-            base.Activate ();
40
 
-            Log.Debug ("U1MS: Initialized");
41
 
-        }
42
 
-
43
 
         public class StoreWrapper: UbuntuOne.U1MusicStore, IDisableKeybindings
44
 
         {
45
 
             string U1LibraryLocation = System.IO.Path.Combine (System.IO.Path.Combine (System.Environment.GetFolderPath (System.Environment.SpecialFolder.Personal), ".ubuntuone"), "Purchased from Ubuntu One");
46