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

Conflicts:
	src/being.cpp
	src/client.cpp
	src/commandhandler.cpp
	src/gui/setup_video.cpp
	src/gui/socialwindow.cpp
	src/gui/viewport.cpp
	src/gui/widgets/browserbox.cpp
	src/gui/widgets/itemcontainer.cpp
	src/imageparticle.cpp
	src/localplayer.cpp
	src/localplayer.h
	src/map.cpp
	src/net/tmwa/beinghandler.cpp
	src/particle.cpp
	src/particle.h
	src/player.cpp
	src/player.h

1 files changed, 4 insertions, 38 deletions

diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index c8c98d0a..d448c3c2 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -255,47 +255,13 @@ void ItemContainer::mousePressed(gcn::MouseEvent &event)
 
         if (mSelectedIndex == index)
         {
-            if(event.getClickCount() == 2)
-            {
-                if (item->getInfo().getEquippable())
-                {
-                    if (item->isEquipped())
-                        item->doEvent("doUnequip");
-                    else
-                        item->doEvent("doEquip");
-                }
-                else
-                    item->doEvent("doUse");
-
-            }
-            else
-            {
-                mSelectionStatus = SEL_DESELECTING;
-            }
+            mSelectionStatus = SEL_DESELECTING;
         }
         else if (item && item->getId())
         {
-            if(event.getClickCount() == 2)
-            {
-                if (item->getInfo().getEquippable())
-                {
-                    if (item->isEquipped())
-                        item->doEvent("doUnequip");
-                    else
-                        item->doEvent("doEquip");
-                }
-                else
-                {
-                    item->doEvent("doUse");
-                }
-            }
-            else
-            {
-                setSelectedIndex(index);
-                mSelectionStatus = SEL_SELECTING;
-
-                itemShortcut->setItemSelected(item->getId());
-            }
+            setSelectedIndex(index);
+            mSelectionStatus = SEL_SELECTING;
+            itemShortcut->setItemSelected(item->getId());
 
             if (item->getInfo().getEquippable())
                 outfitWindow->setItemSelected(item->getId());