[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0.1.1.4-174-g88f4b2f

X2Go dev team git-admin at x2go.org
Wed Jan 8 15:30:57 CET 2014


The branch, build-baikal has been updated
       via  88f4b2fe511dacda626b218ab719056f57e8a3ba (commit)
      from  74cdf077242ce11351cc8fd238fe39d9b35bcacb (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                 |    2 ++
 x2go/backends/control/_stdout.py |    8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index c292ac9..61a1016 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -78,6 +78,8 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
     - Provide X2goSession method get_session_profile_option().
     - Fix unexpected keyword error during connect() in X2goSession instance.
     - Fix metatype detection of session profiles.
+    - Implement X2Go-Top category in .desktop files that get used in the
+      context of published applications.
   * 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 7e8506d..a56ae31 100644
--- a/x2go/backends/control/_stdout.py
+++ b/x2go/backends/control/_stdout.py
@@ -686,7 +686,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
                         'System': [],
                         'Utilities': [],
                         'Other Applications': [],
-                        'NO_SUBMENUS': [],
+                        'TOP': [],
                     }
                 }
                 _empty_menus = _category_map[lang].keys()
@@ -715,7 +715,9 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
                         elif re.match('^Exec=.*', line):
                             _menu_entry_exec = line.split("=")[1].strip()
                         elif re.match('^Categories=.*', line):
-                            if 'Audio' in line or 'Video' in line:
+                            if 'X2Go-Top' in line:
+                                _menu_entry_cat = 'TOP'
+                            elif 'Audio' in line or 'Video' in line:
                                 _menu_entry_cat = 'Multimedia'
                             elif 'Development' in line:
                                 _menu_entry_cat = 'Development'
@@ -748,7 +750,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
                         _menu_entry_cat = 'Other Applications'
 
                     if not _render_submenus:
-                        _menu_entry_cat = 'NO_SUBMENUS'
+                        _menu_entry_cat = 'TOP'
 
                     if _menu_entry_cat in _empty_menus:
                         _empty_menus.remove(_menu_entry_cat)


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