[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-12 22:00:45
Message-ID: 1194904845.736742.19976.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 735895 by ossi:

fix the EchoMode => EchoPasswd upgrade


 M  +3 -2      config.def  
 M  +6 -7      kfrontend/genkdmconf.c  


--- trunk/KDE/kdebase/workspace/kdm/config.def #735894:735895
@@ -739,7 +739,8 @@
 #   Update: <function>[/<number>]
 #     Call this function on each occurence of this option in genkdmconf.
 #     Options with higher numbers (default is 0) will be processed later.
-#   Merge: (xdm[:<resource>][(<function>)]|kdm:[<section>/][<key>][<function>])
+#   Merge: xdm[:<resource>][(<function>)]
+#   Merge: kdm:[<section>/][<key>][(<function>)]
 #     Specify config options to merge from xdm and older kdm versions.
 #     Kdm options from the current version are automatically merged.
 #     When merging an xdm resource and no resource name is specified, it is
@@ -2402,7 +2403,7 @@
 Default: true
 User: greeter
 Instance: #*/!
-Update: upd_echopasswd
+Merge: kdm:EchoMode(P_EchoMode)
 Comment: &
 Description:
  If this is true, the entered password is echoed as bullets. Otherwise,
--- trunk/KDE/kdebase/workspace/kdm/kfrontend/genkdmconf.c #735894:735895
@@ -1776,13 +1776,6 @@
 }
 
 static void
-upd_echopasswd( Entry *ce, Section *cs ATTR_UNUSED )
-{
-	if (ce->active)
-		ce->value = (char *)(!strcmp( ce->value, "NoEcho" ) ? "false" : "true");
-}
-
-static void
 upd_fifodir( Entry *ce, Section *cs ATTR_UNUSED )
 {
 	const char *dir;
@@ -2174,6 +2167,12 @@
 	*value = (char *)(isTrue( *value ) ? "Lilo" : "None");
 }
 
+static void
+P_EchoMode( const char *sect ATTR_UNUSED, char **value )
+{
+	*value = (char *)(!strcmp( *value, "NoEcho" ) ? "false" : "true");
+}
+
 CONF_GEN_KMERGE
 
 static int
[prev in list] [next in list] [prev in thread] [next in thread]