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

List:       kde-commits
Subject:    KDE/kdebase/workspace/kdm
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2007-11-14 20:09:53
Message-ID: 1195070993.215887.19735.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 736772 by ossi:

remap inherited Preloader setting to new prefix if the (still not
existant) default preloader was configured.


 M  +1 -0      config.def  
 M  +13 -0     kfrontend/genkdmconf.c  


--- trunk/KDE/kdebase/workspace/kdm/config.def #736771:736772
@@ -2640,6 +2640,7 @@
 Default: ""
 User: greeter-c
 Instance: */KDE_BINDIR "/preloadkde"
+Update: upd_preloader
 Comment: &
 Description:
  A program to run while the greeter is visible. It is supposed to preload
--- trunk/KDE/kdebase/workspace/kdm/kfrontend/genkdmconf.c #736771:736772
@@ -1977,6 +1977,19 @@
 	}
 }
 
+static void
+upd_preloader( Entry *ce, Section *cs ATTR_UNUSED )
+{
+	if (ce->written) { /* implies oldkde != 0 */
+		char *oldpl;
+		ASPrintf( &oldpl, "%s/bin/preloadkde", oldkdepfx );
+		if (!strcmp( ce->value, oldpl ))
+			ce->value = (char *)KDE_BINDIR "/preloadkde";
+		free( oldpl );
+	}
+}
+
+
 CONF_GEN_ENTRIES
 
 static Sect *
[prev in list] [next in list] [prev in thread] [next in thread]