[X2Go-Commits] python-x2go.git - brokerclient (branch) updated: 0.1.1.4-131-g73f108b

X2Go dev team git-admin at x2go.org
Tue Jan 7 16:21:01 CET 2014


The branch, brokerclient has been updated
       via  73f108b61e83c1d9ecae46fb3caa7b26b61c9dc6 (commit)
      from  0eff893ffaa6c3358e4ca2184bebe5b471d529f0 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                 |    1 +
 x2go/backends/control/_stdout.py |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 8097dc9..f563c7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,7 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
     - Update list of unsupported session options.
     - Retrieve feature list from X2Go server per session.
     - Add published applications support.
+    - Fix base64 encoded icon string.
   * Depend on python-xlib.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sat, 28 Sep 2012 01:44:21 +0100
diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py
index 6b3dd1f..f4c67d0 100644
--- a/x2go/backends/control/_stdout.py
+++ b/x2go/backends/control/_stdout.py
@@ -608,7 +608,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
                 for _raw_menu_item in _raw_menu_items:
                     if '<icon>\n' in _raw_menu_item and '</icon>' in _raw_menu_item:
                         _menu_item = _raw_menu_item.split('<icon>\n')[0] + _raw_menu_item.split('</icon>\n')[1]
-                        _icon_base64 = _raw_menu_item.split('<icon>\n')[1].split('</icon>\n')[0].replace('\n', '')
+                        _icon_base64 = _raw_menu_item.split('<icon>\n')[1].split('</icon>\n')[0]
                     else:
                         _menu_item = _raw_menu_item
                         _icon_base64 = None


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