summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-17 23:03:24 -0600
committerTimothy Pearson <[email protected]>2013-02-17 23:03:24 -0600
commit46820981eb336297cf65cdca2137e4fea643bbaf (patch)
tree20e2ccd2f5df637a80493fa62a653d7daf4425f0
parent60bf5bc20f9fd81aed068ea5279dbedfb797d636 (diff)
parent4caa5c7f128c8fa187fff7768d9ba0778c41ac44 (diff)
downloadtdenetwork-46820981eb336297cf65cdca2137e4fea643bbaf.tar.gz
tdenetwork-46820981eb336297cf65cdca2137e4fea643bbaf.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdenetwork
-rw-r--r--kppp/pppdata.cpp4
-rw-r--r--kppp/pppdata.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/kppp/pppdata.cpp b/kppp/pppdata.cpp
index 8702d403..5c9bc521 100644
--- 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);
}
diff --git a/kppp/pppdata.h b/kppp/pppdata.h
index fb72bf0f..824665a6 100644
--- 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"