Merge branch 'master' of gitorious.org:mana/mana

Conflicts:
	src/being.cpp

1 files changed, 4 insertions, 3 deletions

diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 9c5f138e..ed008e63 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -220,19 +220,20 @@ void InventoryWindow::mouseClicked(gcn::MouseEvent &event)
          */
         const int mx = event.getX() + getX();
         const int my = event.getY() + getY();
-        viewport->showPopup(mx, my, item);
+        viewport->showPopup(this, mx, my, item);
     }
 
     if (event.getButton() == gcn::MouseEvent::LEFT)
     {
-        if (storageWindow && keyboard.isKeyActive(keyboard.KEY_EMOTE))
+        if (StorageWindow::isActive() &&
+            keyboard.isKeyActive(keyboard.KEY_EMOTE))
         {
             Item *item = mItems->getSelectedItem();
 
             if(!item)
                 return;
 
-            storageWindow->addStore(item, item->getQuantity());
+            StorageWindow::addStore(item, item->getQuantity());
         }
     }
 }