Merge branch 'eathena/master'

Conflicts:
	A lot of files.

1 files changed, 7 insertions, 5 deletions

diff --git a/src/gui/trade.h b/src/gui/trade.h
index bde0481c..4c215ba6 100644
--- a/src/gui/trade.h
+++ b/src/gui/trade.h
@@ -91,11 +91,6 @@ class TradeWindow : public Window, gcn::ActionListener, gcn::SelectionListener
          * Increase quantity of an item.
          */
         void increaseQuantity(int index, bool own, int quantity);
-
-        /**
-         * Set trade Button disabled
-         */
-        void setTradeButton(bool enabled);
 #endif
 
         /**
@@ -123,6 +118,12 @@ class TradeWindow : public Window, gcn::ActionListener, gcn::SelectionListener
          */
         void action(const gcn::ActionEvent &event);
 
+        /**
+         * Closes the Trade Window, as well as telling the server that the
+         * window has been closed.
+         */
+        void close();
+
     private:
 #ifdef TMWSERV_SUPPORT
         enum Status
@@ -152,6 +153,7 @@ class TradeWindow : public Window, gcn::ActionListener, gcn::SelectionListener
         gcn::Label *mMoneyLabel;
         gcn::Button *mTradeButton;
 #ifdef EATHENA_SUPPORT
+        gcn::Button *mAddButton;
         gcn::Button *mOkButton;
 #endif
         gcn::TextField *mMoneyField;