comparison finch/gntblist.c @ 22814:2d10cd28aa57

Check to see if we are already in a room before attempting to join. If we are already in that room, then focus the conversation. This should address the issue where finch doesn't play well when adding a chat in the buddylist with auto-join turned on while already in that chat.

22813:e61d5778b065

			account, NULL, NULL,
			NULL);
}

static void
add_chat_cb(void *data, PurpleRequestFields *allfields)
{
	PurpleAccount *account;
	const char *alias, *name, *group;
	PurpleChat *chat;

			purple_blist_add_group(grp, NULL);
		}
		purple_blist_add_chat(chat, grp, NULL);
		purple_blist_alias_chat(chat, alias);
		purple_blist_node_set_bool((PurpleBlistNode*)chat, "gnt-autojoin", autojoin);
		if (autojoin)
			serv_join_chat(purple_account_get_connection(purple_chat_get_account(chat)), purple_chat_get_components(chat));
	}
}

static void
finch_request_add_chat(PurpleAccount *account, PurpleGroup *grp, const char *alias, const char *name)

	GntTree *tree = GNT_TREE(ggblist->tree);
	PurpleBlistNode *node = gnt_tree_get_selection_data(tree);

	if (!node)
		return;
	
	if (PURPLE_BLIST_NODE_IS_CONTACT(node))
		node = (PurpleBlistNode*)purple_contact_get_priority_buddy((PurpleContact*)node);

	if (PURPLE_BLIST_NODE_IS_BUDDY(node))
	{

		}
		finch_conversation_set_active(conv);
	}
	else if (PURPLE_BLIST_NODE_IS_CHAT(node))
	{
		PurpleChat *chat = (PurpleChat*)node;
		serv_join_chat(purple_account_get_connection(purple_chat_get_account(chat)), purple_chat_get_components(chat));
	}
}

static void
context_menu_callback(GntMenuItem *item, gpointer data)

22814:2d10cd28aa57

			account, NULL, NULL,
			NULL);
}

static void
join_chat(PurpleChat *chat)
{
	PurpleAccount *account = purple_chat_get_account(chat);
	const char *name;
	PurpleConversation *conv;
	const char *alias;

	/* This hack here is to work around the fact that there's no good way of
	 * getting the actual name of a chat. I don't understand why we return
	 * the alias for a chat when all we want is the name. */
	alias = chat->alias;
	chat->alias = NULL;
	name = purple_chat_get_name(chat);
	conv = purple_find_conversation_with_account(
			PURPLE_CONV_TYPE_CHAT, name, account);
	chat->alias = (char *)alias;

	if (!conv || purple_conv_chat_has_left(PURPLE_CONV_CHAT(conv))) {
		serv_join_chat(purple_account_get_connection(account),
				purple_chat_get_components(chat));
	} else if (conv) {
		purple_conversation_present(conv);
	}
}

static void
add_chat_cb(void *data, PurpleRequestFields *allfields)
{
	PurpleAccount *account;
	const char *alias, *name, *group;
	PurpleChat *chat;

			purple_blist_add_group(grp, NULL);
		}
		purple_blist_add_chat(chat, grp, NULL);
		purple_blist_alias_chat(chat, alias);
		purple_blist_node_set_bool((PurpleBlistNode*)chat, "gnt-autojoin", autojoin);
		if (autojoin) {
			join_chat(chat);
		}
	}
}

static void
finch_request_add_chat(PurpleAccount *account, PurpleGroup *grp, const char *alias, const char *name)

	GntTree *tree = GNT_TREE(ggblist->tree);
	PurpleBlistNode *node = gnt_tree_get_selection_data(tree);

	if (!node)
		return;

	if (PURPLE_BLIST_NODE_IS_CONTACT(node))
		node = (PurpleBlistNode*)purple_contact_get_priority_buddy((PurpleContact*)node);

	if (PURPLE_BLIST_NODE_IS_BUDDY(node))
	{

		}
		finch_conversation_set_active(conv);
	}
	else if (PURPLE_BLIST_NODE_IS_CHAT(node))
	{
		join_chat((PurpleChat*)node);
	}
}

static void
context_menu_callback(GntMenuItem *item, gpointer data)