projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updates.
[silc.git]
/
apps
/
irssi
/
src
/
silc
/
core
/
silc-core.c
diff --git
a/apps/irssi/src/silc/core/silc-core.c
b/apps/irssi/src/silc/core/silc-core.c
index d29ad5ee82a1031e4856773910cb55670ae11748..9936826d50f8ac12e3e1133e7cced32caac9335b 100644
(file)
--- a/
apps/irssi/src/silc/core/silc-core.c
+++ b/
apps/irssi/src/silc/core/silc-core.c
@@
-203,11
+203,18
@@
void silc_core_init(void)
args_register(options);
}
args_register(options);
}
+static void silc_nickname_format_parse(const char *nickname,
+ char **ret_nickname)
+{
+ silc_parse_userfqdn(nickname, ret_nickname, NULL);
+}
+
/* Finalize init. Called from src/fe-text/silc.c */
void silc_core_init_finish(void)
{
CHAT_PROTOCOL_REC *rec;
/* Finalize init. Called from src/fe-text/silc.c */
void silc_core_init_finish(void)
{
CHAT_PROTOCOL_REC *rec;
+ SilcClientParams params;
if (opt_create_keypair == TRUE) {
/* Create new key pair and exit */
if (opt_create_keypair == TRUE) {
/* Create new key pair and exit */
@@
-255,9
+262,9
@@
void silc_core_init_finish(void)
}
if (opt_version) {
}
if (opt_version) {
- printf("SILC Secure Internet Live Conferencing, version %s
\n",
- silc_version);
- printf("(c) 1997 - 2001 Pekka Riikonen <priikone@
poseidon.pspt.fi
>\n");
+ printf("SILC Secure Internet Live Conferencing, version %s
"
+
"(base: SILC Toolkit %s)\n", silc_dist_version,
silc_version);
+ printf("(c) 1997 - 2001 Pekka Riikonen <priikone@
silcnet.org
>\n");
exit(0);
}
exit(0);
}
@@
-270,8
+277,13
@@
void silc_core_init_finish(void)
settings_add_str("server", "alternate_nick", NULL);
silc_init_userinfo();
settings_add_str("server", "alternate_nick", NULL);
silc_init_userinfo();
+ /* Initialize client parameters */
+ memset(¶ms, 0, sizeof(params));
+ strcat(params.nickname_format, "%n@%h%a");
+ params.nickname_parse = silc_nickname_format_parse;
+
/* Allocate SILC client */
/* Allocate SILC client */
- silc_client = silc_client_alloc(&ops, NULL, silc_version_string);
+ silc_client = silc_client_alloc(&ops,
¶ms,
NULL, silc_version_string);
/* Load local config file */
silc_config = silc_client_config_alloc(SILC_CLIENT_HOME_CONFIG_FILE);
/* Load local config file */
silc_config = silc_client_config_alloc(SILC_CLIENT_HOME_CONFIG_FILE);