[X2go-Commits] python-x2go.git - master (branch) updated: 0.1.1.4-232-g3e00713

X2Go dev team git-admin at x2go.org
Sun May 6 23:32:50 CEST 2012


The branch, master has been updated
       via  3e00713c69fe2416045671bc3912216807fe86dc (commit)
      from  203f5fe9543710232e8cfb894a25910d709afc09 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3e00713c69fe2416045671bc3912216807fe86dc
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun May 6 23:32:22 2012 +0200

    Ignore X windows with empty title while finding session window..

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    1 +
 x2go/utils.py    |    3 ++-
 2 files changed, 3 insertions(+), 1 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 400e537..457c8a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -121,6 +121,7 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
     - Not using gevent to spawn MIME box default applications.
     - Protect session cache from deletion while being processed.
     - Adapt python-x2go to launching Unity-2d on Ubuntu precise.
+    - Ignore X windows with empty title while finding session window..
   * Depend on python-xlib.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sat, 28 Sep 2012 01:44:21 +0100
diff --git a/x2go/utils.py b/x2go/utils.py
index cb8637a..f6894bb 100644
--- a/x2go/utils.py
+++ b/x2go/utils.py
@@ -488,7 +488,8 @@ def find_session_window(session_name):
         windowIDs = root.get_full_property(display.intern_atom('_NET_CLIENT_LIST'), Xlib.X.AnyPropertyType).value
         for windowID in windowIDs:
             window = display.create_resource_object('window', windowID)
-            if session_name in window.get_wm_name():
+            name = window.get_wm_name()
+            if name is not None and session_name in name:
                 success = True
                 break
 


hooks/post-receive
-- 
python-x2go.git (Python X2Go Client API)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "python-x2go.git" (Python X2Go Client API).




More information about the x2go-commits mailing list