# HG changeset patch
# User Flick
# Date 1305048731 25200
# Node ID c5b945c4209c258f1c83e2beb0c8f5036b6ed1f6
# Parent  d2e55b61e5e6d96b515db2a9b6aef862f3b7b5af# Parent  fc79c85ab7a5943314922df939e3a7285f753b0e
Merge 1.1 beta 7 into stable

diff -r d2e55b61e5e6 -r c5b945c4209c .hgtags
--- a/.hgtags	Fri May 06 15:52:21 2011 -0700
+++ b/.hgtags	Tue May 10 10:32:11 2011 -0700
@@ -4,3 +4,4 @@
 47818b3938c912c19018419cb5738d4013107167 1.1 beta 4
 455ef506f9695045737410a6529c9c6eb7d33022 1.1 beta 5
 b2e401183d36cd1283df64eef68a92a9ce08cc46 1.1 beta 6
+8fde9da2165208725cc960d54d4656e5a7d74aec 1.1 beta 7
diff -r d2e55b61e5e6 -r c5b945c4209c ActionButton.lua
--- a/ActionButton.lua	Fri May 06 15:52:21 2011 -0700
+++ b/ActionButton.lua	Tue May 10 10:32:11 2011 -0700
@@ -123,7 +123,7 @@
 
 local _onReceiveDrag = -- function(self, button, kind, value, ...)
 [[
-  if kind ~= "spell" and kind ~= "item" and kind ~= "macro" and kind ~= "flyout" then
+  if kind ~= "spell" and kind ~= "item" and kind ~= "macro" and kind ~= "flyout" and kind ~= "equipmentset" and kind ~= "companion" then
     return kind, value, ...
   else
     if showgrid_event and showgrid_event > 0 then
@@ -158,6 +158,7 @@
   "PLAYER_TARGET_CHANGED",
   "TRADE_SKILL_SHOW",
   "TRADE_SKILL_CLOSE",
+  "ARCHAEOLOGY_CLOSED",
   "PLAYER_ENTER_COMBAT",
   "PLAYER_LEAVE_COMBAT",
   "START_AUTOREPEAT_SPELL",
@@ -746,7 +747,8 @@
 function Action:TRADE_SKILL_SHOW()
   self:UpdateCheckedState()
 end
-Action.TRADE_SKILL_CLOSE = Action.TRADE_SKILL_CLOSE
+Action.TRADE_SKILL_CLOSE = Action.TRADE_SKILL_SHOW
+Action.ARCHAEOLOGY_CLOSED = Action.TRADE_SKILL_SHOW
 
 function Action:UNIT_ENTERED_VEHICLE(event,unit)
   if unit == "player" then