[Pkg-wmaker-commits] [wmsystemtray] 06/34: * Fix a bug in detecting whether app has stolen the freedesktop system tray selection. * Version 1.2.

[Doug Torrance]

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

dtorrance-guest pushed a commit to branch master
in repository wmsystemtray.

commit 7d9d5c210fd94e06fafe46bdf753ce9c33d4f9cb
Author: Brad Jorsch <anomie at users.sourceforge.net>
Date:   Wed Jan 20 16:36:23 2010 +0000

    * Fix a bug in detecting whether app has stolen the freedesktop system tray selection.
    * Version 1.2.
    
    
    git-svn-id: https://svn.code.sf.net/p/wmsystemtray/code@6 8177d978-5354-4e5a-a197-9fd626d94383
---
 ChangeLog        | 7 +++++++
 debian/changelog | 6 ++++++
 fdtray.c         | 2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 5c59682..7a1e59c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+wmsystemtray (1.2) unstable; urgency=low
+
+  * Correct a bug in detecting that we lost the freedesktop system tray
+    selection ownership.
+
+ -- Brad Jorsch <anomie at users.sourceforge.net>  Wed, 20 Jan 2010 11:33:19 -0500
+
 wmsystemtray (1.1) unstable; urgency=low
 
   * Add debian directory, so I can create local debs. If a Debian developer
diff --git a/debian/changelog b/debian/changelog
index 9b830c7..866a14a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+wmsystemtray (1.2-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Brad Jorsch <anomie at users.sourceforge.net>  Wed, 20 Jan 2010 11:34:06 -0500
+
 wmsystemtray (1.1-1) unstable; urgency=low
 
   * New upstream version.
diff --git a/fdtray.c b/fdtray.c
index cf115c5..3898a29 100644
--- a/fdtray.c
+++ b/fdtray.c
@@ -98,7 +98,7 @@ static void event(XEvent *ev){
 
     switch(ev->type){
       case SelectionClear:
-        if(ev->xselectionclear.selection == net_system_tray_s && ev->xselectionclear.window != selwindow){
+        if(ev->xselectionclear.selection == net_system_tray_s && XGetSelectionOwner(display, net_system_tray_s) != selwindow){
             warn(DEBUG_ERROR, "fdtray: Another application (window %lx) has forcibly taken the system tray registration", ev->xselectionclear.window);
             exitapp = True;
         }

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