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 a58a1ec3a2d9e92b8ec75899bcd7a7de2459887b..114f03af65d3a9e3e65e958c586f1901e3a0ffb1 100644
(file)
--- a/
apps/irssi/src/silc/core/silc-core.c
+++ b/
apps/irssi/src/silc/core/silc-core.c
@@
-100,7
+100,7
@@
static void silc_init_userinfo(void)
if (!str)
str = g_getenv("IRCNAME");
settings_set_str("real_name",
if (!str)
str = g_getenv("IRCNAME");
settings_set_str("real_name",
- str != NULL ? str :
g
_get_real_name());
+ str != NULL ? str :
silc
_get_real_name());
}
/* username */
}
/* username */
@@
-110,8
+110,8
@@
static void silc_init_userinfo(void)
if (!str)
str = g_getenv("IRCUSER");
settings_set_str("user_name",
if (!str)
str = g_getenv("IRCUSER");
settings_set_str("user_name",
- str != NULL ? str :
g_get_user_
name());
-
+ str != NULL ? str :
silc_get_user
name());
+
user_name = settings_get_str("user_name");
}
user_name = settings_get_str("user_name");
}
@@
-129,12
+129,7
@@
static void silc_init_userinfo(void)
/* alternate nick */
set = settings_get_str("alternate_nick");
if (set == NULL || *set == '\0') {
/* alternate nick */
set = settings_get_str("alternate_nick");
if (set == NULL || *set == '\0') {
- if (strlen(nick) < 9)
- str = g_strconcat(nick, "_", NULL);
- else {
- str = g_strdup(nick);
- str[strlen(str)-1] = '_';
- }
+ str = g_strconcat(nick, "_", NULL);
settings_set_str("alternate_nick", str);
g_free(str);
}
settings_set_str("alternate_nick", str);
g_free(str);
}
@@
-171,7
+166,7
@@
static void silc_register_cipher(SilcClient client, const char *cipher)
if (cipher) {
for (i = 0; silc_default_ciphers[i].name; i++)
if (!strcmp(silc_default_ciphers[i].name, cipher)) {
if (cipher) {
for (i = 0; silc_default_ciphers[i].name; i++)
if (!strcmp(silc_default_ciphers[i].name, cipher)) {
- silc_cipher_register(
(SilcCipherObject *)&silc_default_ciphers[i]
);
+ silc_cipher_register(
&(silc_default_ciphers[i])
);
break;
}
break;
}
@@
-192,7
+187,7
@@
static void silc_register_hash(SilcClient client, const char *hash)
if (hash) {
for (i = 0; silc_default_hash[i].name; i++)
if (!strcmp(silc_default_hash[i].name, hash)) {
if (hash) {
for (i = 0; silc_default_hash[i].name; i++)
if (!strcmp(silc_default_hash[i].name, hash)) {
- silc_hash_register(
(SilcHashObject *)&silc_default_hash[i]
);
+ silc_hash_register(
&(silc_default_hash[i])
);
break;
}
break;
}
@@
-213,7
+208,7
@@
static void silc_register_hmac(SilcClient client, const char *hmac)
if (hmac) {
for (i = 0; silc_default_hmacs[i].name; i++)
if (!strcmp(silc_default_hmacs[i].name, hmac)) {
if (hmac) {
for (i = 0; silc_default_hmacs[i].name; i++)
if (!strcmp(silc_default_hmacs[i].name, hmac)) {
- silc_hmac_register(
(SilcHmacObject *)&silc_default_hmacs[i]
);
+ silc_hmac_register(
&(silc_default_hmacs[i])
);
break;
}
break;
}