comparison libpurple/server.c @ 25889:e2b193decaa5

explicit merge of '814d53152c168c9c4732b3d084260711d536fba6' and 'af375020001eed33302b471e7ee9dec6a478e824'

24844:94a47062819c

	if(prpl)
		prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);

	if(b && prpl_info && prpl_info->alias_buddy) {
		prpl_info->alias_buddy(gc, b->name, b->alias);
	}
}

void
serv_got_alias(PurpleConnection *gc, const char *who, const char *alias)

	account = purple_connection_get_account(gc);
	buddies = purple_find_buddies(account, who);

	while (buddies != NULL)
	{
		b = buddies->data;
		buddies = g_slist_delete_link(buddies, buddies);

		if((b->server_alias == NULL && alias == NULL) ||
		    (b->server_alias && alias && !strcmp(b->server_alias, alias)))
		{
			continue;
		}

		purple_blist_server_alias_buddy(b, alias);

		conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, b->name, account);
		if(conv != NULL && alias != NULL &&
		   who != NULL && strcmp(alias, who))
		{
			char *escaped = g_markup_escape_text(who, -1);
			char *escaped2 = g_markup_escape_text(alias, -1);

	account = purple_connection_get_account(gc);
	buddies = purple_find_buddies(account, who);

	while(buddies != NULL) {
		b = buddies->data;

		buddies = g_slist_delete_link(buddies, buddies);

		if((!b->alias && !alias) || (b->alias && alias && !strcmp(b->alias, alias)))
			continue;

		purple_blist_alias_buddy(b, alias);
	}
}

	if(prpl)
		prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);

	if(gc && og && ng) {
		if (prpl_info && prpl_info->group_buddy) {
			prpl_info->group_buddy(gc, b->name, og->name, ng->name);
		}
	}
}

void serv_add_permit(PurpleConnection *gc, const char *name)

25889:e2b193decaa5

	if(prpl)
		prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);

	if(b && prpl_info && prpl_info->alias_buddy) {
		prpl_info->alias_buddy(gc, purple_buddy_get_name(b), purple_buddy_get_local_buddy_alias(b));
	}
}

void
serv_got_alias(PurpleConnection *gc, const char *who, const char *alias)

	account = purple_connection_get_account(gc);
	buddies = purple_find_buddies(account, who);

	while (buddies != NULL)
	{
		const char *server_alias;

		b = buddies->data;
		buddies = g_slist_delete_link(buddies, buddies);

		server_alias = purple_buddy_get_server_alias(b);
		if((server_alias == NULL && alias == NULL) ||
		    (server_alias && alias && !strcmp(server_alias, alias)))
		{
			continue;
		}

		purple_blist_server_alias_buddy(b, alias);

		conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, purple_buddy_get_name(b), account);
		if(conv != NULL && alias != NULL &&
		   who != NULL && strcmp(alias, who))
		{
			char *escaped = g_markup_escape_text(who, -1);
			char *escaped2 = g_markup_escape_text(alias, -1);

	account = purple_connection_get_account(gc);
	buddies = purple_find_buddies(account, who);

	while(buddies != NULL) {
		const char *balias;
		b = buddies->data;

		buddies = g_slist_delete_link(buddies, buddies);

		balias = purple_buddy_get_local_buddy_alias(b);
		if((!balias && !alias) || (balias && alias && !strcmp(balias, alias)))
			continue;

		purple_blist_alias_buddy(b, alias);
	}
}

	if(prpl)
		prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);

	if(gc && og && ng) {
		if (prpl_info && prpl_info->group_buddy) {
			prpl_info->group_buddy(gc, purple_buddy_get_name(b),
			                       purple_group_get_name(og),
								   purple_group_get_name(ng));
		}
	}
}

void serv_add_permit(PurpleConnection *gc, const char *name)