From b8daa96e4476854dcaf58a8bcc2c3d09de8f0d54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Sun, 17 Feb 2013 12:01:52 +0100
Subject: [PATCH] Fix unintended rename of LOCKFILE

---
 indexlib/lockfile.h                                 | 6 +++---
 kmail/accountdialog.cpp                             | 2 +-
 libtdenetwork/libgpgme-copy/assuan/assuan-logging.c | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/indexlib/lockfile.h b/indexlib/lockfile.h
index 9fb6acae..d4968498 100644
--- a/indexlib/lockfile.h
+++ b/indexlib/lockfile.h
@@ -1,5 +1,5 @@
-#ifndef LPC_LOCTDEFILE_H1118420718_INCLUDE_GUARD_
-#define LPC_LOCTDEFILE_H1118420718_INCLUDE_GUARD_
+#ifndef LPC_LOCKFILE_H1118420718_INCLUDE_GUARD_
+#define LPC_LOCKFILE_H1118420718_INCLUDE_GUARD_
 
 /* This file is part of indexlib.
  * Copyright (C) 2005 Luís Pedro Coelho <luis@luispedro.org>
@@ -69,4 +69,4 @@ class lockfile {
 
 
 
-#endif /* LPC_LOCTDEFILE_H1118420718_INCLUDE_GUARD_ */
+#endif /* LPC_LOCKFILE_H1118420718_INCLUDE_GUARD_ */
diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp
index 206cbfee..0898c36b 100644
--- a/kmail/accountdialog.cpp
+++ b/kmail/accountdialog.cpp
@@ -118,7 +118,7 @@ ProcmailRCParser::ProcmailRCParser(TQString fname)
     mProcmailrc.setName(fname);
   }
 
-  TQRegExp lockFileGlobal("^LOCTDEFILE=", true);
+  TQRegExp lockFileGlobal("^LOCKFILE=", true);
   TQRegExp lockFileLocal("^:0", true);
 
   if(  mProcmailrc.open(IO_ReadOnly) ) {
diff --git a/libtdenetwork/libgpgme-copy/assuan/assuan-logging.c b/libtdenetwork/libgpgme-copy/assuan/assuan-logging.c
index 6642f851..cfc3d846 100644
--- a/libtdenetwork/libgpgme-copy/assuan/assuan-logging.c
+++ b/libtdenetwork/libgpgme-copy/assuan/assuan-logging.c
@@ -137,7 +137,7 @@ _assuan_log_print_buffer (FILE *fp, const void *buffer, size_t length)
     fwrite (buffer, length, 1, fp);
   else
     {
-#ifdef HAVE_FLOCTDEFILE
+#ifdef HAVE_FLOCKFILE
       flockfile (fp);
 #endif
       putc_unlocked ('[', fp);
@@ -154,7 +154,7 @@ _assuan_log_print_buffer (FILE *fp, const void *buffer, size_t length)
         }
       putc_unlocked (' ', fp);
       putc_unlocked (']', fp);
-#ifdef HAVE_FUNLOCTDEFILE
+#ifdef HAVE_FUNLOCKFILE
       funlockfile (fp);
 #endif
     }
@@ -171,7 +171,7 @@ _assuan_log_sanitized_string (const char *string)
   if (! *s)
     return;
 
-#ifdef HAVE_FLOCTDEFILE
+#ifdef HAVE_FLOCKFILE
   flockfile (fp);
 #endif
 
@@ -218,7 +218,7 @@ _assuan_log_sanitized_string (const char *string)
 	}
     }
 
-#ifdef HAVE_FUNLOCTDEFILE
+#ifdef HAVE_FUNLOCKFILE
   funlockfile (fp);
 #endif
 }