~/forever/addon-api/source/1.60.1.70755

Interface/AddOns/Blizzard_FriendsFrame/Camelot/FriendsFrame.lua

1.60.1.70755 compared with 1.60.1.70707 · 2026-11-03 · +5 −12· view file

@@ -1738,7 +1738,7 @@ function FriendsFrame_UpdateFriendButton(button, elementData)
 					infoText = GetOnlineInfoText(accountInfo.gameAccountInfo.clientProgram, accountInfo.rafLinkType, accountInfo.gameAccountInfo.areaName);
 				end
 
-					C_Texture.SetTitleIconTexture(button.gameIcon, accountInfo.gameAccountInfo.clientProgram, Enum.TitleIconVersion.Medium);
+					C_Texture.SetTitleIconTexture(button.gameIcon, accountInfo.gameAccountInfo.clientProgram, Enum.TitleIconVersion.Medium, accountInfo.gameAccountInfo.subIcon);
 
 				local fadeIcon = (accountInfo.gameAccountInfo.clientProgram == BNET_CLIENT_WOW) and (accountInfo.gameAccountInfo.wowProjectID ~= WOW_PROJECT_ID);
 				if fadeIcon then
@@ -2054,12 +2054,12 @@ function FriendsListButtonMixin:OnEnter()
 				characterNameString = _G["FriendsTooltipGameAccount"..gameAccountIndex.."Name"];
 				gameAccountInfoString = _G["FriendsTooltipGameAccount"..gameAccountIndex.."Info"];
 				text = "";
-				if C_Texture.IsTitleIconTextureReady(gameAccountInfo.clientProgram, Enum.TitleIconVersion.Small) then
+				if C_Texture.IsTitleIconTextureReady(gameAccountInfo.clientProgram, Enum.TitleIconVersion.Small, gameAccountInfo.subIcon) then
 					C_Texture.GetTitleIconTexture(gameAccountInfo.clientProgram, Enum.TitleIconVersion.Small, function(success, texture)
 						if success then
 							text = BNet_GetClientEmbeddedTexture(texture, 32, 32, 0).." ";
 						end
-					end);
+					end, gameAccountInfo.subIcon);
 				end
 				if (gameAccountInfo.clientProgram == BNET_CLIENT_WOW) and (gameAccountInfo.wowProjectID == WOW_PROJECT_ID) then
 					if (gameAccountInfo.realmName == playerRealmName) and (gameAccountInfo.factionName == playerFactionGroup) then
@@ -2222,12 +2222,12 @@ function FriendsFrame_SetupTravelPassDropdown(friendIndex, attachedTo)
 				end
 			else
 				restriction = INVITE_RESTRICTION_CLIENT;
-				if C_Texture.IsTitleIconTextureReady(gameAccountInfo.clientProgram, Enum.TitleIconVersion.Small) then
+				if C_Texture.IsTitleIconTextureReady(gameAccountInfo.clientProgram, Enum.TitleIconVersion.Small, gameAccountInfo.subIcon) then
 					C_Texture.GetTitleIconTexture(gameAccountInfo.clientProgram, Enum.TitleIconVersion.Small, function(success, texture)
 						if success then
 							text = BNet_GetClientEmbeddedTexture(texture, 32, 32, 18);
 						end
-					end);
+					end, gameAccountInfo.subIcon);
 				end
 			end
 
@@ -2488,13 +2488,6 @@ function ContactsMenuMixin:Refresh()
 	self:SetupMenu(function(dropdown, rootDescription)
 		rootDescription:SetTag("CONTACTS_MENU");
 
-		local canUseBroadCastFrame = BNFeaturesEnabled() and BNConnected();
-		if canUseBroadCastFrame then
-			rootDescription:CreateButton(CONTACTS_MENU_BROADCAST_BUTTON_NAME, function()
-				self:GetParent().BroadcastFrame:ToggleFrame();
-			end);
-		end
-
 		rootDescription:CreateButton(CONTACTS_MENU_IGNORE_BUTTON_NAME, function()
 			FriendsFrame.IgnoreListWindow:ToggleFrame();
 		end);