[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/kdm/kfrontend
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2005-02-04 20:31:28
Message-ID: 20050204203128.C71AB1D1CF () office ! kde ! org
[Download RAW message or body]

CVS commit by ossi: 

displace old Xservers and mark it as used


  M +5 -0      genkdmconf.c   1.103


--- kdebase/kdm/kfrontend/genkdmconf.c  #1.102:1.103
@@ -938,4 +938,5 @@ getInitTab( void )
                 return;
         if (readFile( &it, "/etc/inittab" )) {
+                usedFile( "/etc/inittab" );
                 for (p = it.buf; p < it.eof; p = eol + 1) {
                         for (eol = p; eol < it.eof && *eol != '\n'; eol++);
@@ -1128,4 +1129,5 @@ absorb_xservers( const char *sect ATTR_U
                 if (!readFile( &file, *value ))
                         return;
+                usedFile( *value );
         } else {
                 file.buf = *value;
@@ -1281,4 +1283,7 @@ absorb_xservers( const char *sect ATTR_U
         putfqval( "General", "StaticServers", sdpys ? sdpys + 1 : "" );
         putfqval( "General", "ReserveServers", rdpys ? rdpys + 1 : "" );
+
+        if (**value == '/' && inNewDir( *value ) && !use_destdir)
+                displace( *value );
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]