Mercurial > pidgin
diff libpurple/protocols/jabber/jabber.c @ 25140:de3e32bb942a
merge of '014e1f90f8ee8c07fa6d5bef545016ecfafda630'
and '7d61237e0ffb6113b3c1286311b584034a870b19'
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Sun, 19 Oct 2008 21:46:38 +0000 |
| parents | ff0470db521d b3ab1c23cdf6 |
| children | 0a5540936908 907ddb8dc092 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.c Sun Oct 19 13:26:16 2008 +0000 +++ b/libpurple/protocols/jabber/jabber.c Sun Oct 19 21:46:38 2008 +0000 @@ -2354,7 +2354,6 @@ { JabberStream *js = conv->account->gc->proto_data; const gchar *who; - gboolean result; if (!args || !args[0]) { /* use the buddy from conversation, if it's a one-to-one conversation */ @@ -2480,12 +2479,9 @@ "prpl-jabber", jabber_cmd_ping, _("ping <jid>: Ping a user/component/server."), NULL); - purple_cmd_register("buzz", "s", PURPLE_CMD_P_PRPL, - PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_PRPL_ONLY, - "prpl-jabber", jabber_cmd_buzz, - _("buzz: Buzz a user to get their attention"), NULL); - purple_cmd_register("buzz", "", PURPLE_CMD_P_PRPL, - PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_PRPL_ONLY, + purple_cmd_register("buzz", "w", PURPLE_CMD_P_PRPL, + PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_PRPL_ONLY | + PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber", jabber_cmd_buzz, _("buzz: Buzz a user to get their attention"), NULL); }