Merge commit 'v1.2.1.22' into stripped

Conflicts:
	data/fonts/mplus-1p-bold.ttf
	data/fonts/mplus-1p-regular.ttf
	src/CMakeLists.txt
	src/Makefile.am
	src/guichan/gui.cpp

1 files changed, 5 insertions, 5 deletions

diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp
index 072a9cb85..4ee674325 100644
--- a/src/gui/skilldialog.cpp
+++ b/src/gui/skilldialog.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.
  *
@@ -362,7 +362,7 @@ void SkillDialog::loadSkills(const std::string &file)
         return;
 
     XML::Document doc(file);
-    xmlNodePtr root = doc.rootNode();
+    XmlNodePtr root = doc.rootNode();
 
     int setCount = 0;
     std::string setName;
@@ -370,7 +370,7 @@ void SkillDialog::loadSkills(const std::string &file)
     SkillListBox *listbox;
     SkillTab *tab;
 
-    if (!root || !xmlStrEqual(root->name, BAD_CAST "skills"))
+    if (!root || !xmlNameEqual(root, "skills"))
     {
         logger->log("Error loading skills file: %s", file.c_str());
 
@@ -413,7 +413,7 @@ void SkillDialog::loadSkills(const std::string &file)
 
     for_each_xml_child_node(set, root)
     {
-        if (xmlStrEqual(set->name, BAD_CAST "set"))
+        if (xmlNameEqual(set, "set"))
         {
             setCount++;
             setName = XML::getProperty(set, "name",
@@ -425,7 +425,7 @@ void SkillDialog::loadSkills(const std::string &file)
 
             for_each_xml_child_node(node, set)
             {
-                if (xmlStrEqual(node->name, BAD_CAST "skill"))
+                if (xmlNameEqual(node, "skill"))
                 {
                     int id = atoi(XML::getProperty(node, "id", "-1").c_str());
                     std::string name = XML::getProperty(node, "name",