[Pkg-cli-apps-commits] [SCM] banshee branch, master, updated. debian/2.0.0-2-7-g1c17404

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit a853ad8356d9567568246dd70532d6c4b3e8948c
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Tue May 3 21:40:44 2011 +0800

    Drop upstreamed 11_reduce_cpu_usage.patch

diff --git a/debian/patches/11_reduce_cpu_usage.patch b/debian/patches/11_reduce_cpu_usage.patch
deleted file mode 100644
index eaa39fa..0000000
--- a/debian/patches/11_reduce_cpu_usage.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-commit cdff2efe25758edc9ce33d0feb62e6e635273e8d
-Author: Gabriel Burt <gabriel.burt at gmail.com>
-Date:   Fri Apr 8 11:42:36 2011 -0500
-
-    StreamPositionLabel: Avoid unnecessary redraws (bgo#647144)
-    
-    Ignore attempts to set the label to its current value.
-
-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
-+++ b/src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs
-@@ -174,12 +174,14 @@ namespace Banshee.Widgets
-             }
-         }
- 
-+        private string last_text;
-         private void UpdateLabel (string text)
-         {
--            if (!IsRealized || layout == null) {
-+            if (!IsRealized || layout == null || text == last_text) {
-                 return;
-             }
- 
-+            last_text = text;
-             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));
-                 UpdateLabel ();
--                QueueDraw ();
-             }
-         }
- 
-@@ -228,7 +227,6 @@ namespace Banshee.Widgets
-                 if (state != value) {
-                     state = value;
-                     UpdateLabel ();
--                    QueueDraw ();
-                 }
-             }
-         }
-@@ -239,7 +237,6 @@ namespace Banshee.Widgets
-                 if (is_live != value) {
-                     is_live = value;
-                     UpdateLabel ();
--                    QueueDraw ();
-                 }
-             }
-         }

-- 
banshee