comparison finch/gntblist.c @ 23279:a601807bae2b

Fix chat joining from the 'Join a chat' dialog. Thanks to w00b on IRC for reporting the bug.

23278:d14289aed8ee

	PurpleAccount *account;
	const char *name;
	PurpleConnection *gc;
	PurpleChat *chat;
	GHashTable *hash = NULL;

	account = purple_request_fields_get_account(fields, "account");
	name = purple_request_fields_get_string(fields,  "chat");

	if (!purple_account_is_connected(account))
		return;

	gc = purple_account_get_connection(account);
	purple_conversation_new(PURPLE_CONV_TYPE_CHAT, account, name);
	chat = purple_blist_find_chat(account, name);
	if (chat == NULL) {
		PurplePluginProtocolInfo *info = PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl(gc));
		if (info->chat_info_defaults != NULL)
			hash = info->chat_info_defaults(gc, name);

23279:a601807bae2b

	PurpleAccount *account;
	const char *name;
	PurpleConnection *gc;
	PurpleChat *chat;
	GHashTable *hash = NULL;
	PurpleConversation *conv;

	account = purple_request_fields_get_account(fields, "account");
	name = purple_request_fields_get_string(fields,  "chat");

	if (!purple_account_is_connected(account))
		return;

	gc = purple_account_get_connection(account);
	/* Create a new conversation now. This will give focus to the new window.
	 * But it's necessary to pretend that we left the chat, because otherwise
	 * a new conversation window will pop up when we finally join the chat. */
	if (!(conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT, name, account))) {
		conv = purple_conversation_new(PURPLE_CONV_TYPE_CHAT, account, name);
		purple_conv_chat_left(PURPLE_CONV_CHAT(conv));
	} else {
		purple_conversation_present(conv);
	}

	chat = purple_blist_find_chat(account, name);
	if (chat == NULL) {
		PurplePluginProtocolInfo *info = PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl(gc));
		if (info->chat_info_defaults != NULL)
			hash = info->chat_info_defaults(gc, name);