Skip to content

Commit 317f9bc

Browse files
committed
Update TOC and Ace3 libs
1 parent e817952 commit 317f9bc

File tree

5 files changed

+39
-18
lines changed

5 files changed

+39
-18
lines changed

EnhancedRaidFrames.toc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Interface: 11507, 50500, 110200
1+
## Interface: 11507, 50501, 110205
22
## Title: Enhanced Raid Frames
33
## Notes: Enhances the Blizzard raid frames with configurable Buff/Debuff indicators
44
## IconTexture: Interface\Icons\spell_holy_borrowedtime

Libs/AceComm-3.0/ChatThrottleLib.lua

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
-- LICENSE: ChatThrottleLib is released into the Public Domain
2424
--
2525

26-
local CTL_VERSION = 29
26+
local CTL_VERSION = 31
2727

2828
local _G = _G
2929

@@ -232,9 +232,15 @@ function ChatThrottleLib:Init()
232232
-- Use secure hooks as of v16. Old regular hook support yanked out in v21.
233233
self.securelyHooked = true
234234
--SendChatMessage
235-
hooksecurefunc("SendChatMessage", function(...)
236-
return ChatThrottleLib.Hook_SendChatMessage(...)
237-
end)
235+
if _G.C_ChatInfo and _G.C_ChatInfo.SendChatMessage then
236+
hooksecurefunc(_G.C_ChatInfo, "SendChatMessage", function(...)
237+
return ChatThrottleLib.Hook_SendChatMessage(...)
238+
end)
239+
else
240+
hooksecurefunc("SendChatMessage", function(...)
241+
return ChatThrottleLib.Hook_SendChatMessage(...)
242+
end)
243+
end
238244
--SendAddonMessage
239245
hooksecurefunc(_G.C_ChatInfo, "SendAddonMessage", function(...)
240246
return ChatThrottleLib.Hook_SendAddonMessage(...)
@@ -252,9 +258,15 @@ function ChatThrottleLib:Init()
252258
-- v29: Hook BNSendGameData for traffic logging
253259
if not self.securelyHookedBNGameData then
254260
self.securelyHookedBNGameData = true
255-
hooksecurefunc("BNSendGameData", function(...)
256-
return ChatThrottleLib.Hook_BNSendGameData(...)
257-
end)
261+
if _G.C_BattleNet and _G.C_BattleNet.SendGameData then
262+
hooksecurefunc(_G.C_BattleNet, "SendGameData", function(...)
263+
return ChatThrottleLib.Hook_BNSendGameData(...)
264+
end)
265+
else
266+
hooksecurefunc("BNSendGameData", function(...)
267+
return ChatThrottleLib.Hook_BNSendGameData(...)
268+
end)
269+
end
258270
end
259271

260272
self.nBypass = 0
@@ -541,7 +553,7 @@ function ChatThrottleLib:SendChatMessage(prio, prefix, text, chattype, languag
541553

542554
-- Check if there's room in the global available bandwidth gauge to send directly
543555
if not self.bQueueing and nSize < self:UpdateAvail() then
544-
local sendResult = PerformSend(_G.SendChatMessage, text, chattype, language, destination)
556+
local sendResult = PerformSend(_G.C_ChatInfo.SendChatMessage or _G.SendChatMessage, text, chattype, language, destination)
545557

546558
if not IsThrottledSendResult(sendResult) then
547559
local didSend = (sendResult == SendAddonMessageResult.Success)
@@ -561,7 +573,7 @@ function ChatThrottleLib:SendChatMessage(prio, prefix, text, chattype, languag
561573

562574
-- Message needs to be queued
563575
local msg = NewMsg()
564-
msg.f = _G.SendChatMessage
576+
msg.f = _G.C_ChatInfo.SendChatMessage or _G.SendChatMessage
565577
msg[1] = text
566578
msg[2] = chattype or "SAY"
567579
msg[3] = language
@@ -642,7 +654,8 @@ function ChatThrottleLib:SendAddonMessageLogged(prio, prefix, text, chattype, ta
642654
end
643655

644656
local function BNSendGameDataReordered(prefix, text, _, gameAccountID)
645-
return _G.BNSendGameData(gameAccountID, prefix, text)
657+
local bnSendFunc = _G.C_BattleNet and _G.C_BattleNet.SendGameData or _G.BNSendGameData
658+
return bnSendFunc(gameAccountID, prefix, text)
646659
end
647660

648661
function ChatThrottleLib:BNSendGameData(prio, prefix, text, chattype, gameAccountID, queueName, callbackFn, callbackArg)

Libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
--- AceConfigDialog-3.0 generates AceGUI-3.0 based windows based on option tables.
22
-- @class file
33
-- @name AceConfigDialog-3.0
4-
-- @release $Id: AceConfigDialog-3.0.lua 1351 2024-07-24 18:23:24Z funkehdude $
4+
-- @release $Id: AceConfigDialog-3.0.lua 1372 2025-10-05 05:38:34Z nevcairiel $
55

66
local LibStub = LibStub
77
local gui = LibStub("AceGUI-3.0")
88
local reg = LibStub("AceConfigRegistry-3.0")
99

10-
local MAJOR, MINOR = "AceConfigDialog-3.0", 87
10+
local MAJOR, MINOR = "AceConfigDialog-3.0", 89
1111
local AceConfigDialog, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
1212

1313
if not AceConfigDialog then return end
@@ -517,7 +517,7 @@ local function OptionOnMouseOver(widget, event)
517517

518518
if descStyle and descStyle ~= "tooltip" then return end
519519

520-
tooltip:SetText(name, 1, .82, 0, true)
520+
tooltip:SetText(name, 1, .82, 0, 1, true)
521521

522522
if opt.type == "multiselect" then
523523
tooltip:AddLine(user.text, 0.5, 0.5, 0.8, true)
@@ -526,7 +526,7 @@ local function OptionOnMouseOver(widget, event)
526526
tooltip:AddLine(desc, 1, 1, 1, true)
527527
end
528528
if type(usage) == "string" then
529-
tooltip:AddLine("Usage: "..usage, NORMAL_FONT_COLOR.r, NORMAL_FONT_COLOR.g, NORMAL_FONT_COLOR.b, true)
529+
tooltip:AddLine(usage, NORMAL_FONT_COLOR.r, NORMAL_FONT_COLOR.g, NORMAL_FONT_COLOR.b, true)
530530
end
531531

532532
tooltip:Show()
@@ -1506,7 +1506,7 @@ local function TreeOnButtonEnter(widget, event, uniquevalue, button)
15061506
tooltip:SetPoint("LEFT",button,"RIGHT")
15071507
end
15081508

1509-
tooltip:SetText(name, 1, .82, 0, true)
1509+
tooltip:SetText(name, 1, .82, 0, 1, true)
15101510

15111511
if type(desc) == "string" then
15121512
tooltip:AddLine(desc, 1, 1, 1, true)

Libs/AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@ Support functions
1919
-------------------------------------------------------------------------------]]
2020
if not AceGUIEditBoxInsertLink then
2121
-- upgradeable hook
22-
hooksecurefunc("ChatEdit_InsertLink", function(...) return _G.AceGUIEditBoxInsertLink(...) end)
22+
if ChatFrameUtil and ChatFrameUtil.InsertLink then
23+
hooksecurefunc(ChatFrameUtil, "InsertLink", function(...) return _G.AceGUIEditBoxInsertLink(...) end)
24+
elseif ChatEdit_InsertLink then
25+
hooksecurefunc("ChatEdit_InsertLink", function(...) return _G.AceGUIEditBoxInsertLink(...) end)
26+
end
2327
end
2428

2529
function _G.AceGUIEditBoxInsertLink(text)

Libs/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,11 @@ Support functions
1616

1717
if not AceGUIMultiLineEditBoxInsertLink then
1818
-- upgradeable hook
19-
hooksecurefunc("ChatEdit_InsertLink", function(...) return _G.AceGUIMultiLineEditBoxInsertLink(...) end)
19+
if ChatFrameUtil and ChatFrameUtil.InsertLink then
20+
hooksecurefunc(ChatFrameUtil, "InsertLink", function(...) return _G.AceGUIMultiLineEditBoxInsertLink(...) end)
21+
elseif ChatEdit_InsertLink then
22+
hooksecurefunc("ChatEdit_InsertLink", function(...) return _G.AceGUIMultiLineEditBoxInsertLink(...) end)
23+
end
2024
end
2125

2226
function _G.AceGUIMultiLineEditBoxInsertLink(text)

0 commit comments

Comments
 (0)