[X2Go-Commits] x2goserver.git - build-main (branch) updated: 3.1.1.0-4-g5fc6add
X2Go dev team
git-admin at x2go.org
Wed Dec 4 06:18:17 CET 2013
The branch, build-main has been updated
via 5fc6add53c7495f331f9e381324c34b1ffd21d75 (commit)
from 3d7ab5ee559139653ad299bdb6779c313f3861cc (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 ++
x2goserver/bin/x2gogetapps | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 7297dcb..2f86d0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ x2goserver (3.1.1.1-0~x2go1) UNRELEASED; urgency=low
* New upstream version (3.1.1.1):
- Add/fix Python X2Go folder sharing/unsharing support from Windows.
- Handle whitespace in folder names appropriately.
+ - Allow .desktop file parameters Terminal=... and GenericName=... to pass
+ through to X2Go client-side.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Wed, 04 Apr 2012 11:44:14 +0200
diff --git a/x2goserver/bin/x2gogetapps b/x2goserver/bin/x2gogetapps
index f95a1ee..5f5a7a6 100755
--- a/x2goserver/bin/x2gogetapps
+++ b/x2goserver/bin/x2gogetapps
@@ -120,7 +120,7 @@ sub proc_desktop_file
while(!eof(F))
{
my $line=<F>;
- if( $line=~m/^Categories/i || $line=~m/^Name/i || $line=~m/^Comment/i || $line=~m/^Exec/i)
+ if( $line=~m/^Categories/i || $line=~m/^Name/i || $line=~m/^GenericName/i || $line=~m/^Terminal/i || $line=~m/^Comment/i || $line=~m/^Exec/i)
{
print $line;
}
hooks/post-receive
--
x2goserver.git (X2Go Server)
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 "x2goserver.git" (X2Go Server).
More information about the x2go-commits
mailing list