Sophie

Sophie

distrib > Mandriva > 2011.0 > i586 > media > main-updates-src > by-pkgid > 0f07d35f6c27bd02f0a0a93915e395e9 > files > 7

kdebase4-workspace-4.6.5-8.3.src.rpm

Index: kdm/config.def
===================================================================
--- kdm/config.def
+++ kdm/config.def	2010-03-08 09:21:56.000000000 +0100
@@ -32,6 +32,8 @@
 #define KDMCONF KDE_CONFDIR "/kdm"
 #define KDMDATA KDE_DATADIR "/kdm"
 
+#define MDVX11_CONF "/usr/share/X11/xdm"
+
 #include <sys/param.h> /* for #define BSD */
 
 #ifdef _AIX
Index: kdm/kfrontend/genkdmconf.c
===================================================================
--- kdm/kfrontend/genkdmconf.c
+++ kdm/kfrontend/genkdmconf.c	2010-03-08 09:24:06.000000000 +0100
@@ -1777,7 +1777,7 @@
 			else
 				linkFile( ce );
 		} else {
-			ce->value = KDMCONF "/Xsetup";
+			ce->value = MDVX11_CONF "/Xsetup";
 			ce->active = ce->written = True;
 			writeFile( ce->value, 0755, def_setup );
 		}
@@ -1858,7 +1858,7 @@
 			else
 				linkFile( ce );
 		} else {
-			ce->value = KDMCONF "/Xstartup";
+			ce->value = MDVX11_CONF "/Xstartup";
 			ce->active = ce->written = True;
 			writeFile( ce->value, 0755, def_startup );
 		}
@@ -1903,7 +1903,7 @@
 			else
 				linkFile( ce );
 		} else {
-			ce->value = KDMCONF "/Xreset";
+			ce->value = MDVX11_CONF "/Xreset";
 			ce->active = ce->written = True;
 			writeFile( ce->value, 0755, def_reset );
 		}
@@ -1926,7 +1926,7 @@
 		               "`tempfile`" :
 		               "$HOME/.xsession-env-$DISPLAY";
 		ASPrintf( &def_session, "%s%s%s", def_session1, tmpf, def_session2 );
-		ce->value = KDMCONF "/Xsession";
+		ce->value = MDVX11_CONF "/Xsession";
 		ce->active = ce->written = True;
 		writeFile( ce->value, 0755, def_session );
 	}
@@ -2485,7 +2485,7 @@
 
 static FDefs kdmdefs_all[] = {
 #ifdef XDMCP
-{ "Xdmcp", "Xaccess", "%s/kdm/Xaccess", 0 },
+{ "Xdmcp", "Xaccess", "%s/kdm/Xaccess", 0 },
 { "Xdmcp", "Willing", "", 0 },
 #endif
 { "X-*-Core", "Setup", "", 0 },