diff options
| author | Bertram <bertram@cegetel.net> | 2010-03-03 23:36:37 +0100 |
|---|---|---|
| committer | Bertram <bertram@cegetel.net> | 2010-03-03 23:36:37 +0100 |
| commit | 8cc31b582f372238ce6bd2c86888d312cf1fe5b2 (patch) | |
| tree | 8db5f864348d08a05b8533c7ede58e76741a98f8 /src/gui/socialwindow.cpp | |
| parent | b1845e9e081df1fc77d9bcbed3ab95792d6ba682 (diff) | |
| parent | d564943867452ad76e6d313a28870e640715dded (diff) | |
| download | mana-8cc31b582f372238ce6bd2c86888d312cf1fe5b2.tar.gz mana-8cc31b582f372238ce6bd2c86888d312cf1fe5b2.tar.bz2 mana-8cc31b582f372238ce6bd2c86888d312cf1fe5b2.tar.xz mana-8cc31b582f372238ce6bd2c86888d312cf1fe5b2.zip | |
Merge branch 'master' of gitorious.org:mana/mana
Conflicts:
src/being.cpp
Diffstat (limited to 'src/gui/socialwindow.cpp')
| -rw-r--r-- | src/gui/socialwindow.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp index 48019bd0..26184cae 100644 --- a/src/gui/socialwindow.cpp +++ b/src/gui/socialwindow.cpp @@ -98,6 +98,8 @@ public: { setCaption(guild->getName()); + setTabColor(&guiPalette->getColor(Palette::GUILD)); + mList = new AvatarListBox(guild); mScroll = new ScrollArea(mList); @@ -161,6 +163,8 @@ public: { setCaption(party->getName()); + setTabColor(&guiPalette->getColor(Palette::PARTY)); + mList = new AvatarListBox(party); mScroll = new ScrollArea(mList); |