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

4 files changed, 9 insertions, 9 deletions

diff --git a/src/gui/partywindow.cpp b/src/gui/partywindow.cpp
index 982898fb..cb514844 100644
--- a/src/gui/partywindow.cpp
+++ b/src/gui/partywindow.cpp
@@ -50,9 +50,9 @@ PartyWindow::PartyWindow() :
     setResizable(true);
     setSaveVisible(true);
     setCloseButton(true);
-    setMinWidth(200);
+    setMinWidth(212);
     setMinHeight(200);
-    setDefaultSize(590, 200, 200, 200);
+    setDefaultSize(590, 200, 212, 200);
 
     loadWindowState();
 }
diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp
index c98ecee4..f2231fca 100644
--- a/src/gui/widgets/tab.cpp
+++ b/src/gui/widgets/tab.cpp
@@ -63,7 +63,7 @@ static TabData const data[TAB_COUNT] = {
 ImageRect Tab::tabImg[TAB_COUNT];
 
 Tab::Tab() : gcn::Tab(),
-    mTabColor(guiPalette->getColor(Palette::TEXT))
+    mTabColor(&guiPalette->getColor(Palette::TEXT))
 {
     init();
 }
@@ -127,7 +127,7 @@ void Tab::draw(gcn::Graphics *graphics)
         {
             mode = TAB_SELECTED;
             // if tab is selected, it doesnt need to highlight activity
-            mLabel->setForegroundColor(mTabColor);
+            mLabel->setForegroundColor(*mTabColor);
             mHighlighted = false;
         }
         else if (mHighlighted)
@@ -137,7 +137,7 @@ void Tab::draw(gcn::Graphics *graphics)
         }
         else
         {
-            mLabel->setForegroundColor(mTabColor);
+            mLabel->setForegroundColor(*mTabColor);
         }
     }
 
@@ -163,7 +163,7 @@ void Tab::draw(gcn::Graphics *graphics)
     drawChildren(graphics);
 }
 
-void Tab::setTabColor(const gcn::Color &color)
+void Tab::setTabColor(const gcn::Color *color)
 {
     mTabColor = color;
 }
diff --git a/src/gui/widgets/tab.h b/src/gui/widgets/tab.h
index 134d5591..eea2586c 100644
--- a/src/gui/widgets/tab.h
+++ b/src/gui/widgets/tab.h
@@ -45,7 +45,7 @@ class Tab : public gcn::Tab
         /**
          * Set the normal color fo the tab's text.
          */
-        void setTabColor(const gcn::Color &color);
+        void setTabColor(const gcn::Color *color);
 
         /**
          * Set tab highlighted
@@ -64,7 +64,7 @@ class Tab : public gcn::Tab
         static int mInstances;         /**< Number of tab instances */
         static float mAlpha;
 
-        gcn::Color mTabColor;
+        const gcn::Color *mTabColor;
         bool mHighlighted;
 };
 
diff --git a/src/gui/widgets/whispertab.cpp b/src/gui/widgets/whispertab.cpp
index 17ee3fc4..23325108 100644
--- a/src/gui/widgets/whispertab.cpp
+++ b/src/gui/widgets/whispertab.cpp
@@ -35,7 +35,7 @@ WhisperTab::WhisperTab(const std::string &nick) :
     ChatTab(nick),
     mNick(nick)
 {
-    setTabColor(guiPalette->getColor(Palette::WHISPER));
+    setTabColor(&guiPalette->getColor(Palette::WHISPER));
 }
 
 WhisperTab::~WhisperTab()