x2goserver.git - release/4.0.1.x (branch) updated: 3.1.1.4-3-gf8015d5 - x2go-commits

6 Jun 2013

The branch, release/4.0.1.x has been updated
       via  f8015d5c95b5d376bdf02b2fc7096c21ed368ce0 (commit)
      from  8da7d3082b406641fa2d4f363b51300b1c639bfa (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           |    4 ++++
 x2goserver/bin/x2gogetapps |   15 +++++++++++++++
 2 files changed, 19 insertions(+)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index a8465cc..a97f819 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ x2goserver (3.1.1.5-0~x2go1) UNRELEASED; urgency=low
     - Add a very basic SIGCHLD handler to x2gocleansessions. on SIGCHLD
       let the script wait for cleaning up after its children.
 
+  [ Mike Gabriel ]
+  * New upstream version (3.1.1.5):
+    - Fix x2gogetapps when rendering multi-section .desktop files.
+
  -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Tue, 25 Sep 2012 15:03:32 +0200
 
 x2goserver (3.1.1.4-0~x2go1) unstable; urgency=low
diff --git a/x2goserver/bin/x2gogetapps b/x2goserver/bin/x2gogetapps
index 9460cd3..e19b04f 100755
--- a/x2goserver/bin/x2gogetapps
+++ b/x2goserver/bin/x2gogetapps
@@ -117,9 +117,24 @@ sub proc_desktop_file
 	if (open(F,"<$file"))
 	{
 		print("<desktop>\n");
+		my $is_desktop_entry = 0;
 		while(!eof(F))
 		{
 			my $line=<F>;
+			if ( $line=~m/^\[Desktop Entry\] */ )
+			{
+				$is_desktop_entry = 1;
+				next;
+			}
+			if ( ! $is_desktop_entry )
+			{
+				next;
+			}
+			if ( $line=~m/^\[.*\] */ )
+			{
+				$is_desktop_entry = 0;
+				next;
+			}
 			if( $line=~m/^Categories/i || $line=~m/^Name/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).

    