Merge branch '0.5' of gitorious.org:mana/mana

Conflicts:
	src/being.cpp
	src/client.cpp
	src/commandhandler.cpp
	src/gui/setup_video.cpp
	src/gui/socialwindow.cpp
	src/gui/viewport.cpp
	src/gui/widgets/browserbox.cpp
	src/gui/widgets/itemcontainer.cpp
	src/imageparticle.cpp
	src/localplayer.cpp
	src/localplayer.h
	src/map.cpp
	src/net/tmwa/beinghandler.cpp
	src/particle.cpp
	src/particle.h
	src/player.cpp
	src/player.h

1 files changed, 15 insertions, 11 deletions

diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp
index 588ce5e7..b4321b25 100644
--- a/src/gui/socialwindow.cpp
+++ b/src/gui/socialwindow.cpp
@@ -140,7 +140,7 @@ public:
                                         mGuild->getName().c_str()))
             mConfirmDialog = NULL;
         }
-        else if (event.getId() == "~yes")
+        else if (event.getId() == "no")
         {
             mConfirmDialog = NULL;
         }
@@ -180,7 +180,7 @@ public:
     {
         setCaption(party->getName());
 
-        setTabColor(&Theme::getThemeColor(Theme::PARTY));
+        setTabColor(&Theme::getThemeColor(Theme::PARTY_SOCIAL_TAB));
 
         mList = new AvatarListBox(party);
         mScroll = new ScrollArea(mList);
@@ -219,7 +219,7 @@ public:
                                         mParty->getName().c_str()))
             mConfirmDialog = NULL;
         }
-        else if (event.getId() == "~yes")
+        else if (event.getId() == "no")
         {
             mConfirmDialog = NULL;
         }
@@ -498,10 +498,12 @@ void SocialWindow::action(const gcn::ActionEvent &event)
                             "shorter name."));
             return;
         }
-
-        Net::getGuildHandler()->create(name);
-        SERVER_NOTICE(strprintf(_("Creating guild called %s."),
-                                            name.c_str()))
+        else if (!name.empty())
+        {
+            Net::getGuildHandler()->create(name);
+            SERVER_NOTICE(strprintf(_("Creating guild called %s."),
+                                    name.c_str()));
+        }
 
         mGuildCreateDialog = NULL;
     }
@@ -519,10 +521,12 @@ void SocialWindow::action(const gcn::ActionEvent &event)
                             "shorter name."));
             return;
         }
-
-        Net::getPartyHandler()->create(name);
-        SERVER_NOTICE(strprintf(_("Creating party called %s."),
-                                            name.c_str()));
+        else if (!name.empty())
+        {
+            Net::getPartyHandler()->create(name);
+            SERVER_NOTICE(strprintf(_("Creating party called %s."),
+                                    name.c_str()));
+        }
 
         mPartyCreateDialog = NULL;
     }