diff options
| author | Timothy Pearson <[email protected]> | 2013-02-17 23:03:21 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-17 23:03:21 -0600 |
| commit | 55dd2a324c0a6eeae14531a808a4e22b4baec619 (patch) | |
| tree | 444fc56266dab2a1bc11d8194ddaa85736ccac93 | |
| parent | 8c270c073400b9c5efc6d901a74f7857a9afc608 (diff) | |
| parent | 5914fa0499862d7c7990c4b0426aa79acdfcc770 (diff) | |
| download | tdebase-55dd2a324c0a6eeae14531a808a4e22b4baec619.tar.gz tdebase-55dd2a324c0a6eeae14531a808a4e22b4baec619.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
| -rw-r--r-- | kcontrol/tdm/tdm-appear.cpp | 4 | ||||
| -rw-r--r-- | tsak/main.cpp | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/kcontrol/tdm/tdm-appear.cpp b/kcontrol/tdm/tdm-appear.cpp index 91d65ccd7..e8aff7b74 100644 --- a/kcontrol/tdm/tdm-appear.cpp +++ b/kcontrol/tdm/tdm-appear.cpp @@ -53,7 +53,7 @@ extern KSimpleConfig *config; -#define TSAK_LOCTDEFILE "/tmp/tdesocket-global/tsak.lock" +#define TSAK_LOCKFILE "/tmp/tdesocket-global/tsak.lock" TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name) : TQWidget(parent, name), sakwarning(0) @@ -486,7 +486,7 @@ void TDMAppearanceWidget::save() } else { // Get PID - TQFile file(TSAK_LOCTDEFILE); + TQFile file(TSAK_LOCKFILE); if (file.open(IO_ReadOnly)) { TQTextStream stream(&file); unsigned long tsakpid = stream.readLine().toULong(); diff --git a/tsak/main.cpp b/tsak/main.cpp index 7bc2b8d6a..652466852 100644 --- a/tsak/main.cpp +++ b/tsak/main.cpp @@ -45,7 +45,7 @@ using namespace std; #define FIFO_DIR "/tmp/tdesocket-global" #define FIFO_FILE_OUT "/tmp/tdesocket-global/tsak" -#define FIFO_LOCTDEFILE_OUT "/tmp/tdesocket-global/tsak.lock" +#define FIFO_LOCKFILE_OUT "/tmp/tdesocket-global/tsak.lock" // WARNING // MAX_KEYBOARDS must be greater than or equal to MAX_INPUT_NODE @@ -266,7 +266,7 @@ void tearDownPipe() void tearDownLockingPipe() { close(mPipe_lockfd_out); - unlink(FIFO_LOCTDEFILE_OUT); + unlink(FIFO_LOCKFILE_OUT); } bool setFileLock(int fd, bool close_on_failure) @@ -296,7 +296,7 @@ bool checkFileLock() fl.l_whence = SEEK_SET; fl.l_len = 0; - int fd = open(FIFO_LOCTDEFILE_OUT, O_RDWR | O_NONBLOCK); + int fd = open(FIFO_LOCKFILE_OUT, O_RDWR | O_NONBLOCK); fcntl(fd, F_GETLK, &fl); /* Overwrites lock structure with preventors. */ if (fd > -1) { @@ -333,10 +333,10 @@ bool setupLockingPipe(bool writepid) umask(0); mkdir(FIFO_DIR,0644); - mknod(FIFO_LOCTDEFILE_OUT, 0600, 0); - chmod(FIFO_LOCTDEFILE_OUT, 0600); + mknod(FIFO_LOCKFILE_OUT, 0600, 0); + chmod(FIFO_LOCKFILE_OUT, 0600); - mPipe_lockfd_out = open(FIFO_LOCTDEFILE_OUT, O_RDWR | O_NONBLOCK); + mPipe_lockfd_out = open(FIFO_LOCKFILE_OUT, O_RDWR | O_NONBLOCK); if (mPipe_lockfd_out > -1) { if (writepid) { // Write my PID to the file |