diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2010-02-08 14:40:04 -0700 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2010-02-08 14:43:51 -0700 |
| commit | 8a31e96d8534d402db9cd48183c0b15732f7d95e (patch) | |
| tree | 885d83febf301c1289c3bf7f83bf9dca89e0347c /src/gui/windowmenu.cpp | |
| parent | bc5c031e43eff506c925682349dd2a52b89d6565 (diff) | |
| download | mana-8a31e96d8534d402db9cd48183c0b15732f7d95e.tar.gz mana-8a31e96d8534d402db9cd48183c0b15732f7d95e.tar.bz2 mana-8a31e96d8534d402db9cd48183c0b15732f7d95e.tar.xz mana-8a31e96d8534d402db9cd48183c0b15732f7d95e.zip | |
Merge PartyWindow and GuildWindow into SocialWindow
Diffstat (limited to 'src/gui/windowmenu.cpp')
| -rw-r--r-- | src/gui/windowmenu.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp index 460d12b4..e57f35fa 100644 --- a/src/gui/windowmenu.cpp +++ b/src/gui/windowmenu.cpp @@ -43,7 +43,7 @@ extern Window *setupWindow; extern Window *skillDialog; extern Window *specialsWindow; extern Window *statusWindow; -extern Window *guildWindow; +extern Window *socialWindow; WindowMenu::WindowMenu(): mEmotePopup(0) @@ -57,7 +57,7 @@ WindowMenu::WindowMenu(): N_("Inventory"), N_("Skills"), N_("Specials"), - N_("Guilds"), + N_("Social"), N_("Shortcut"), N_("Setup"), 0 @@ -127,9 +127,9 @@ void WindowMenu::action(const gcn::ActionEvent &event) { window = specialsWindow; } - else if (event.getId() == "Guilds") + else if (event.getId() == "Social") { - window = guildWindow; + window = socialWindow; } else if (event.getId() == "Shortcut") { |