From 00bd136a2700586f646290ed44ba8fabd82f8000 Mon Sep 17 00:00:00 2001
From: Steven Jackson <failcoder@gmail.com>
Date: Sat, 12 Jul 2014 02:02:24 -0500
Subject: [PATCH] updates

---
 .../SVUI/packages/henchmen/common/minions.lua      |    2 +-
 Interface/AddOns/SVUI/packages/tip/SVTip.lua       |   14 +++++++-------
 Interface/AddOns/SVUI/packages/unit/SVUnit.lua     |    4 ++--
 Interface/AddOns/SVUI/scripts/_load.xml            |    1 +
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Interface/AddOns/SVUI/packages/henchmen/common/minions.lua b/Interface/AddOns/SVUI/packages/henchmen/common/minions.lua
index 8e64e8b..c94490c 100644
--- a/Interface/AddOns/SVUI/packages/henchmen/common/minions.lua
+++ b/Interface/AddOns/SVUI/packages/henchmen/common/minions.lua
@@ -187,7 +187,7 @@ function MOD:LoadMailMinions()
 	SVUI_GetMailButton:SetScript("OnLeave",function()GameTooltip:Hide()end)
 	SVUI_GetMailButton:SetScript("OnEvent",function(l,m,h,n,o,p)
 		if m=="UI_ERROR_MESSAGE"then 
-			if h==ERR_INV_FULL then 
+			if h==ERR_INV_FULL or h==ERR_ITEM_MAX_COUNT then 
 				StopOpeningMail("Your bags are too full!")
 			end 
 		end 
diff --git a/Interface/AddOns/SVUI/packages/tip/SVTip.lua b/Interface/AddOns/SVUI/packages/tip/SVTip.lua
index 2d6f54d..af6b883 100644
--- a/Interface/AddOns/SVUI/packages/tip/SVTip.lua
+++ b/Interface/AddOns/SVUI/packages/tip/SVTip.lua
@@ -50,8 +50,8 @@ local playerGUID = UnitGUID("player");
 local targetList, inspectCache = {}, {};
 local NIL_COLOR = { r = 1, g = 1, b = 1 };
 local TAPPED_COLOR = { r = .6, g = .6, b = .6 };
-local SKULL_ICON = "|TInterface\\TARGETINGFRAME\\UI-TargetingFrame-Skull.blp:20:20|t";
-local TAMABLE_INDICATOR = "|TInterface\\PetPaperDollFrame\\PetStable-DietIcon.blp:20:20|t |cffFFFF00Tamable|r";
+local SKULL_ICON = "|TInterface\\TARGETINGFRAME\\UI-TargetingFrame-Skull.blp:16:16|t";
+local TAMABLE_INDICATOR = "|TInterface\\PetPaperDollFrame\\PetStable-DietIcon.blp:16:16:0:0:64:64:4:60:4:60|t |cffFFFF00Tamable|r";
 local tooltips = {
 	GameTooltip, ItemRefTooltip, ItemRefShoppingTooltip1, 
 	ItemRefShoppingTooltip2, ItemRefShoppingTooltip3, AutoCompleteBox, 
@@ -300,6 +300,7 @@ local function tiplevel(this, start)
 end
 
 local _hook_GameTooltip_OnTooltipSetUnit = function(self)
+	GameTooltip.mini.text:SetText("")
 	local unit = select(2, self:GetUnit())
 	local TamablePet;
 	if self:GetOwner()  ~= UIParent and MOD.db.visibility.unitFrames  ~= "NONE" then 
@@ -347,12 +348,12 @@ local _hook_GameTooltip_OnTooltipSetUnit = function(self)
 			-- GameTooltip.mini.text:SetText(L["AFK"])
 			-- GameTooltip.mini.text:SetTextColor(1, 0, 0)
 			-- GameTooltip:SetMiniColor(1, 1, 0)
-			unitName = unitName .. ""
+			unitName = unitName .. " " .. L["AFK"]
 		elseif(UnitIsDND(unit)) then
 			-- GameTooltip.mini.text:SetText(L["DND"])
 			-- GameTooltip.mini.text:SetTextColor(1, 0, 0)
 			-- GameTooltip:SetMiniColor(1, 1, 0)
-			unitName = unitName .. ""
+			unitName = unitName .. " " .. L["DND"]
 		end
 
 		GameTooltipTextLeft1:SetFormattedText("|c%s%s|r", colors.colorStr, unitName)
@@ -647,10 +648,9 @@ end
 
 local _hook_OnTipShow = function(self)
 	local shown = self.mini:IsShown()
-	if(self.mini.text ~= "" and not shown) then
+	self.mini:Hide()
+	if(self.mini.text:GetText() ~= "" and not shown) then
 		self.mini:Show()
-	elseif(shown) then
-		self.mini:Hide()
 	end
 end
 
diff --git a/Interface/AddOns/SVUI/packages/unit/SVUnit.lua b/Interface/AddOns/SVUI/packages/unit/SVUnit.lua
index 3c7f616..654add2 100644
--- a/Interface/AddOns/SVUI/packages/unit/SVUnit.lua
+++ b/Interface/AddOns/SVUI/packages/unit/SVUnit.lua
@@ -318,7 +318,7 @@ local RefreshUnitMedia = function(self)
 		end
 		if(self.RaidDebuffs) then
 		 	local rdebuffs = self.RaidDebuffs;
-            if db.rdebuffs.enable then
+            if unitDB.rdebuffs.enable then
                 rdebuffs.count:SetFontTemplate(CURRENT_AURABAR_FONT, db.auraFontSize, db.auraFontOutline)
                 rdebuffs.time:SetFontTemplate(CURRENT_AURABAR_FONT, db.auraFontSize, db.auraFontOutline)
             end
@@ -729,7 +729,7 @@ do
 				frame = self:SpawnGroupHeader(SVUI_UnitFrameParent, filter, "SVUI_"..realName, template1, header, template2)
 				frame.___key = header
 				frame.Update = self.HeaderUpdate[header]
-				frame.MediaUpdate = GroupMediaUpdate
+				frame.MediaUpdate = RefreshUnitMedia
 			else
 				frame = CreateFrame("Frame", "SVUI_"..realName, SVUI_UnitFrameParent, "SecureHandlerStateTemplate")
 				frame.subunits = {}
diff --git a/Interface/AddOns/SVUI/scripts/_load.xml b/Interface/AddOns/SVUI/scripts/_load.xml
index 818a57f..8effc80 100644
--- a/Interface/AddOns/SVUI/scripts/_load.xml
+++ b/Interface/AddOns/SVUI/scripts/_load.xml
@@ -8,4 +8,5 @@
 	<Script file='totems.lua'/>
 	<Script file='raid.lua'/>
 	<Script file='reactions.lua'/>
+	<Script file='pvp.lua'/>
 </Ui>
\ No newline at end of file
-- 
1.7.9.5