comparison src/gtkconv.c @ 10845:3d7311bde284

[gaim-migrate @ 12517] sf patch #1184976, from Richard Laager "This contact-izes the View Log in the conversation window correctly." Richard, you may want to double-check my changes to the for loop. committer: Tailor Script <[e-mail]>

10844:d1f7821c09f4

	GaimConvWindow *win = (GaimConvWindow *)data;
	GaimConversation *conv;
	GaimLogType type;
	const char *name;
	GaimAccount *account;
	GaimBuddy *buddy;

	conv = gaim_conv_window_get_active_conversation(win);

	if (gaim_conversation_get_type(conv) == GAIM_CONV_IM)
		type = GAIM_LOG_IM;

		return;

	name = gaim_conversation_get_name(conv);
	account = gaim_conversation_get_account(conv);

	buddy = gaim_find_buddy(account, name);
	if (buddy != NULL &&
	    buddy->node.parent != NULL &&
	    GAIM_BLIST_NODE_IS_CONTACT(buddy->node.parent)) {

		gaim_gtk_log_show_contact((GaimContact *)buddy->node.parent);
		return;
	}

	gaim_gtk_log_show(type, name, account);
}

static void

10845:3d7311bde284

	GaimConvWindow *win = (GaimConvWindow *)data;
	GaimConversation *conv;
	GaimLogType type;
	const char *name;
	GaimAccount *account;
	GSList *buddies, *cur;

	conv = gaim_conv_window_get_active_conversation(win);

	if (gaim_conversation_get_type(conv) == GAIM_CONV_IM)
		type = GAIM_LOG_IM;

		return;

	name = gaim_conversation_get_name(conv);
	account = gaim_conversation_get_account(conv);

	buddies = gaim_find_buddies(account, name);
	for (cur = buddies; cur != NULL; cur = cur->next)
	{
		GaimBlistNode *node = cur->data;
		if ((node != NULL) && (node->next != NULL))
		{
			gaim_gtk_log_show_contact((GaimContact *)node->parent);
			g_slist_free(buddies);
			return;
		}
	}
	g_slist_free(buddies);

	gaim_gtk_log_show(type, name, account);
}

static void