Merge branch 'master' into strippedstripped1.1.10.16

Conflicts:
	data/fonts/mplus-1p-bold.ttf
	data/fonts/mplus-1p-regular.ttf

2 files changed, 7 insertions, 10 deletions

diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp
index 485e96e74..9a29ae204 100644
--- a/src/gui/widgets/chattab.cpp
+++ b/src/gui/widgets/chattab.cpp
@@ -281,21 +281,15 @@ void ChatTab::chatLog(std::string line, Own own,
         {
             if (getFlash() == 0)
             {
-                if (player_node)
-                {
-                    if (chatWindow && chatWindow->findHighlight(tmp.text))
-                        setFlash(2);
-                    else
-                        setFlash(1);
-                }
+                if (chatWindow && chatWindow->findHighlight(tmp.text))
+                    setFlash(2);
                 else
-                {
                     setFlash(1);
-                }
             }
         }
 
-        if (getAllowHighlight() && (this != getTabbedArea()->getSelectedTab()
+        if ((getAllowHighlight() || own == BY_GM)
+            && (this != getTabbedArea()->getSelectedTab()
             || (Client::getIsMinimized() || (!Client::getMouseFocused()
             && !Client::getInputFocused()))))
         {
diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h
index 3ad113b4c..af241d7c5 100644
--- a/src/gui/widgets/tabbedarea.h
+++ b/src/gui/widgets/tabbedarea.h
@@ -153,6 +153,9 @@ class TabbedArea : public gcn::TabbedArea, public gcn::WidgetListener
         bool getFollowDownScroll()
         { return mFollowDownScroll; }
 
+        void fixSize()
+        { adjustSize(); }
+
     private:
         typedef std::vector< std::pair<gcn::Tab*, gcn::Widget*> > TabContainer;