[X2go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-64-gf562fff

[X2Go dev team]

The branch, master has been updated
       via  f562fff98f9856719d7b0f432c00bf2ac5aad003 (commit)
       via  22ee79023ea86cbbd46e86b0986bf9c088941825 (commit)
      from  e010395a46a9cd11293956919d606a8841ed7fd6 (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 f562fff98f9856719d7b0f432c00bf2ac5aad003
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Sep 29 20:41:36 2012 +0200

    add BTS closures
    
    Conflicts (resolved by Mike Gabriel)
    	debian/changelog

commit 22ee79023ea86cbbd46e86b0986bf9c088941825
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Sep 29 20:39:43 2012 +0200

    Fix x2gogetapps when rendering multi-section .desktop files.

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

Summary of changes:
 debian/changelog           |   10 ++++++++--
 x2goserver/bin/x2gogetapps |   15 +++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index ddae529..c1f7589 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,7 +15,6 @@ x2goserver (3.2.0.0-0~x2go1) UNRELEASED; urgency=low
       Makefile installation.
     - Fix new SQLite3 wrapper for db_getmounts Perl call.
     - Fix list output in new SQLite3 wrapper.
-    - Remove redundant setting of loglevel in x2gogetapps.
   * /debian/control:
     + Package X2Go::Log in separate package: libx2go-log-perl.
     + Package X2Go::Server::DB in separate package: libx2go-server-db-perl.
@@ -35,7 +34,14 @@ x2goserver (3.1.1.5-0~x2go1) UNRELEASED; urgency=low
   [ Stéphane Graber ]
   * New upstream version (3.1.1.5):
     - Add a very basic SIGCHLD handler to x2gocleansessions. on SIGCHLD
-      let the script wait for cleaning up after its children.
+      let the script wait for cleaning up after its children. Closes
+      upstream issue #38.
+
+  [ Mike Gabriel ]
+  * New upstream version (3.1.1.5):
+    - Fix x2gogetapps when rendering multi-section .desktop files. Closes
+      upstream issue #43.
+    - Remove redundant setting of loglevel in x2gogetapps.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 25 Sep 2012 15:03:32 +0200
 
diff --git a/x2goserver/bin/x2gogetapps b/x2goserver/bin/x2gogetapps
index d9f9dac..40f7e70 100755
--- a/x2goserver/bin/x2gogetapps
+++ b/x2goserver/bin/x2gogetapps
@@ -119,9 +119,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).