2 files changed, 4 insertions, 45 deletions

diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index 6ec4d1e8..cc2c7d6a 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -22,7 +22,6 @@
 
 #include "graphics.h"
 
-#include "gui/chat.h"
 #include "gui/gui.h"
 #include "gui/palette.h"
 #include "gui/theme.h"
@@ -139,14 +138,6 @@ void AvatarListBox::mousePressed(gcn::MouseEvent &event)
         int y = event.getY();
         setSelected(y / getFont()->getHeight());
         distributeActionEvent();
-
-        if (event.getClickCount() == 2 && mListModel)
-        {
-            int selected = getSelected();
-            AvatarListModel *model = static_cast<AvatarListModel*>(mListModel);
-            chatWindow->addWhisperTab(model->getAvatarAt(selected)->getName(),
-                                      true);
-        }
     }
     // TODO: Add support for context menu
     else if (event.getButton() == gcn::MouseEvent::RIGHT)
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index 7648eb24..fb5105b2 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -255,46 +255,14 @@ void ItemContainer::mousePressed(gcn::MouseEvent &event)
 
         if (mSelectedIndex == index)
         {
-            if(event.getClickCount() == 2)
-            {
-                if (item->isEquipment())
-                {
-                    if (item->isEquipped())
-                        Net::getInventoryHandler()->unequipItem(item);
-                    else
-                        Net::getInventoryHandler()->equipItem(item);
-                }
-                else
-                    Net::getInventoryHandler()->useItem(item);
-
-            }
-            else
-            {
-                mSelectionStatus = SEL_DESELECTING;
-            }
+            mSelectionStatus = SEL_DESELECTING;
         }
         else if (item && item->getId())
         {
-           if(event.getClickCount() == 2)
-            {
-                if (item->isEquipment())
-                {
-                    if (item->isEquipped())
-                        Net::getInventoryHandler()->unequipItem(item);
-                    else
-                        Net::getInventoryHandler()->equipItem(item);
-                }
-                else
-                    Net::getInventoryHandler()->useItem(item);
+            setSelectedIndex(index);
+            mSelectionStatus = SEL_SELECTING;
+            itemShortcut->setItemSelected(item->getId());
 
-            }
-            else
-            {
-                setSelectedIndex(index);
-                mSelectionStatus = SEL_SELECTING;
-
-                itemShortcut->setItemSelected(item->getId());
-            }
             if (item->isEquipment())
                 outfitWindow->setItemSelected(item->getId());
         }