477c138a48
Many new features and refinements. Notable changes include: * Konqueror is the second web browser to pass the Acid2 CSS test, ahead of Firefox and Internet Explorer * Konqueror can also now free web pages from adverts with its ad-block feature * SuperKaramba is included in KDE, providing well-integrated and easy-to-install widgets for the user's desktop * Kopete has support for MSN and Yahoo! webcams * The edutainment module has three new applications (KGeography, Kanagram and blinKen), and has seen huge improvements in Kalzium
43 lines
1.9 KiB
Text
43 lines
1.9 KiB
Text
$NetBSD: patch-ap,v 1.12 2005/12/11 10:53:54 markd Exp $
|
|
|
|
--- kinit/kstartupconfig.cpp.orig 2005-12-01 20:47:00.000000000 +1300
|
|
+++ kinit/kstartupconfig.cpp
|
|
@@ -28,10 +28,10 @@ This utility helps to have some configur
|
|
without the need to launch anything linked to KDE libraries (which may need
|
|
some time to load).
|
|
|
|
-The configuration options are written to $KDEHOME/share/config/startupconfigkeys,
|
|
+The configuration options are written to $KDEHOME/share/kde/config/startupconfigkeys,
|
|
one option per line, as <file> <group> <key> <default>. It is possible to
|
|
use ' for quoting multiword entries. Values of these options will be written
|
|
-to $KDEHOME/share/config/startupconfig as a shell script that will set
|
|
+to $KDEHOME/share/kde/config/startupconfig as a shell script that will set
|
|
the values to shell variables, named <file>_<group>_<key> (all spaces replaced
|
|
by underscores, everything lowercase). So e.g. line
|
|
"ksplashrc KSplash Theme Default" may result in "ksplashrc_ksplash_theme=Default".
|
|
@@ -89,14 +89,14 @@ int main()
|
|
return 1;
|
|
char filename[ 1024 ];
|
|
strlcpy( filename, kdehome, 1024 );
|
|
- strlcat( filename, "/share/config/startupconfig", 1024 );
|
|
+ strlcat( filename, "/share/kde/config/startupconfig", 1024 );
|
|
if( access( filename, R_OK ) != 0 )
|
|
{
|
|
int ret = system( "kdostartupconfig" );
|
|
return WEXITSTATUS( ret );
|
|
}
|
|
strlcpy( filename, kdehome, 1024 );
|
|
- strlcat( filename, "/share/config/startupconfigfiles", 1024 );
|
|
+ strlcat( filename, "/share/kde/config/startupconfigfiles", 1024 );
|
|
struct stat st;
|
|
if( stat( filename, &st ) != 0 )
|
|
{
|
|
@@ -111,7 +111,7 @@ int main()
|
|
return WEXITSTATUS( ret );
|
|
}
|
|
strlcpy( filename, kdehome, 1024 );
|
|
- strlcat( filename, "/share/config/startupconfigkeys", 1024 );
|
|
+ strlcat( filename, "/share/kde/config/startupconfigkeys", 1024 );
|
|
FILE* keys = fopen( filename, "r" );
|
|
if( keys == NULL )
|
|
{
|