summaryrefslogtreecommitdiffstats
path: root/libtdenetwork
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-01-13 15:08:46 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-01-13 15:08:46 -0600
commitd497b1b0373d758ede3d877ab68c8d7c8ab29062 (patch)
tree00ebfc47087a5fd82949fc1abf08dd7e03c1c631 /libtdenetwork
parent639f34ef2efdec6ff0d1f47d919ca070d027fb80 (diff)
downloadtdepim-d497b1b0373d758ede3d877ab68c8d7c8ab29062.tar.gz
tdepim-d497b1b0373d758ede3d877ab68c8d7c8ab29062.zip
Fix inadvertent TQt changes
This closes Bug 752
Diffstat (limited to 'libtdenetwork')
-rw-r--r--libtdenetwork/libgpg-error-copy/err-codes.h.in6
-rw-r--r--libtdenetwork/libgpgme-copy/assuan/assuan-buffer.c2
-rw-r--r--libtdenetwork/libgpgme-copy/assuan/assuan-inquire.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/libtdenetwork/libgpg-error-copy/err-codes.h.in b/libtdenetwork/libgpg-error-copy/err-codes.h.in
index 167de9c75..de9e9df34 100644
--- a/libtdenetwork/libgpg-error-copy/err-codes.h.in
+++ b/libtdenetwork/libgpg-error-copy/err-codes.h.in
@@ -216,7 +216,7 @@
203 GPG_ERR_SEXP_UNMATCHED_PAREN Unmatched parentheses in S-expression
204 GPG_ERR_SEXP_NOT_CANONICAL S-expression not canonical
205 GPG_ERR_SEXP_BAD_CHARACTER Bad character in S-expression
-206 GPG_ERR_SEXP_BAD_TQUOTATION Bad quotation in S-expression
+206 GPG_ERR_SEXP_BAD_QUOTATION Bad quotation in S-expression
207 GPG_ERR_SEXP_ZERO_PREFIX Zero prefix in S-expression
208 GPG_ERR_SEXP_NESTED_DH Nested display hints in S-expression
209 GPG_ERR_SEXP_UNMATCHED_DH Unmatched display hints
@@ -237,7 +237,7 @@
263 GPG_ERR_ASS_LINE_TOO_LONG Line passed to IPC too long
264 GPG_ERR_ASS_NESTED_COMMANDS Nested IPC commands
265 GPG_ERR_ASS_NO_DATA_CB No data callback in IPC
-266 GPG_ERR_ASS_NO_INTQUIRE_CB No inquire callback in IPC
+266 GPG_ERR_ASS_NO_INQUIRE_CB No inquire callback in IPC
267 GPG_ERR_ASS_NOT_A_SERVER Not an IPC server
268 GPG_ERR_ASS_NOT_A_CLIENT Not an IPC client
269 GPG_ERR_ASS_SERVER_START Problem starting IPC server
@@ -252,7 +252,7 @@
278 GPG_ERR_ASS_NO_INPUT No input source for IPC
279 GPG_ERR_ASS_NO_OUTPUT No output source for IPC
280 GPG_ERR_ASS_PARAMETER IPC parameter error
-281 GPG_ERR_ASS_UNKNOWN_INTQUIRE Unknown IPC inquire
+281 GPG_ERR_ASS_UNKNOWN_INQUIRE Unknown IPC inquire
# 282 to 299 are reserved for future assuan codes.
diff --git a/libtdenetwork/libgpgme-copy/assuan/assuan-buffer.c b/libtdenetwork/libgpgme-copy/assuan/assuan-buffer.c
index 7a1879877..b06025b46 100644
--- a/libtdenetwork/libgpgme-copy/assuan/assuan-buffer.c
+++ b/libtdenetwork/libgpgme-copy/assuan/assuan-buffer.c
@@ -488,7 +488,7 @@ _assuan_cookie_write_flush (void *cookie)
* data out @buffer may be passed as NULL (in which case @length must
* also be 0); however when used by a client this flush operation does
* also send the terminating "END" command to terminate the reponse on
- * a INTQUIRE response. However, when assuan_transact() is used, this
+ * a INQUIRE response. However, when assuan_transact() is used, this
* function takes care of sending END itself.
*
* Return value: 0 on success or an error code
diff --git a/libtdenetwork/libgpgme-copy/assuan/assuan-inquire.c b/libtdenetwork/libgpgme-copy/assuan/assuan-inquire.c
index 897e0773b..d8c52d09a 100644
--- a/libtdenetwork/libgpgme-copy/assuan/assuan-inquire.c
+++ b/libtdenetwork/libgpgme-copy/assuan/assuan-inquire.c
@@ -141,7 +141,7 @@ assuan_inquire (assuan_context_t ctx, const char *keyword,
{
assuan_error_t rc;
struct membuf mb;
- char cmdbuf[LINELENGTH-10]; /* (10 = strlen ("INTQUIRE ")+CR,LF) */
+ char cmdbuf[LINELENGTH-10]; /* (10 = strlen ("INQUIRE ")+CR,LF) */
unsigned char *line, *p;
int linelen;
int nodataexpected;
@@ -162,7 +162,7 @@ assuan_inquire (assuan_context_t ctx, const char *keyword,
else
init_membuf (&mb, maxlen? maxlen:1024, maxlen);
- strcpy (stpcpy (cmdbuf, "INTQUIRE "), keyword);
+ strcpy (stpcpy (cmdbuf, "INQUIRE "), keyword);
rc = assuan_write_line (ctx, cmdbuf);
if (rc)
goto leave;