sugar-toolkit: add fix for sl#1861

2 files changed, 61 insertions, 3 deletions

diff --git a/rpms/sugar-toolkit/sl1861-remove-unneeded-debug-logs.patch b/rpms/sugar-toolkit/sl1861-remove-unneeded-debug-logs.patch
new file mode 100644
index 0000000..fcefa6f
--- /dev/null
+++ b/rpms/sugar-toolkit/sl1861-remove-unneeded-debug-logs.patch
@@ -0,0 +1,58 @@
+From abda2edc04da5e97bbe508d4894c83c73e96c816 Mon Sep 17 00:00:00 2001
+From: Simon Schampijer <simon@schampijer.de>
+Date: Wed, 7 Jul 2010 11:08:59 +0200
+Subject: [PATCH] Remove unneeded debug logs #1861
+Organization: Sugar Labs Foundation
+X-Subversion: sucks
+
+---
+ src/sugar/graphics/palette.py       |    3 ---
+ src/sugar/graphics/palettewindow.py |    4 ----
+ 2 files changed, 0 insertions(+), 7 deletions(-)
+
+diff --git a/src/sugar/graphics/palette.py b/src/sugar/graphics/palette.py
+index 6ce92f6..d4632eb 100644
+--- a/src/sugar/graphics/palette.py
++++ b/src/sugar/graphics/palette.py
+@@ -164,7 +164,6 @@ class Palette(PaletteWindow):
+         self.menu.set_active(True)
+ 
+     def __hide_cb(self, widget):
+-        logging.debug('__hide_cb')
+         self.menu.set_active(False)
+         self.menu.cancel()
+         self._secondary_anim.stop()
+@@ -183,8 +182,6 @@ class Palette(PaletteWindow):
+         return self._full_request
+ 
+     def popup(self, immediate=False, state=None):
+-        logging.debug('Palette.popup immediate %r', immediate)
+-
+         if self._invoker is not None:
+             self._update_full_request()
+ 
+diff --git a/src/sugar/graphics/palettewindow.py b/src/sugar/graphics/palettewindow.py
+index 3049f55..22131c2 100644
+--- a/src/sugar/graphics/palettewindow.py
++++ b/src/sugar/graphics/palettewindow.py
+@@ -326,8 +326,6 @@ class PaletteWindow(gtk.Window):
+             self.update_position()
+ 
+     def popdown(self, immediate=False):
+-        logging.debug('PaletteWindow.popdown immediate %r', immediate)
+-
+         self._popup_anim.stop()
+         self._mouse_detector.stop()
+ 
+@@ -379,8 +377,6 @@ class PaletteWindow(gtk.Window):
+         self.emit('popup')
+ 
+     def __hide_cb(self, widget):
+-        logging.debug('__hide_cb')
+-
+         if self._invoker:
+             self._invoker.notify_popdown()
+ 
+-- 
+1.7.1.1
+
diff --git a/rpms/sugar-toolkit/sugar-toolkit.spec b/rpms/sugar-toolkit/sugar-toolkit.spec
index bcd2a2d..cfa4b59 100644
--- a/rpms/sugar-toolkit/sugar-toolkit.spec
+++ b/rpms/sugar-toolkit/sugar-toolkit.spec
@@ -3,22 +3,22 @@
 Summary: Sugar toolkit
 Name: sugar-toolkit
 Version: 0.88.1
-Release: 4.3bernie%{?dist}
+Release: 4.4dxo%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
 Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
 Source1: macros.sugar
 
-# Bug fixes
-
 #bernie: sugar-settings-manager breaks Browse
 #Patch0: sugar-toolkit-dont-configure-fonts.patch
 
+# Bug fixes
 Patch1: fix-two-trivial-shell-log-warnings.patch
 Patch2: sl1876.patch
 Patch3: sl1948-Race-condition-with-name-widget-in-the-activ.patch
 Patch4: sl1842-notify-red-alert.patch
 Patch5: use-set_toolbar_box-in-example-code.patch
 Patch6: set-default-accelerators-for-Copy-and-Paste-buttons.patch
+Patch7: sl1861-remove-unneeded-debug-logs.patch
 
 # Experimental patches
 Patch101: remove-incomplete-MANIFEST-support.patch