Mercurial > pidgin
diff libpurple/protocols/jabber/jabber.c @ 19920:0ed8a2a86a1b
explicit merge of 'fc49baf44017a8fd511c607b435668baf2a0f518'
and 'b50640e3caa45410064cc403c759c1b427800a1e'
to branch 'org.maemo.garage.pidgin.pidgin.dialog-transience'
author | Gabriel Schulhof <nix@go-nix.ca> |
---|---|
date | Fri, 17 Aug 2007 22:10:43 +0000 |
parents | 25517a27771d 28a7c9dbbc2b |
children | 6a0d9fa477d4 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.c Fri Aug 17 21:01:20 2007 +0000 +++ b/libpurple/protocols/jabber/jabber.c Fri Aug 17 22:10:43 2007 +0000 @@ -1718,7 +1718,7 @@ static PurpleCmdRet jabber_cmd_chat_role(PurpleConversation *conv, const char *cmd, char **args, char **error, void *data) { - JabberChat *chat; + JabberChat *chat = jabber_chat_find_by_conv(conv); if (!chat || !args || !args[0] || !args[1]) return PURPLE_CMD_RET_FAILED; @@ -1731,8 +1731,6 @@ return PURPLE_CMD_RET_FAILED; } - chat = jabber_chat_find_by_conv(conv); - if (!jabber_chat_role_user(chat, args[0], args[1])) { *error = g_strdup_printf(_("Unable to set role \"%s\" for user: %s"), args[1], args[0]);