summaryrefslogtreecommitdiff
path: root/src/gui/setup.cpp
diff options
context:
space:
mode:
authorReid <reidyaro@gmail.com>2012-01-25 22:05:36 +0100
committerReid <reidyaro@gmail.com>2012-01-25 22:05:36 +0100
commit8b612abb42853a22c1a9545e2c9280d154646543 (patch)
treef466167087c2b2de4b8aa9e6d1d1986f72f84147 /src/gui/setup.cpp
parenta913dd41df61760de6ece552f941e002251ff54c (diff)
parentd340b5a27a8f3b05d1764da9c114f5f59bd0cd46 (diff)
downloadplus-8b612abb42853a22c1a9545e2c9280d154646543.tar.gz
plus-8b612abb42853a22c1a9545e2c9280d154646543.tar.bz2
plus-8b612abb42853a22c1a9545e2c9280d154646543.tar.xz
plus-8b612abb42853a22c1a9545e2c9280d154646543.zip
Merge branch 'master' of gitorious.org:manaplus/manaplus
Diffstat (limited to 'src/gui/setup.cpp')
-rw-r--r--src/gui/setup.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index d305824d5..bac474950 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011 The ManaPlus Developers
+ * Copyright (C) 2011-2012 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
@@ -201,7 +201,7 @@ void Setup::doCancel()
void Setup::activateTab(const std::string &name)
{
std::string tmp = gettext(name.c_str());
- mPanel->setSelectedTab(tmp);
+ mPanel->setSelectedTabByName(tmp);
/*
for (std::list<SetupTab*>::const_iterator it = mTabs.begin();
it != mTabs.end(); ++it)
@@ -212,7 +212,7 @@ void Setup::activateTab(const std::string &name)
logger->log("check tab: " + tab->getName());
if (tab->getName() == tmp)
{
- mPanel->setSelectedTab(name);
+ mPanel->setSelectedTabByName(name);
return;
}
}