projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://valera-ext.nynaeve.net/silc into silc.1.1.branch
[silc.git]
/
apps
/
irssi
/
src
/
silc
/
core
/
silc-queries.c
diff --git
a/apps/irssi/src/silc/core/silc-queries.c
b/apps/irssi/src/silc/core/silc-queries.c
index 0da01d6b6918a9c6eec30a4a08c5ab4d395dbc82..ec29a2f32df8ffb85509834b69c010520d23139e 100644
(file)
--- a/
apps/irssi/src/silc/core/silc-queries.c
+++ b/
apps/irssi/src/silc/core/silc-queries.c
@@
-4,7
+4,7
@@
Author: Pekka Riikonen <priikone@silcnet.org>
Author: Pekka Riikonen <priikone@silcnet.org>
- Copyright (C) 2002 - 200
7
Pekka Riikonen
+ Copyright (C) 2002 - 200
8
Pekka Riikonen
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-33,7
+33,7
@@
#include "fe-common/core/keyboard.h"
#include "fe-common/silc/module-formats.h"
#include "fe-common/core/keyboard.h"
#include "fe-common/silc/module-formats.h"
-static void silc_query_attributes_print_final(
b
ool success, void *context);
+static void silc_query_attributes_print_final(
SilcB
ool success, void *context);
static void silc_query_attributes_accept(const char *line, void *context,
SilcKeyboardPromptStatus reason);
static void silc_query_attributes_accept(const char *line, void *context,
SilcKeyboardPromptStatus reason);
@@
-70,7
+70,7
@@
void command_attr(const char *data, SILC_SERVER_REC *server,
SilcUInt32 argc;
SilcUInt32 *argv_lens, *argv_types;
const char *sv;
SilcUInt32 argc;
SilcUInt32 *argv_lens, *argv_types;
const char *sv;
-
b
ool allowed;
+
SilcB
ool allowed;
/* Now parse all arguments */
tmp = g_strconcat("ATTR", " ", data, NULL);
/* Now parse all arguments */
tmp = g_strconcat("ATTR", " ", data, NULL);
@@
-254,7
+254,7
@@
void silc_query_attributes_default(SilcClient client,
SilcAttributeObjDevice dev;
SilcAttributeObjPk pk;
SilcVCardStruct vcard;
SilcAttributeObjDevice dev;
SilcAttributeObjPk pk;
SilcVCardStruct vcard;
-
b
ool allowed;
+
SilcB
ool allowed;
memset(&service, 0, sizeof(service));
memset(&geo, 0, sizeof(geo));
memset(&service, 0, sizeof(service));
memset(&geo, 0, sizeof(geo));
@@
-559,8
+559,8
@@
typedef struct {
SilcVCardStruct vcard;
SilcMime message;
SilcMime extension;
SilcVCardStruct vcard;
SilcMime message;
SilcMime extension;
-
b
ool nopk;
-
b
ool autoaccept;
+
SilcB
ool nopk;
+
SilcB
ool autoaccept;
} *AttrVerify;
void silc_query_attributes_print(SILC_SERVER_REC *server,
} *AttrVerify;
void silc_query_attributes_print(SILC_SERVER_REC *server,
@@
-920,7
+920,7
@@
void silc_query_attributes_print(SILC_SERVER_REC *server,
}
}
}
}
-static void silc_query_attributes_print_final(
b
ool success, void *context)
+static void silc_query_attributes_print_final(
SilcB
ool success, void *context)
{
AttrVerify verify = context;
SILC_SERVER_REC *server = verify->server;
{
AttrVerify verify = context;
SILC_SERVER_REC *server = verify->server;
@@
-970,7
+970,7
@@
static void silc_query_attributes_print_final(bool success, void *context)
format, 0, verify, &server->prompt_op);
} else {
/* Save new data to existing directory */
format, 0, verify, &server->prompt_op);
} else {
/* Save new data to existing directory */
-
verify->autoaccept = TRUE; /* Ensure we don't twiddle the async context */
+ verify->autoaccept = TRUE; /* Ensure we don't twiddle the async context */
silc_query_attributes_accept("Y", verify, KeyboardCompletionSuccess);
}
silc_query_attributes_accept("Y", verify, KeyboardCompletionSuccess);
}
@@
-987,7
+987,7
@@
static void silc_query_attributes_accept(const char *line, void *context,
unsigned char filename[256], filename2[256], *fingerprint = NULL, *tmp;
SilcUInt32 len;
int i;
unsigned char filename[256], filename2[256], *fingerprint = NULL, *tmp;
SilcUInt32 len;
int i;
-
b
ool success = (reason == KeyboardCompletionSuccess);
+
SilcB
ool success = (reason == KeyboardCompletionSuccess);
if (success && (line[0] == 'Y' || line[0] == 'y')) {
/* Save the attributes */
if (success && (line[0] == 'Y' || line[0] == 'y')) {
/* Save the attributes */