diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-02 21:25:54 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-02 21:25:54 -0300 |
commit | 8b9ddc7fec12ba69e50ece961525c90bed96df99 (patch) | |
tree | fc12914f9d27317b3d3f1df6f0009f02ebb7668a /testing/slim/session-name.patch | |
parent | 40134114ddb57a36863a256ffdc5b65a8edb5a67 (diff) | |
parent | d915cad658736d96368750201c34df752048751a (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/perl-berkeleydb/PKGBUILD
community/egoboo/PKGBUILD
community/kdenlive/PKGBUILD
community/postgis/PKGBUILD
core/lvm2/PKGBUILD
extra/gvfs/PKGBUILD
extra/libatasmart/PKGBUILD
extra/mesa/PKGBUILD
extra/pixman/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/system-config-printer/PKGBUILD
extra/xorg-server/PKGBUILD
kde-unstable/kdenetwork/PKGBUILD
multilib/lib32-mesa/PKGBUILD
testing/imagemagick/PKGBUILD
testing/php/PKGBUILD
testing/php/logrotate.d.php-fpm
testing/php/php-fpm.conf.in.patch
testing/php/rc.d.php-fpm
testing/xf86-video-intel/PKGBUILD
Diffstat (limited to 'testing/slim/session-name.patch')
-rw-r--r-- | testing/slim/session-name.patch | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/testing/slim/session-name.patch b/testing/slim/session-name.patch deleted file mode 100644 index 8211c4f72..000000000 --- a/testing/slim/session-name.patch +++ /dev/null @@ -1,21 +0,0 @@ -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); |