[arch-commits] Commit in slim/trunk (PKGBUILD session-name.patch)

[Gaetan Bisson]

    Date: Sunday, October 30, 2011 @ 18:38:22
  Author: bisson
Revision: 141485

fix FS#26693

Added:
  slim/trunk/session-name.patch
Modified:
  slim/trunk/PKGBUILD

--------------------+
 PKGBUILD           |    5 ++++-
 session-name.patch |   21 +++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-10-30 21:20:31 UTC (rev 141484)
+++ PKGBUILD	2011-10-30 22:38:22 UTC (rev 141485)
@@ -18,10 +18,11 @@
         'pam.d'
         'logrotate'
         'gcc44.patch'
-	'ptr_pam.patch'
+        'ptr_pam.patch'
         'no-host.patch'
         'restart.patch'
         'sigterm.patch'
+        'session-name.patch'
         'tty-slowness.patch')
 sha1sums=('e421d5487732c8317f8f591906661e014b036358'
           '6fe0ba83509af634bce47be34e30995965bffc79'
@@ -32,6 +33,7 @@
           'b86eddd083fb9f6259e46c735f55ebe76c655bd3'
           '2d526bc0c498bf307ee50e2d22b4f53ffa0c4435'
           '0b35048723c527fb824c5e0f9b9064f751871785'
+          'fdd35562ce010babaeb793f92f9906fdcdaf3f9f'
           '213fefe8533c845ea8c40585b6a8097820d5e5d2')
 
 install=install
@@ -45,6 +47,7 @@
 	patch -p1 -i ../no-host.patch # cf patch: do not set PAM host
 	patch -p1 -i ../restart.patch # cf patch: restart X server if killed
 	patch -p1 -i ../sigterm.patch # FS#23984: do not wait for input when SIGTERM'd
+	patch -p1 -i ../session-name.patch # FS#26693: fix default session name
 	patch -p1 -i ../tty-slowness.patch # FS#18313: fix sluggish TTY after slim start
 
 	make USE_PAM=1

Added: session-name.patch
===================================================================
--- session-name.patch	                        (rev 0)
+++ session-name.patch	2011-10-30 22:38:22 UTC (rev 141485)
@@ -0,0 +1,21 @@
+diff -Naur slim-1.3.2.old/panel.cpp slim-1.3.2.new/panel.cpp
+--- slim-1.3.2.old/panel.cpp	2010-10-24 06:01:15.117000019 +0000
++++ slim-1.3.2.new/panel.cpp	2010-10-24 17:26:30.987999967 +0000
+@@ -23,7 +23,7 @@
+     Root = root;
+     cfg = config;
+ 
+-    session = "";
++    session = cfg->nextSession(session);
+ 
+     // Init GC
+     XGCValues gcv;
+@@ -188,7 +188,7 @@
+ }
+ 
+ void Panel::ClearPanel() {
+-    session = "";
++    session = cfg->nextSession(session);
+     Reset();
+     XClearWindow(Dpy, Root);
+     XClearWindow(Dpy, Win);