| 1 |
darkside 11/09/07 17:38:56 |
| 2 |
|
| 3 |
Added: 252280-fix-default_user-focus_passwd.patch |
| 4 |
slim-1.3.2-r3-config.diff |
| 5 |
Log: |
| 6 |
revision bump to fix bug 252280 by Ian Stakenvicius |
| 7 |
|
| 8 |
(Portage version: 2.1.10.11/cvs/Linux i686) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 x11-misc/slim/files/252280-fix-default_user-focus_passwd.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/slim/files/252280-fix-default_user-focus_passwd.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/slim/files/252280-fix-default_user-focus_passwd.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: 252280-fix-default_user-focus_passwd.patch |
| 17 |
=================================================================== |
| 18 |
--- /var/tmp/portage/x11-misc/slim-1.3.2-r5/work/slim-1.3.2/panel.cpp 2011-09-07 12:36:06.000000000 -0400 |
| 19 |
+++ /tmp/panel.cpp 2011-09-07 12:35:19.000000000 -0400 |
| 20 |
@@ -644,6 +644,7 @@ |
| 21 |
|
| 22 |
void Panel::SetName(const string& name){ |
| 23 |
NameBuffer=name; |
| 24 |
+ action = Login; |
| 25 |
return; |
| 26 |
}; |
| 27 |
const string& Panel::GetName(void) const{ |
| 28 |
|
| 29 |
|
| 30 |
|
| 31 |
1.1 x11-misc/slim/files/slim-1.3.2-r3-config.diff |
| 32 |
|
| 33 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/slim/files/slim-1.3.2-r3-config.diff?rev=1.1&view=markup |
| 34 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/slim/files/slim-1.3.2-r3-config.diff?rev=1.1&content-type=text/plain |
| 35 |
|
| 36 |
Index: slim-1.3.2-r3-config.diff |
| 37 |
=================================================================== |
| 38 |
--- slim.conf.orig 2010-08-25 11:52:23.000000000 -0400 |
| 39 |
+++ slim.conf 2010-08-25 11:58:58.000000000 -0400 |
| 40 |
@@ -2,7 +2,7 @@ |
| 41 |
# Note: -xauth $authfile is automatically appended |
| 42 |
default_path /bin:/usr/bin:/usr/local/bin |
| 43 |
default_xserver /usr/bin/X |
| 44 |
-#xserver_arguments -dpi 75 |
| 45 |
+xserver_arguments -nolisten tcp -br -deferglyphs 16 |
| 46 |
|
| 47 |
# Commands for halt, login, etc. |
| 48 |
halt_cmd /sbin/shutdown -h now |
| 49 |
@@ -18,7 +18,7 @@ |
| 50 |
|
| 51 |
|
| 52 |
# Activate numlock when slim starts. Valid values: on|off |
| 53 |
-# numlock on |
| 54 |
+numlock on |
| 55 |
|
| 56 |
# Hide the mouse cursor (note: does not work with some WMs). |
| 57 |
# Valid values: true|false |
| 58 |
@@ -33,7 +33,8 @@ |
| 59 |
# to adjust the command according to your preferred shell, |
| 60 |
# i.e. for freebsd use: |
| 61 |
# login_cmd exec /bin/sh - ~/.xinitrc %session |
| 62 |
-login_cmd exec /bin/bash -login ~/.xinitrc %session |
| 63 |
+# login_cmd exec /bin/bash -login ~/.xinitrc %session |
| 64 |
+login_cmd exec /bin/bash -login /usr/share/slim/Xsession %session |
| 65 |
|
| 66 |
# Commands executed when starting and exiting a session. |
| 67 |
# They can be used for registering a X11 session with |
| 68 |
@@ -41,20 +42,27 @@ |
| 69 |
# |
| 70 |
# sessionstart_cmd some command |
| 71 |
# sessionstop_cmd some command |
| 72 |
+sessionstart_cmd /usr/bin/sessreg -a -l :0.0 %user |
| 73 |
+sessionstop_cmd /usr/bin/sessreg -d -l :0.0 %user |
| 74 |
|
| 75 |
# Start in daemon mode. Valid values: yes | no |
| 76 |
# Note that this can be overriden by the command line |
| 77 |
# options "-d" and "-nodaemon" |
| 78 |
-# daemon yes |
| 79 |
+daemon yes |
| 80 |
|
| 81 |
-# Available sessions (first one is the default). |
| 82 |
-# The current chosen session name is replaced in the login_cmd |
| 83 |
+# Available sessions: |
| 84 |
+# The current chosen session name replaces %session in the login_cmd |
| 85 |
# above, so your login command can handle different sessions. |
| 86 |
+# If no session is chosen (via F1), %session will be an empty string. |
| 87 |
# see the xinitrc.sample file shipped with slim sources |
| 88 |
-sessions xfce4,icewm,wmaker,blackbox |
| 89 |
+#sessions xfce4,icewm,wmaker,blackbox |
| 90 |
+# Alternatively, read available sessions from a directory: |
| 91 |
+sessiondir /etc/X11/Sessions |
| 92 |
|
| 93 |
-# Executed when pressing F11 (requires imagemagick) |
| 94 |
+# Executed when pressing F11 (requires media-gfx/imagemagick for import) |
| 95 |
+# Alternative is media-gfx/scrot. See Gentoo bug 252241 for more info. |
| 96 |
screenshot_cmd import -window root /slim.png |
| 97 |
+#screenshot_cmd scrot /root/slim.png |
| 98 |
|
| 99 |
# welcome message. Available variables: %host, %domain |
| 100 |
welcome_msg Welcome to %host |
| 101 |
@@ -83,8 +88,8 @@ |
| 102 |
# randomly choose from |
| 103 |
current_theme default |
| 104 |
|
| 105 |
-# Lock file |
| 106 |
-lockfile /var/run/slim.lock |
| 107 |
+# Lock file, /etc/init.d/xdm expects slim.pid |
| 108 |
+lockfile /var/run/slim.pid |
| 109 |
|
| 110 |
# Log file |
| 111 |
logfile /var/log/slim.log |
Archives