]> git.pld-linux.org Git - packages/kde4-kdebase-workspace.git/blame - kde4-kdebase-workspace-kdmconfig.patch
projects / packages / kde4-kdebase-workspace.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- session change to match kde3
[packages/kde4-kdebase-workspace.git] / kde4-kdebase-workspace-kdmconfig.patch
CommitLineData
64c0b8a9 1diff -urN kdebase-workspace-4.2.1.org/doc/kdm/index.docbook kdebase-workspace-4.2.1/doc/kdm/index.docbook
60c43d87 2--- kdebase-workspace-4.2.1.org/doc/kdm/index.docbook 2008-05-29 13:18:56.000000000 +0200
64c0b8a9 3+++ kdebase-workspace-4.2.1/doc/kdm/index.docbook 2009-03-02 09:33:11.956956104 +0100
60c43d87
AM		 4@@ -317,7 +317,7 @@
5 system, and that you simply want to change its behavior in some way.</para>
6
7 <para>When &kdm; starts up, it reads its configuration from the folder
8-<filename class="directory">$<envar>KDEDIR</envar>/share/config/kdm/</filename>
bd53f434 9+<filename class="directory">/etc/X11/kdm/</filename>
60c43d87
AM		 10 (this may
11 be <filename class="directory">/etc/kde4/kdm/</filename> or something else
12 on your system).</para>
64c0b8a9 13diff -urN kdebase-workspace-4.2.1.org/kcontrol/fonts/fonts.cpp kdebase-workspace-4.2.1/kcontrol/fonts/fonts.cpp
60c43d87 14--- kdebase-workspace-4.2.1.org/kcontrol/fonts/fonts.cpp 2008-12-21 21:19:15.000000000 +0100
64c0b8a9 15+++ kdebase-workspace-4.2.1/kcontrol/fonts/fonts.cpp 2009-03-02 09:33:11.956956104 +0100
60c43d87
AM		 16@@ -643,7 +643,7 @@
17 "<p>The use of this option is generally discouraged. For selecting proper DPI"
18 " value a better option is explicitly configuring it for the whole X server if"
19 " possible (e.g. DisplaySize in xorg.conf or adding <i>-dpi value</i> to"
20- " ServerLocalArgs= in $KDEDIR/share/config/kdm/kdmrc). When fonts do not render"
21+ " ServerLocalArgs= in /etc/X11/kdm/kdmrc). When fonts do not render"
22 " properly with real DPI value better fonts should be used or configuration"
23 " of font hinting should be checked.</p>" );
24 comboForceDpi->setWhatsThis(whatsthis);
64c0b8a9 25diff -urN kdebase-workspace-4.2.1.org/kcontrol/kdm/background.cpp kdebase-workspace-4.2.1/kcontrol/kdm/background.cpp
60c43d87 26--- kdebase-workspace-4.2.1.org/kcontrol/kdm/background.cpp 2008-07-03 07:05:24.000000000 +0200
64c0b8a9 27+++ kdebase-workspace-4.2.1/kcontrol/kdm/background.cpp 2009-03-02 09:33:11.956956104 +0100
60c43d87
AM		 28@@ -45,7 +45,7 @@
29 " specified in the Setup= option in kdmrc (usually Xsetup).") );
30 m_simpleConf = KSharedConfig::openConfig(
31 config->group( "X-*-Greeter" ).readEntry(
32- "BackgroundCfg", KDE_CONFDIR "/kdm/backgroundrc" ) );
33+ "BackgroundCfg", "/etc/X11/kdm/backgroundrc" ) );
34 m_background = new BGDialog( this, m_simpleConf );
35
36 connect( m_background, SIGNAL(changed( bool )), SIGNAL(changed()) );
64c0b8a9 37diff -urN kdebase-workspace-4.2.1.org/kcontrol/kdm/kdm-users.cpp kdebase-workspace-4.2.1/kcontrol/kdm/kdm-users.cpp
60c43d87 38--- kdebase-workspace-4.2.1.org/kcontrol/kdm/kdm-users.cpp 2008-08-28 18:12:26.000000000 +0200
64c0b8a9 39+++ kdebase-workspace-4.2.1/kcontrol/kdm/kdm-users.cpp 2009-03-02 09:33:11.956956104 +0100
60c43d87
AM		 40@@ -87,7 +87,7 @@
41
42 // We assume that $kde_datadir/kdm exists, but better check for pics/ and pics/users,
43 // and create them if necessary.
44- m_userPixDir = config->group( "X-*-Greeter" ).readEntry( "FaceDir", KStandardDirs::installPath( "data" ) + "kdm/faces" ) + '/';
45+ m_userPixDir = config->group( "X-*-Greeter" ).readEntry( "FaceDir", "/etc/X11/kdm/faces" ) + '/';
46 QDir testDir( m_userPixDir );
47 if (!testDir.exists() && !testDir.mkdir( testDir.absolutePath() ) && !geteuid())
48 KMessageBox::sorry( this, i18n("Unable to create folder %1", testDir.absolutePath() ) );
64c0b8a9 49diff -urN kdebase-workspace-4.2.1.org/kcontrol/kdm/main.cpp kdebase-workspace-4.2.1/kcontrol/kdm/main.cpp
60c43d87 50--- kdebase-workspace-4.2.1.org/kcontrol/kdm/main.cpp 2009-01-06 18:22:15.000000000 +0100
64c0b8a9 51+++ kdebase-workspace-4.2.1/kcontrol/kdm/main.cpp 2009-03-02 09:33:11.983457130 +0100
60c43d87
AM		 52@@ -187,7 +187,7 @@
53 kWarning() << "user(s) '" << tgmapci.value().join( "," )
54 << "' have unknown GID " << tgmapci.key() << endl;
55
56- config = new KConfig( QString::fromLatin1(KDE_CONFDIR "/kdm/kdmrc"), KConfig::SimpleConfig );
57+ config = new KConfig( QString::fromLatin1("/etc/X11/kdm/kdmrc"), KConfig::SimpleConfig );
58
59 QVBoxLayout *top = new QVBoxLayout( this );
60 top->setMargin( 0 );
64c0b8a9 61diff -urN kdebase-workspace-4.2.1.org/kdm/config.def kdebase-workspace-4.2.1/kdm/config.def
60c43d87 62--- kdebase-workspace-4.2.1.org/kdm/config.def 2009-02-26 15:16:59.000000000 +0100
64c0b8a9 63+++ kdebase-workspace-4.2.1/kdm/config.def 2009-03-02 09:36:05.187328458 +0100
60c43d87
AM		 64@@ -29,7 +29,7 @@
65 #define RCVERMAJOR 2
66 #define RCVERMINOR 4
67
68-#define KDMCONF KDE_CONFDIR "/kdm"
69+#define KDMCONF "/etc/X11/kdm"
70 #define KDMDATA KDE_DATADIR "/kdm"
71
72 #ifdef _AIX
73@@ -1163,7 +1163,7 @@
74
75 Key: Willing
76 Type: string
77-Default: ""
78+Default: KDMCONF "/Xwilling"
79 User: core
80 # will be overwritten
81 Instance: #
82@@ -1602,7 +1602,7 @@
83
84 Key: Startup
85 Type: string
86-Default: ""
87+Default: KDMCONF "/Xsetup"
88 User: core
89 # will be overwritten
90 Instance: #*/""
91@@ -1620,7 +1620,7 @@
92
93 Key: Reset
94 Type: string
95-Default: ""
96+Default: KDMCONF "Xreset"
97 User: core
98 # will be overwritten
99 Instance: #*/""
100@@ -1638,7 +1638,7 @@
101
102 Key: Session
103 Type: string
104-Default: XBINDIR "/xterm -ls -T"
105+Default: KDMCONF "/Xsession"
106 #Merge: xdm - incompatible!
107 User: core
108 # will be overwritten
109@@ -1755,10 +1755,10 @@
110
111 Key: AllowRootLogin
112 Type: bool
113-Default: true
114+Default: false
115 User: core
116 User: greeter(showRoot)
117-Instance: */false
118+Instance: #*/true
119 Merge: xdm
120 Comment:
121 Allow root logins?
122@@ -1768,11 +1768,11 @@
123
124 Key: AllowNullPasswd
125 Type: bool
126-Default: true
127+Default: false
128 User: core
129 # sensible?
130-Instance: */false
131-Instance: :*/true
132+Instance: #*/true
133+Instance: #:*/true
134 Merge: xdm
135 Comment:
136 Allow to log in, when user has set an empty password?
137@@ -1930,10 +1930,10 @@
138
139 Key: SessionsDirs
140 Type: list
141-Default: *KDMDATA "/sessions"
64c0b8a9 142+Default: "/usr/share/xsessions"
60c43d87
AM		 143 User: core
144 User: greeter-c
145-Instance: */KDMCONF "/sessions," KDMDATA "/sessions"
146+Instance: #*/"/etc/X11/sessions"
147 Update: upd_sessionsdirs
148 Comment:
149 The directories containing session type definitions in .desktop format,
150@@ -2277,7 +2277,7 @@
151
152 Key: MinShowUID
153 Type: int
154-Default: 0
155+Default: 1000
156 User: greeter(lowUserId)
157 # will be overwritten
158 Instance: #*/
159@@ -2338,7 +2338,7 @@
160
161 Key: FaceDir
162 Type: string
163-Default: *KDMDATA "/faces"
164+Default: *KDMCONF "/faces"
165 User: greeter
166 Instance: #*/"/usr/share/faces"
167 Update: upd_facedir
64c0b8a9 168diff -urN kdebase-workspace-4.2.1.org/kdm/kfrontend/CMakeLists.txt kdebase-workspace-4.2.1/kdm/kfrontend/CMakeLists.txt
60c43d87 169--- kdebase-workspace-4.2.1.org/kdm/kfrontend/CMakeLists.txt 2008-07-31 10:14:09.000000000 +0200
64c0b8a9 170+++ kdebase-workspace-4.2.1/kdm/kfrontend/CMakeLists.txt 2009-03-02 09:33:11.983457130 +0100
60c43d87
AM		 171@@ -109,5 +109,5 @@
172
173 ## use 'GENKDMCONF_FLAGS=... make install' to add flags to the config generation (try genkdmconf -h)
174 install(CODE "
175-exec_program(\"${CMAKE_CURRENT_BINARY_DIR}/genkdmconf\" ARGS --in \\\"\\\$DESTDIR${CONFIG_INSTALL_DIR}/kdm\\\" --no-in-notice --face-src \\\"${CMAKE_CURRENT_SOURCE_DIR}/pics\\\" \\\$GENKDMCONF_FLAGS)
04d84703 176+exec_program(\"${CMAKE_CURRENT_BINARY_DIR}/genkdmconf\" ARGS --in \\\"\\\${DESTDIR}/etc/X11/kdm\\\" --no-in-notice --face-src \\\"${CMAKE_CURRENT_SOURCE_DIR}/pics\\\" \\\$GENKDMCONF_FLAGS)
60c43d87 177 ")
64c0b8a9 178diff -urN kdebase-workspace-4.2.1.org/kdm/kfrontend/kdmctl.c kdebase-workspace-4.2.1/kdm/kfrontend/kdmctl.c
60c43d87 179--- kdebase-workspace-4.2.1.org/kdm/kfrontend/kdmctl.c 2008-01-05 00:55:45.000000000 +0100
64c0b8a9 180+++ kdebase-workspace-4.2.1/kdm/kfrontend/kdmctl.c 2009-03-02 09:33:11.983457130 +0100
60c43d87
AM		 181@@ -150,7 +150,7 @@
182 {
183 char *dpy = getenv( "DISPLAY" );
184 const char *ctl = getenv( "DM_CONTROL" );
185- const char *cfg = KDE_CONFDIR "/kdm/kdmrc";
186+ const char *cfg = "/etc/X11/kdm/kdmrc";
187 char *ptr;
188 int fd;
189
64c0b8a9
AM		 190diff -urN kdebase-workspace-4.2.1.org/kdm/kfrontend/sessions/CMakeLists.txt kdebase-workspace-4.2.1/kdm/kfrontend/sessions/CMakeLists.txt
191--- kdebase-workspace-4.2.1.org/kdm/kfrontend/sessions/CMakeLists.txt 2008-04-30 15:58:40.000000000 +0200
192+++ kdebase-workspace-4.2.1/kdm/kfrontend/sessions/CMakeLists.txt 2009-03-02 09:33:11.983457130 +0100
5cb389e0 193@@ -51,5 +51,5 @@
194 xfce.desktop
195 xfce4.desktop
196
197- DESTINATION ${DATA_INSTALL_DIR}/kdm/sessions
198+ DESTINATION /etc/X11/sessions
199 )
KDE 4 base workspace components
This page took 0.089986 seconds and 4 git commands to generate.