From 7e42132fe49a22a6977097072625be7a210ef8aa Mon Sep 17 00:00:00 2001
From: Scott Sibley <ssibley@gmail.com>
Date: Sat, 18 Jun 2011 19:29:46 +0000
Subject: [PATCH] Temporary bug fix related to the Border module not getting
 along Pitbull4's Border module. This commit addresses
 Ticket 20, but further debugging is needed as this fix is
 not ideal.

---
 Modules/Appearance/Appearance.lua |    2 +-
 Modules/Border/Border.lua         |    9 +++++----
 StarTip.lua                       |    4 +---
 StarTip.toc                       |    2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Modules/Appearance/Appearance.lua b/Modules/Appearance/Appearance.lua
index 0040c5b..fa2a432 100644
--- a/Modules/Appearance/Appearance.lua
+++ b/Modules/Appearance/Appearance.lua
@@ -358,7 +358,7 @@ function mod:OnInitialize()
 	ShoppingTooltip1:Hide()
 	ShoppingTooltip2:Show()
 	ShoppingTooltip2:Hide()
-	
+
 	if type(self.db.profile.edgeFile) == "number" then
 		local list = LSM:List("border")
 		if list[self.db.profile.edgeFile] then
diff --git a/Modules/Border/Border.lua b/Modules/Border/Border.lua
index 0ddb753..059f82f 100644
--- a/Modules/Border/Border.lua
+++ b/Modules/Border/Border.lua
@@ -1,5 +1,5 @@
-local mod = StarTip:NewModule("Border")
-mod.name = "Border"
+local mod = _G.StarTip:NewModule("Borders")
+mod.name = "Borders"
 mod.toggled = true
 mod.defaultOff = false
 local L = StarTip.L
@@ -36,7 +36,7 @@ end
 
 local options = {}
 local optionsDefaults = {
-	add = {
+--[[	add = {
 		name = L["Add Border"],
 		desc = L["Add a border"],
 		type = "input",
@@ -63,6 +63,7 @@ local optionsDefaults = {
 		end,
 		order = 6
 	},
+]]
 }
 
 local function copy(tbl)
@@ -75,7 +76,7 @@ local function copy(tbl)
 end
 
 local function draw(widget)
-	GameTooltip:SetBackdropBorderColor(widget.r, widget.g, widget.b, widget.a)
+	GameTooltip:SetBackdropBorderColor(widget.r or 1, widget.g or 1, widget.b or 1, widget.a or 1)
 end
 
 function mod:CreateBorders()
diff --git a/StarTip.lua b/StarTip.lua
index 14e8314..e3ec04c 100644
--- a/StarTip.lua
+++ b/StarTip.lua
@@ -1,7 +1,5 @@
-_G["StarTip"] = LibStub("AceAddon-3.0"):NewAddon("StarTip: @project-version@", "AceConsole-3.0", "AceHook-3.0", "AceEvent-3.0", "AceTimer-3.0", "AceComm-3.0", "AceSerializer-3.0") 
+_G["StarTip"] = LibStub("AceAddon-3.0"):NewAddon("StarTip", "AceConsole-3.0", "AceHook-3.0", "AceEvent-3.0", "AceTimer-3.0", "AceComm-3.0", "AceSerializer-3.0") 
 StarTip.version = GetAddOnMetadata("StarTip", "Version") or ""
-StarTip.name = GetAddOnMetadata("StarTip", "Notes")
-StarTip.name = "StarTip " .. StarTip.version
 
 local LibDBIcon = LibStub("LibDBIcon-1.0")
 local LSM = _G.LibStub("LibSharedMedia-3.0")
diff --git a/StarTip.toc b/StarTip.toc
index 1cb1d98..d695056 100644
--- a/StarTip.toc
+++ b/StarTip.toc
@@ -6,7 +6,7 @@
 ## X-Category: Tooltip
 ## X-License: GPL v3
 ## X-Credits: ckknight for CowTip and DogTags
-## OptionalDeps: Ace3, LibScriptable-1.0, ResourceServer, kgPanels, Skada
+## OptionalDeps: Ace3, LibScriptable-1.0, kgPanels, Skada, Chatter, Recount
 ## SavedVariables: StarTipDB
 
 Libs\LibStub\LibStub.lua
-- 
1.7.9.5