Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdenetwork

12 years ago · 46820981eb
parent 60bf5bc20f 4caa5c7f12
commit 46820981eb
2 changed files with 3 additions and 3 deletions
--- a/kppp/pppdata.cpp
+++ b/kppp/pppdata.cpp
@ -610,12 +610,12 @@ void PPPData::setModemEscapeGuardTime(int n) {


 bool PPPData::modemLockFile() {
-  return readNumConfig(cmodemgroup, LOCTDEFILE_KEY, 1);
+  return readNumConfig(cmodemgroup, LOCKFILE_KEY, 1);
 }


 void PPPData::setModemLockFile(bool set) {
-  writeConfig(cmodemgroup, LOCTDEFILE_KEY, set);
+  writeConfig(cmodemgroup, LOCKFILE_KEY, set);
 }


--- a/kppp/pppdata.h
+++ b/kppp/pppdata.h
@ -79,7 +79,7 @@ class TDEConfig;
 // modem
 #define MOD_NAME_KEY       "Name"
 #define MODEMDEV_KEY       "Device"
-#define LOCTDEFILE_KEY       "UseLockFile"
+#define LOCKFILE_KEY       "UseLockFile"
 #define FLOWCONTROL_KEY    "FlowControl"
 #define SPEED_KEY          "Speed"
 #define TIMEOUT_KEY        "Timeout"