Sophie

Sophie

distrib > Mageia > 1 > i586 > media > core-updates-src > by-pkgid > 00483d81de16d6155bb71015324df6f6 > files > 11

kdebase4-workspace-4.6.5-1.3.mga1.src.rpm

Index: kdm/kfrontend/genkdmconf.c
===================================================================
--- kdm/kfrontend/genkdmconf.c	(révision 1202613)
+++ kdm/kfrontend/genkdmconf.c	(copie de travail)
@@ -1810,7 +1810,7 @@
             else
                 linkFile(ce);
         } else {
-            ce->value = KDMCONF "/Xsetup";
+            ce->value = MGAX11_CONF "/Xsetup";
             ce->active = ce->written = True;
             writeFile(ce->value, 0755, def_setup);
         }
@@ -1891,7 +1891,7 @@
             else
                 linkFile(ce);
         } else {
-            ce->value = KDMCONF "/Xstartup";
+            ce->value = MGAX11_CONF "/Xstartup";
             ce->active = ce->written = True;
             writeFile(ce->value, 0755, def_startup);
         }
@@ -1936,7 +1936,7 @@
             else
                 linkFile(ce);
         } else {
-            ce->value = KDMCONF "/Xreset";
+            ce->value = MGAX11_CONF "/Xreset";
             ce->active = ce->written = True;
             writeFile(ce->value, 0755, def_reset);
         }
@@ -1959,7 +1959,7 @@
                        "`tempfile`" :
                        "$HOME/.xsession-env-$DISPLAY";
         ASPrintf(&def_session, "%s%s%s", def_session1, tmpf, def_session2);
-        ce->value = KDMCONF "/Xsession";
+        ce->value = MGAX11_CONF "/Xsession";
         ce->active = ce->written = True;
         writeFile(ce->value, 0755, def_session);
     }
Index: kdm/config.def
===================================================================
--- kdm/config.def	(révision 1202613)
+++ kdm/config.def	(copie de travail)
@@ -32,6 +32,8 @@
 #define KDMCONF KDE_CONFDIR "/kdm"
 #define KDMDATA KDE_DATADIR "/kdm"
 
+#define MGAX11_CONF "/usr/share/X11/xdm"
+
 #include <sys/param.h> /* for #define BSD */
 
 #ifdef _AIX