[Pkg-cli-apps-commits] [SCM] banshee branch, ubuntu/maverick, updated. debian/1.7.3-2ubuntu2-15-g2577c6a

[Chow Loong Jin]

The following commit has been merged in the ubuntu/maverick branch:
commit 2577c6af3680559fdb9a0af4310d09838a5bacab
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Fri Aug 13 10:34:53 2010 +0800

    Refresh 04_enable-switching-between-the-2-interfaces.patch
    
    The patch causes compilation errors due to API changes

diff --git a/debian/changelog b/debian/changelog
index 3691700..7106b79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,9 +18,11 @@ banshee (1.7.4-1ubuntu1) maverick; urgency=low
         interface as this is irrelevant on non-Meego interfaces
     + debian/banshee-meego.install: Install desktop file for Banshee netbook interface
   * Ubuntu-specific changes from previous merge:
-    + debian/patches/06_add-meego-desktop-file.patch: Refreshed.
+    + Refresh patches:
+      - 04_enable-switching-between-the-2-interfaces.patch
+      - 06_add-meego-desktop-file.patch
 
- -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 13 Aug 2010 00:49:27 +0800
+ -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 13 Aug 2010 00:37:19 +0800
 
 banshee (1.7.4-1) UNRELEASED; urgency=low
 
diff --git a/debian/patches/04_enable-switching-between-the-2-interfaces.patch b/debian/patches/04_enable-switching-between-the-2-interfaces.patch
index bf0f732..456a844 100644
--- a/debian/patches/04_enable-switching-between-the-2-interfaces.patch
+++ b/debian/patches/04_enable-switching-between-the-2-interfaces.patch
@@ -109,7 +109,7 @@ index 5aae94e..16abd6b 100644
 +            };
 +            Toolbar header_toolbar;
 +            InterfaceActionService action_service;
-+            action_service = ServiceManager.Get<InterfaceActionService> ("InterfaceActionService");
++            action_service = ServiceManager.Get<InterfaceActionService> ();
 +            header_toolbar = (Toolbar)action_service.UIManager.GetWidget ("/HeaderToolbar");
 +            app_button.ShowAll ();
 +            action_service.PopulateToolbarPlaceholder (header_toolbar, "/HeaderToolbar/ExtensionToolBarPlaceHolder", app_button);

-- 
banshee