received in the packet. The `channel_name' is the name of the channel. */
void silc_channel_message(SilcClient client, SilcClientConnection conn,
- char *sender, char *channel_name, char *msg)
+ SilcClientEntry sender, SilcChannelEntry channel
+ , char *msg)
{
/* Message from client */
- if (!strcmp(conn->current_channel->channel_name, channel_name))
- silc_print(client, "<%s> %s", sender, msg);
+ if (conn && !strcmp(conn->current_channel->channel_name,
+ channel->channel_name))
+ silc_print(client, "<%s> %s", sender ? sender->nickname : "[<unknown>]",
+ msg);
else
- silc_print(client, "<%s:%s> %s", sender, channel_name, msg);
+ silc_print(client, "<%s:%s> %s", sender ? sender->nickname : "[<unknown>]",
+ channel->channel_name, msg);
}
/* Private message to the client. The `sender' is the nickname of the
sender received in the packet. */
void silc_private_message(SilcClient client, SilcClientConnection conn,
- char *sender, char *msg)
+ SilcClientEntry sender, char *msg)
{
- silc_print(client, "*%s* %s", sender, msg);
+ silc_print(client, "*%s* %s", sender->nickname, msg);
}
char message[4096];
SilcClientEntry client_entry, client_entry2;
SilcChannelEntry channel_entry;
- char *tmp;
+ char *tmp = NULL;
unsigned int tmp_int;
va_start(vp, type);
case SILC_NOTIFY_TYPE_SIGNOFF:
client_entry = va_arg(vp, SilcClientEntry);
+ tmp = va_arg(vp, char *);
if (client_entry->server)
- snprintf(message, sizeof(message), "Signoff: %s@%s",
- client_entry->nickname, client_entry->server);
+ snprintf(message, sizeof(message), "Signoff: %s@%s %s%s%s",
+ client_entry->nickname, client_entry->server,
+ tmp ? "(" : "", tmp ? tmp : "", tmp ? ")" : "");
else
- snprintf(message, sizeof(message), "Signoff: %s",
- client_entry->nickname);
+ snprintf(message, sizeof(message), "Signoff: %s %s%s%s",
+ client_entry->nickname,
+ tmp ? "(" : "", tmp ? tmp : "", tmp ? ")" : "");
break;
case SILC_NOTIFY_TYPE_TOPIC_SET:
client_entry2 = va_arg(vp, SilcClientEntry);
channel_entry = va_arg(vp, SilcChannelEntry);
if (tmp)
- snprintf(message, sizeof(message), "%s changed %s mode to +%s",
+ snprintf(message, sizeof(message), "%s changed %s's mode to +%s",
client_entry->nickname, client_entry2->nickname, tmp);
else
- snprintf(message, sizeof(message), "%s removed %s modes",
+ snprintf(message, sizeof(message), "%s removed %s's modes",
client_entry->nickname, client_entry2->nickname);
if (client_entry2 == conn->local_entry) {
if (app->screen->bottom_line->mode)
}
return;
+ case SILC_NOTIFY_TYPE_CHANNEL_CHANGE:
+ break;
+
default:
break;
}