comparison libpurple/protocols/jabber/jabber.c @ 32790:3e7a7e14af62

Our API really shouldn't have a 'gc' in it anymore.
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Mon, 24 Oct 2011 05:37:19 +0000
parents c2dcb6d3b246
children cb486df263ef
comparison
equal deleted inserted replaced
32789:fb2458f2326b 32790:3e7a7e14af62
2999 const char *cmd, char **args, char **error, void *data) 2999 const char *cmd, char **args, char **error, void *data)
3000 { 3000 {
3001 if(!args || !args[0]) 3001 if(!args || !args[0])
3002 return PURPLE_CMD_RET_FAILED; 3002 return PURPLE_CMD_RET_FAILED;
3003 3003
3004 jabber_chat_invite(purple_conversation_get_gc(conv), 3004 jabber_chat_invite(purple_conversation_get_connection(conv),
3005 purple_conv_chat_get_id(PURPLE_CONV_CHAT(conv)), args[1] ? args[1] : "", 3005 purple_conv_chat_get_id(PURPLE_CONV_CHAT(conv)), args[1] ? args[1] : "",
3006 args[0]); 3006 args[0]);
3007 3007
3008 return PURPLE_CMD_RET_OK; 3008 return PURPLE_CMD_RET_OK;
3009 } 3009 }
3046 g_hash_table_insert(components, "handle", (gpointer)handle); 3046 g_hash_table_insert(components, "handle", (gpointer)handle);
3047 3047
3048 if (args[1]) 3048 if (args[1])
3049 g_hash_table_insert(components, "password", args[1]); 3049 g_hash_table_insert(components, "password", args[1]);
3050 3050
3051 jabber_chat_join(purple_conversation_get_gc(conv), components); 3051 jabber_chat_join(purple_conversation_get_connection(conv), components);
3052 3052
3053 g_hash_table_destroy(components); 3053 g_hash_table_destroy(components);
3054 jabber_id_free(jid); 3054 jabber_id_free(jid);
3055 return PURPLE_CMD_RET_OK; 3055 return PURPLE_CMD_RET_OK;
3056 } 3056 }
3080 if (!chat) 3080 if (!chat)
3081 return PURPLE_CMD_RET_FAILED; 3081 return PURPLE_CMD_RET_FAILED;
3082 3082
3083 who = g_strdup_printf("%s@%s/%s", chat->room, chat->server, args[0]); 3083 who = g_strdup_printf("%s@%s/%s", chat->room, chat->server, args[0]);
3084 3084
3085 jabber_message_send_im(purple_conversation_get_gc(conv), who, args[1], 0); 3085 jabber_message_send_im(purple_conversation_get_connection(conv), who, args[1], 0);
3086 3086
3087 g_free(who); 3087 g_free(who);
3088 return PURPLE_CMD_RET_OK; 3088 return PURPLE_CMD_RET_OK;
3089 } 3089 }
3090 3090