[Pkg-sugar-commit] [sugar-toolkit] 04/21: Do not pop the error trap twice (pointed out by Sascha Silbe in #1123).

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to annotated tag debian/0.84.17-1
in repository sugar-toolkit.

commit 5f40f312fd0b94f61a3164cc50bdb1b1627e795d
Author: Benjamin Berg <benjamin at sipsolutions.net>
Date:   Fri Aug 28 18:48:13 2009 +0200

    Do not pop the error trap twice (pointed out by Sascha Silbe in #1123).
---
 src/sugar/wm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sugar/wm.py b/src/sugar/wm.py
index 971f3d2..5481d40 100644
--- a/src/sugar/wm.py
+++ b/src/sugar/wm.py
@@ -29,7 +29,7 @@ def _property_get_trapped(window, prop, prop_type):
 
     # We just log a message
     error = gtk.gdk.error_trap_pop()
-    if gtk.gdk.error_trap_pop():
+    if error:
         logging.debug('Received X Error (%i) while getting '
                       'a property on a window' % error)
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sugar/sugar-toolkit.git