--- a/src/protocols/silc/silc.c Sun Jul 25 22:47:11 2004 +0000
+++ b/src/protocols/silc/silc.c Mon Jul 26 03:27:03 2004 +0000
@@ -942,7 +942,7 @@
/********************************* Commands **********************************/
static GaimCmdRet silcgaim_cmd_chat_part(GaimConversation *conv,
- const char *cmd, char **args, char **error)
+ const char *cmd, char **args, char **error, void *data)
{
GaimConnection *gc;
GaimConversation *convo;
@@ -975,7 +975,7 @@
}
static GaimCmdRet silcgaim_cmd_chat_topic(GaimConversation *conv,
- const char *cmd, char **args, char **error)
+ const char *cmd, char **args, char **error, void *data)
{
GaimConnection *gc;
int id = 0;
@@ -1013,7 +1013,7 @@
}
static GaimCmdRet silcgaim_cmd_chat_join(GaimConversation *conv,
- const char *cmd, char **args, char **error)
+ const char *cmd, char **args, char **error, void *data)
{
GHashTable *comp;
@@ -1033,7 +1033,7 @@
}
static GaimCmdRet silcgaim_cmd_chat_list(GaimConversation *conv,
- const char *cmd, char **args, char **error)
+ const char *cmd, char **args, char **error, void *data)
{
GaimConnection *gc;
gc = gaim_conversation_get_gc(conv);
@@ -1042,7 +1042,7 @@
}
static GaimCmdRet silcgaim_cmd_whois(GaimConversation *conv,
- const char *cmd, char **args, char **error)
+ const char *cmd, char **args, char **error, void *data)
{
GaimConnection *gc;
@@ -1057,7 +1057,7 @@
}
static GaimCmdRet silcgaim_cmd_msg(GaimConversation *conv,
- const char *cmd, char **args, char **error)
+ const char *cmd, char **args, char **error, void *data)
{
int ret;
GaimConnection *gc;
@@ -1076,7 +1076,7 @@
}
static GaimCmdRet silcgaim_cmd_query(GaimConversation *conv,
- const char *cmd, char **args, char **error)
+ const char *cmd, char **args, char **error, void *data)
{
int ret = 1;
GaimConversation *convo;
@@ -1110,7 +1110,7 @@
}
static GaimCmdRet silcgaim_cmd_motd(GaimConversation *conv,
- const char *cmd, char **args, char **error)
+ const char *cmd, char **args, char **error, void *data)
{
GaimConnection *gc;
SilcGaim sg;
@@ -1140,7 +1140,7 @@
}
static GaimCmdRet silcgaim_cmd_detach(GaimConversation *conv,
- const char *cmd, char **args, char **error)
+ const char *cmd, char **args, char **error, void *data)
{
GaimConnection *gc;
SilcGaim sg;
@@ -1162,7 +1162,7 @@
}
static GaimCmdRet silcgaim_cmd_cmode(GaimConversation *conv,
- const char *cmd, char **args, char **error)
+ const char *cmd, char **args, char **error, void *data)
{
GaimConnection *gc;
SilcGaim sg;
@@ -1215,7 +1215,7 @@
}
static GaimCmdRet silcgaim_cmd_generic(GaimConversation *conv,
- const char *cmd, char **args, char **error)
+ const char *cmd, char **args, char **error, void *data)
{
GaimConnection *gc;
SilcGaim sg;
@@ -1245,7 +1245,7 @@
}
static GaimCmdRet silcgaim_cmd_quit(GaimConversation *conv,
- const char *cmd, char **args, char **error)
+ const char *cmd, char **args, char **error, void *data)
{
GaimConnection *gc;
SilcGaim sg;
@@ -1267,7 +1267,7 @@
}
static GaimCmdRet silcgaim_cmd_call(GaimConversation *conv,
- const char *cmd, char **args, char **error)
+ const char *cmd, char **args, char **error, void *data)
{
GaimConnection *gc;
SilcGaim sg;
@@ -1299,109 +1299,110 @@
gaim_cmd_register("part", "w", GAIM_CMD_P_PRPL,
GAIM_CMD_FLAG_IM | GAIM_CMD_FLAG_CHAT |
GAIM_CMD_FLAG_PRPL_ONLY | GAIM_CMD_FLAG_ALLOW_WRONG_ARGS,
- "prpl-silc", silcgaim_cmd_chat_part, _("part [channel]: Leave the chat"));
+ "prpl-silc", silcgaim_cmd_chat_part, _("part [channel]: Leave the chat"), NULL);
gaim_cmd_register("leave", "w", GAIM_CMD_P_PRPL,
GAIM_CMD_FLAG_IM | GAIM_CMD_FLAG_CHAT |
GAIM_CMD_FLAG_PRPL_ONLY | GAIM_CMD_FLAG_ALLOW_WRONG_ARGS,
- "prpl-silc", silcgaim_cmd_chat_part, _("leave [channel]: Leave the chat"));
+ "prpl-silc", silcgaim_cmd_chat_part, _("leave [channel]: Leave the chat"), NULL);
gaim_cmd_register("topic", "s", GAIM_CMD_P_PRPL,
GAIM_CMD_FLAG_CHAT | GAIM_CMD_FLAG_PRPL_ONLY |
GAIM_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-silc",
- silcgaim_cmd_chat_topic, _("topic [<new topic>]: View or change the topic"));
+ silcgaim_cmd_chat_topic, _("topic [<new topic>]: View or change the topic"), NULL);
gaim_cmd_register("join", "ws", GAIM_CMD_P_PRPL,
GAIM_CMD_FLAG_IM | GAIM_CMD_FLAG_CHAT |
GAIM_CMD_FLAG_PRPL_ONLY | GAIM_CMD_FLAG_ALLOW_WRONG_ARGS,
"prpl-silc", silcgaim_cmd_chat_join,
- _("join <channel> [<password>]: Join a chat on this network"));
+ _("join <channel> [<password>]: Join a chat on this network"), NULL);
gaim_cmd_register("list", "", GAIM_CMD_P_PRPL,
GAIM_CMD_FLAG_IM | GAIM_CMD_FLAG_CHAT | GAIM_CMD_FLAG_PRPL_ONLY |
GAIM_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-silc",
- silcgaim_cmd_chat_list, _("list: List channels on this network"));
+ silcgaim_cmd_chat_list, _("list: List channels on this network"), NULL);
gaim_cmd_register("whois", "w", GAIM_CMD_P_PRPL,
GAIM_CMD_FLAG_IM | GAIM_CMD_FLAG_CHAT | GAIM_CMD_FLAG_PRPL_ONLY,
"prpl-silc",
- silcgaim_cmd_whois, _("whois <nick>: View nick's information"));
+ silcgaim_cmd_whois, _("whois <nick>: View nick's information"), NULL);
gaim_cmd_register("msg", "ws", GAIM_CMD_P_PRPL,
GAIM_CMD_FLAG_IM | GAIM_CMD_FLAG_CHAT | GAIM_CMD_FLAG_PRPL_ONLY,
"prpl-silc", silcgaim_cmd_msg,
- _("msg <nick> <message>: Send a private message to a user"));
+ _("msg <nick> <message>: Send a private message to a user"), NULL);
gaim_cmd_register("query", "ws", GAIM_CMD_P_PRPL,
GAIM_CMD_FLAG_IM | GAIM_CMD_FLAG_CHAT | GAIM_CMD_FLAG_PRPL_ONLY |
GAIM_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-silc", silcgaim_cmd_query,
- _("query <nick> [<message>]: Send a private message to a user"));
+ _("query <nick> [<message>]: Send a private message to a user"), NULL);
gaim_cmd_register("motd", "", GAIM_CMD_P_PRPL,
GAIM_CMD_FLAG_IM | GAIM_CMD_FLAG_CHAT | GAIM_CMD_FLAG_PRPL_ONLY |
GAIM_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-silc", silcgaim_cmd_motd,
- _("motd: View the server's Message Of The Day"));
+ _("motd: View the server's Message Of The Day"), NULL);
gaim_cmd_register("detach", "", GAIM_CMD_P_PRPL,
GAIM_CMD_FLAG_IM | GAIM_CMD_FLAG_CHAT | GAIM_CMD_FLAG_PRPL_ONLY,
"prpl-silc", silcgaim_cmd_detach,
- _("detach: Detach this session"));
+ _("detach: Detach this session"), NULL);
gaim_cmd_register("quit", "s", GAIM_CMD_P_PRPL,
GAIM_CMD_FLAG_IM | GAIM_CMD_FLAG_CHAT | GAIM_CMD_FLAG_PRPL_ONLY |
GAIM_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-silc", silcgaim_cmd_quit,
- _("quit [message]: Disconnect from the server, with an optional message"));
+ _("quit [message]: Disconnect from the server, with an optional message"), NULL);
gaim_cmd_register("call", "s", GAIM_CMD_P_PRPL,
GAIM_CMD_FLAG_IM | GAIM_CMD_FLAG_CHAT | GAIM_CMD_FLAG_PRPL_ONLY,
"prpl-silc", silcgaim_cmd_call,
- _("call <command>: Call any silc client command"));
- /* These below just get passed through for the silc client library to deal with */
+ _("call <command>: Call any silc client command"), NULL);
+ /* These below just get passed through for the silc client library to deal
+ * with */
gaim_cmd_register("kill", "ws", GAIM_CMD_P_PRPL,
GAIM_CMD_FLAG_IM | GAIM_CMD_FLAG_CHAT | GAIM_CMD_FLAG_PRPL_ONLY |
GAIM_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-silc", silcgaim_cmd_generic,
- _("kill <nick> [-pubkey|<reason>]: Kill nick"));
+ _("kill <nick> [-pubkey|<reason>]: Kill nick"), NULL);
gaim_cmd_register("nick", "w", GAIM_CMD_P_PRPL,
GAIM_CMD_FLAG_IM | GAIM_CMD_FLAG_CHAT | GAIM_CMD_FLAG_PRPL_ONLY,
"prpl-silc", silcgaim_cmd_generic,
- _("nick <newnick>: Change your nickname"));
+ _("nick <newnick>: Change your nickname"), NULL);
gaim_cmd_register("whowas", "ww", GAIM_CMD_P_PRPL,
GAIM_CMD_FLAG_IM | GAIM_CMD_FLAG_CHAT | GAIM_CMD_FLAG_PRPL_ONLY |
GAIM_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-silc", silcgaim_cmd_generic,
- _("whowas <nick>: View nick's information"));
+ _("whowas <nick>: View nick's information"), NULL);
gaim_cmd_register("cmode", "wws", GAIM_CMD_P_PRPL,
GAIM_CMD_FLAG_CHAT | GAIM_CMD_FLAG_PRPL_ONLY |
GAIM_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-silc", silcgaim_cmd_cmode,
- _("cmode <channel> [+|-<modes>] [arguments]: Change or display channel modes"));
+ _("cmode <channel> [+|-<modes>] [arguments]: Change or display channel modes"), NULL);
gaim_cmd_register("cumode", "wws", GAIM_CMD_P_PRPL,
GAIM_CMD_FLAG_IM | GAIM_CMD_FLAG_CHAT | GAIM_CMD_FLAG_PRPL_ONLY |
GAIM_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-silc", silcgaim_cmd_generic,
- _("cumode <channel> +|-<modes> <nick>: Change nick's modes on channel"));
+ _("cumode <channel> +|-<modes> <nick>: Change nick's modes on channel"), NULL);
gaim_cmd_register("umode", "w", GAIM_CMD_P_PRPL,
GAIM_CMD_FLAG_IM | GAIM_CMD_FLAG_CHAT | GAIM_CMD_FLAG_PRPL_ONLY,
"prpl-silc", silcgaim_cmd_generic,
- _("umode <usermodes>: Set your modes in the network"));
+ _("umode <usermodes>: Set your modes in the network"), NULL);
gaim_cmd_register("oper", "s", GAIM_CMD_P_PRPL,
GAIM_CMD_FLAG_IM | GAIM_CMD_FLAG_CHAT | GAIM_CMD_FLAG_PRPL_ONLY,
"prpl-silc", silcgaim_cmd_generic,
- _("oper <nick> [-pubkey]: Get server operator privileges"));
+ _("oper <nick> [-pubkey]: Get server operator privileges"), NULL);
gaim_cmd_register("invite", "ws", GAIM_CMD_P_PRPL,
GAIM_CMD_FLAG_IM | GAIM_CMD_FLAG_CHAT | GAIM_CMD_FLAG_PRPL_ONLY |
GAIM_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-silc", silcgaim_cmd_generic,
- _("invite <channel> [-|+]<nick>: invite nick or add/remove from channel invite list"));
+ _("invite <channel> [-|+]<nick>: invite nick or add/remove from channel invite list"), NULL);
gaim_cmd_register("kick", "wws", GAIM_CMD_P_PRPL,
GAIM_CMD_FLAG_IM | GAIM_CMD_FLAG_CHAT | GAIM_CMD_FLAG_PRPL_ONLY |
GAIM_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-silc", silcgaim_cmd_generic,
- _("kick <channel> <nick> [comment]: Kick client from channel"));
+ _("kick <channel> <nick> [comment]: Kick client from channel"), NULL);
gaim_cmd_register("info", "w", GAIM_CMD_P_PRPL,
GAIM_CMD_FLAG_IM | GAIM_CMD_FLAG_CHAT | GAIM_CMD_FLAG_PRPL_ONLY |
GAIM_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-silc", silcgaim_cmd_generic,
- _("info [server]: View server administrative details"));
+ _("info [server]: View server administrative details"), NULL);
gaim_cmd_register("ban", "ww", GAIM_CMD_P_PRPL,
GAIM_CMD_FLAG_IM | GAIM_CMD_FLAG_CHAT | GAIM_CMD_FLAG_PRPL_ONLY |
GAIM_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-silc", silcgaim_cmd_generic,
- _("ban [<channel> +|-<nick>]: Ban client from channel"));
+ _("ban [<channel> +|-<nick>]: Ban client from channel"), NULL);
gaim_cmd_register("getkey", "w", GAIM_CMD_P_PRPL,
GAIM_CMD_FLAG_IM | GAIM_CMD_FLAG_CHAT | GAIM_CMD_FLAG_PRPL_ONLY,
"prpl-silc", silcgaim_cmd_generic,
- _("getkey <nick|server>: Retrieve client's or server's public key"));
+ _("getkey <nick|server>: Retrieve client's or server's public key"), NULL);
gaim_cmd_register("stats", "", GAIM_CMD_P_PRPL,
GAIM_CMD_FLAG_IM | GAIM_CMD_FLAG_CHAT | GAIM_CMD_FLAG_PRPL_ONLY,
"prpl-silc", silcgaim_cmd_generic,
- _("stats: View server and network statistics"));
+ _("stats: View server and network statistics"), NULL);
gaim_cmd_register("ping", "", GAIM_CMD_P_PRPL,
GAIM_CMD_FLAG_IM | GAIM_CMD_FLAG_CHAT | GAIM_CMD_FLAG_PRPL_ONLY,
"prpl-silc", silcgaim_cmd_generic,
- _("ping: Send PING to the connected server"));
+ _("ping: Send PING to the connected server"), NULL);
#if 0 /* Gaim doesn't handle these yet */
gaim_cmd_register("users", "w", GAIM_CMD_P_PRPL,
GAIM_CMD_FLAG_CHAT | GAIM_CMD_FLAG_PRPL_ONLY,