x2goserver.git - release/3.1.1.x (branch) updated: 3.1.1.4-6-g3a9f412 - x2go-commits

29 Sep 2012

The branch, release/3.1.1.x has been updated
       via  3a9f412b1710c1b20a9e9b233c92532611dda001 (commit)
       via  cb4796d026014e9e07ec9ea3e80106bc03697f2f (commit)
       via  5cc4d72358fd7f99aeec74ce346f526315f33999 (commit)
       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 -----------------------------------------------------------------
commit 3a9f412b1710c1b20a9e9b233c92532611dda001
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Sat Sep 29 20:44:10 2012 +0200

    fix changelog entry

commit cb4796d026014e9e07ec9ea3e80106bc03697f2f
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Sat Sep 29 20:41:36 2012 +0200

    add BTS closures

commit 5cc4d72358fd7f99aeec74ce346f526315f33999
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Sat Sep 29 20:40:16 2012 +0200

    Remove redundant setting of syslog level.

commit f8015d5c95b5d376bdf02b2fc7096c21ed368ce0
Author: Mike Gabriel <mike.gabriel@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           |    9 ++++++++-
 x2goserver/bin/x2gogetapps |   18 +++++++++++++++---
 2 files changed, 23 insertions(+), 4 deletions(-)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index a8465cc..3a74d77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,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@das-netzwerkteam.de>  Tue, 25 Sep 2012 15:03:32 +0200
 
diff --git a/x2goserver/bin/x2gogetapps b/x2goserver/bin/x2gogetapps
index 9460cd3..dbcd8c1 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;
@@ -155,9 +170,6 @@ sub proc_desktop_file
 	}
 }
 
-openlog($0,'cons,pid','user');
-setlogmask( LOG_UPTO(x2gologlevel()) );
-
 if ( @ARGV ) {
 	syslog('info', "x2gogetapps has been called with options: @ARGV");
 } else {


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).

    