[Pkg-cli-apps-commits] [SCM] banshee branch, ppa/karmic, updated. ppa/2.0.0-1ubuntu1_hyper1+karmic-31-g8f68252

[Chow Loong Jin]

The following commit has been merged in the ppa/karmic branch:
commit 32bc264c0936ce23cfe69fc54de6d9e1b33df4e2
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Tue Apr 12 22:04:33 2011 +0800

    Shift commit block all the way up in 11 patch
    
    Karmic's quilt doesn't like having stuff in the middle of a patch it seems

diff --git a/debian/patches/11_reduce_cpu_usage.patch b/debian/patches/11_reduce_cpu_usage.patch
index eaa39fa..29acaf9 100644
--- a/debian/patches/11_reduce_cpu_usage.patch
+++ b/debian/patches/11_reduce_cpu_usage.patch
@@ -6,6 +6,16 @@ Date:   Fri Apr 8 11:42:36 2011 -0500
     
     Ignore attempts to set the label to its current value.
 
+commit fb9cb9970cb0b35f5bee0d543e6622b4e2dcbcad
+Author: Christopher James Halse Rogers <chrishr at src.gnome.org>
+Date:   Fri Apr 8 16:34:37 2011 +1000
+
+    StreamPositionLabel: Drop unnecessary redraws (bgo#647144)
+    
+    UpdateLabel calls QueueResize, which causes an expose event anyway.
+    
+    Signed-off-by: Gabriel Burt <gabriel.burt at gmail.com>
+
 diff --git a/src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs b/src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs
 index fdb1293..a31a21c 100644
 --- a/src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs
@@ -26,17 +36,6 @@ index fdb1293..a31a21c 100644
              layout.SetMarkup (String.Format (format_string, GLib.Markup.EscapeText (text)));
              QueueResize ();
          }
-
-commit fb9cb9970cb0b35f5bee0d543e6622b4e2dcbcad
-Author: Christopher James Halse Rogers <chrishr at src.gnome.org>
-Date:   Fri Apr 8 16:34:37 2011 +1000
-
-    StreamPositionLabel: Drop unnecessary redraws (bgo#647144)
-    
-    UpdateLabel calls QueueResize, which causes an expose event anyway.
-    
-    Signed-off-by: Gabriel Burt <gabriel.burt at gmail.com>
-
 @@ -202,7 +202,6 @@ namespace Banshee.Widgets
              set {
                  buffering_progress = Math.Max (0.0, Math.Min (1.0, value));

-- 
banshee