Merge branch 'master' of git@gitorious.org:tmw/mainline

5 files changed, 17 insertions, 8 deletions

diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index f1814d93..c0597a64 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -453,7 +453,7 @@ void ChatWindow::whisper(const std::string &nick,
 
     if (i != mWhispers.end())
         tab = i->second;
-    else if (config.getValue("whispertab", false))
+    else if (config.getValue("whispertab", true))
         tab = addWhisperTab(nick);
 
     if (tab)
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index 13bb884b..dd2e62dd 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -28,6 +28,8 @@ TabbedArea::TabbedArea() : gcn::TabbedArea()
 {
     mWidgetContainer->setOpaque(false);
     addWidgetListener(this);
+
+    widgetResized(NULL);
 }
 
 int TabbedArea::getNumberOfTabs() const
@@ -161,14 +163,20 @@ void TabbedArea::setSelectedTab(gcn::Tab *tab)
 
     if (newTab)
         newTab->setCurrent();
+
+    widgetResized(NULL);
 }
 
 void TabbedArea::widgetResized(const gcn::Event &event)
 {
-    int width = getWidth() - 2 * getFrameSize();
-    int height = getHeight() - 2 * getFrameSize() - mTabContainer->getHeight();
+    int width = getWidth() - 2 * getFrameSize()
+                - 2 * mWidgetContainer->getFrameSize();
+    int height = getHeight() - 2 * getFrameSize() - mWidgetContainer->getY()
+                 - 2 * mWidgetContainer->getFrameSize();
     mWidgetContainer->setSize(width, height);
+
     gcn::Widget *w = getCurrentWidget();
     if (w)
-        w->setSize(width, height);
+        w->setSize(width,
+                   height);
 }
diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h
index a64d855f..7944b5d5 100644
--- a/src/gui/widgets/tabbedarea.h
+++ b/src/gui/widgets/tabbedarea.h
@@ -101,8 +101,7 @@ class TabbedArea : public gcn::TabbedArea, public gcn::WidgetListener
         int getContainerHeight() const
         { return mWidgetContainer->getHeight(); }
 
-        void setSelectedTab(unsigned int index)
-        { gcn::TabbedArea::setSelectedTab(index); }
+        using gcn::TabbedArea::setSelectedTab;
 
         void setSelectedTab(gcn::Tab *tab);
 
diff --git a/src/main.cpp b/src/main.cpp
index 10145dfc..63ba2241 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1575,6 +1575,9 @@ int main(int argc, char *argv[])
     }
 
     delete guiPalette;
+#ifdef EATHENA_SUPPORT
+    delete network;
+#endif
 
     logger->log("Quitting");
     exitEngine();
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index 29c10900..80e9b350 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -543,8 +543,7 @@ void BeingHandler::handleMessage(MessageIn &msg)
 
             gmstatus = msg.readInt16();
             if (gmstatus & 0x80)
-                if (Player *player = dynamic_cast<Player*>(dstBeing))
-                    player->setGM(true);
+                player->setGM(true);
 
             if (msg.getId() == SMSG_PLAYER_UPDATE_1)
             {