Fix paths used in kstartupconfig

kstartupconfig was looking in .config/share/startupconfigkeys

startkde and kdostartupconfig write to .config/startupconfigkeys

End result settings such as those in ksplash were ignored

REVIEW: 119425
wilder-5.14
David Edmundson 12 years ago
parent 65fab8409b
commit 05fde577b3
  1. 6
      startkde/kstartupconfig/kstartupconfig.cpp

@ -86,17 +86,17 @@ int main()
} else { } else {
kdehome = "~/.config"; kdehome = "~/.config";
} }
filename = kdehome + "/share/config/startupconfig"; filename = kdehome + "/startupconfig";
if (access(filename.c_str(), R_OK) != 0) if (access(filename.c_str(), R_OK) != 0)
goto doit; goto doit;
filename = kdehome + "/share/config/startupconfigfiles"; filename = kdehome + "/startupconfigfiles";
if (stat(filename.c_str(), &st) != 0) if (stat(filename.c_str(), &st) != 0)
goto doit; goto doit;
config_time = st.st_mtime; config_time = st.st_mtime;
config = fopen(filename.c_str(), "r"); config = fopen(filename.c_str(), "r");
if( config == NULL ) if( config == NULL )
goto doit; goto doit;
filename = kdehome + "/share/config/startupconfigkeys"; filename = kdehome + "/startupconfigkeys";
keys = fopen(filename.c_str(), "r"); keys = fopen(filename.c_str(), "r");
if( keys == NULL ) if( keys == NULL )
{ {

Loading…
Cancel
Save