From 3df21f51e247685ff7e62b8122ed20342674f871 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Fri, 7 Jan 2000 06:54:23 +0000 Subject: no_comment --- ChangeLog | 3 +++ mandrake_desk.spec | 5 ++++- sbin/chksession | 4 ++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 485e81c..81bfb03 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2000-01-07 Pixel + * sbin/chksession: look at /etc/sysconfig/desktop to sort + 2000-01-06 Pixel * icons/*: convert back and from .gif for kfm compliance :-/ diff --git a/mandrake_desk.spec b/mandrake_desk.spec index 7ca3303..fc21c9d 100644 --- a/mandrake_desk.spec +++ b/mandrake_desk.spec @@ -1,7 +1,7 @@ # DO NOT MODIFY THE VERSION HERE, modify in the CVS %define version 1.0.1 # -%define release 13mdk +%define release 14mdk %define name mandrake_desk Summary: The Desktop configuration files for Linux Mandrake. @@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT /usr/man/*/* %changelog +* Fri Jan 7 2000 Pixel +- sbin/chksession: look at /etc/sysconfig/desktop to sort + * Thu Jan 6 2000 Pixel - icons/*: convert back and from .gif for kfm compliance :-/ diff --git a/sbin/chksession b/sbin/chksession index a735c0c..d0bec64 100644 --- a/sbin/chksession +++ b/sbin/chksession @@ -85,6 +85,10 @@ $file = $test ? './window-managers' : '/etc/X11/window-managers' unless $file; die "$file don't exist\n" unless -r $file; $remove ? remove_entry($remove, $file) : parse_file ($file); +sub cat { my ($f) = @_; local *F; open F, $f; join '', } +my ($e) = cat("/etc/sysconfig/desktop") =~ /(\S+)/; +@lf = sort { $b =~ /$e/i <=> $a =~ /$e/i } @lf; + if ($kdm) { $session="SessionTypes="; for(@lf) { $session .= /$lf[-1]/ ? "$_;failsafe;default" : "$_;" } -- cgit v1.2.1