Attachment 5786 Details for Bug 14953 – add DesktopNames key support in chksession

[patch] add DesktopNames key support in chksession

chksession-add-DesktopNames-key-support.patch (text/plain), 1.09 KB, created by Luc Menut on 2015-01-05 14:43:02 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Luc Menut

Created: 2015-01-05 14:43:02 CET

Size: 1.09 KB

patch

obsolete

>diff --git a/sbin/chksession b/sbin/chksession
>index 7e0ebf4..0bbd8e9 100644
>--- a/sbin/chksession
>+++ b/sbin/chksession
>@@ -49,10 +49,11 @@ sub parse_file {         # parse a session descriptor file
>      $_ = cat ($fn);
>      ($n = $1) =~ s| ||g if /^NAME=(.*)/m;
>      $e = $1 if /^EXEC=(.*)/m;
>+     $dn = $1 if /^DESKTOPNAMES=(.*)/m;
> #     $d = $1 if /^DESC=(.*)/m;
> #     $i = $1 if /^ICON=(.*)/m;
>      $s = $1 while /SCRIPT:(.*?)$/gs; chomp $s;
>-     if (-x $e) { $script{$n} = $s; $exe{$n} = $e; push @lf, $n; ($order{$n}) = $fn =~ m/(^[0-9][0-9])/; }
>+     if (-x $e) { $script{$n} = $s; $exe{$n} = $e; $desktopnames{$n} = $dn; push @lf, $n; ($order{$n}) = $fn =~ m/(^[0-9][0-9])/; }
> #     if (-x $e) { $script{$n} = $s; $exec{$n} = $e; $desc{$n} = $d; $icon{$n} = $i; push @lf, $n; }
> }
> 
>@@ -68,6 +69,7 @@ sub gen_desktops {
> 	print FH "Name=$file\n";
> 	print FH "Comment=$file\n";
> 	print FH "TryExec=$exe{$file}\n" if $exe{$file};
>+	print FH "DesktopNames=$desktopnames{$file}\n" if $desktopnames{$file};
> 	if ($usesession) {
> 	    print FH "Exec=/usr/share/X11/xdm/Xsession $file\n";
> 	} else {

diff --git a/sbin/chksession b/sbin/chksession
index 7e0ebf4..0bbd8e9 100644
--- a/sbin/chksession
+++ b/sbin/chksession
@@ -49,10 +49,11 @@ sub parse_file {         # parse a session descriptor file
      $_ = cat ($fn);
      ($n = $1) =~ s| ||g if /^NAME=(.*)/m;
      $e = $1 if /^EXEC=(.*)/m;
+     $dn = $1 if /^DESKTOPNAMES=(.*)/m;
 #     $d = $1 if /^DESC=(.*)/m;
 #     $i = $1 if /^ICON=(.*)/m;
      $s = $1 while /SCRIPT:(.*?)$/gs; chomp $s;
-     if (-x $e) { $script{$n} = $s; $exe{$n} = $e; push @lf, $n; ($order{$n}) = $fn =~ m/(^[0-9][0-9])/; }
+     if (-x $e) { $script{$n} = $s; $exe{$n} = $e; $desktopnames{$n} = $dn; push @lf, $n; ($order{$n}) = $fn =~ m/(^[0-9][0-9])/; }
 #     if (-x $e) { $script{$n} = $s; $exec{$n} = $e; $desc{$n} = $d; $icon{$n} = $i; push @lf, $n; }
 }
 
@@ -68,6 +69,7 @@ sub gen_desktops {
 	print FH "Name=$file\n";
 	print FH "Comment=$file\n";
 	print FH "TryExec=$exe{$file}\n" if $exe{$file};
+	print FH "DesktopNames=$desktopnames{$file}\n" if $desktopnames{$file};
 	if ($usesession) {
 	    print FH "Exec=/usr/share/X11/xdm/Xsession $file\n";
 	} else {

Actions: View | Diff

Attachments on bug 14953: 5786