Merge branch 'master' into stripped

Conflicts:
	configure.ac
	data/Makefile.am
	data/fonts/liberationsans-bold.ttf
	data/fonts/liberationsans.ttf
	data/fonts/liberationsansmono-bold.ttf
	data/fonts/liberationsansmono.ttf
	data/themes/redandblack/CMakeLists.txt
	data/themes/redandblack/Makefile.am
	po/cs.po
	po/de.po
	po/es.po
	po/fi.po
	po/fr.po
	po/id.po
	po/ja.po
	po/manaplus.pot
	po/nl_BE.po
	po/pl.po
	po/pt.po
	po/pt_BR.po
	po/ru.po
	po/zh_CN.po
	src/guichan/color.cpp
	src/guichan/defaultfont.cpp
	src/guichan/focushandler.cpp
	src/guichan/include/guichan/actionlistener.hpp
	src/guichan/include/guichan/deathlistener.hpp
	src/guichan/include/guichan/focushandler.hpp
	src/guichan/include/guichan/focuslistener.hpp
	src/guichan/include/guichan/graphics.hpp
	src/guichan/include/guichan/keylistener.hpp
	src/guichan/include/guichan/listmodel.hpp
	src/guichan/include/guichan/mouselistener.hpp
	src/guichan/include/guichan/sdl/sdlpixel.hpp
	src/guichan/include/guichan/widget.hpp
	src/guichan/include/guichan/widgetlistener.hpp
	src/guichan/include/guichan/widgets/listbox.hpp
	src/guichan/include/guichan/widgets/slider.hpp
	src/guichan/sdl/sdlgraphics.cpp
	src/guichan/sdl/sdlimage.cpp
	src/guichan/widgets/scrollarea.cpp
	src/guichan/widgets/slider.cpp
	src/guichan/widgets/tabbedarea.cpp
	src/guichan/widgets/textbox.cpp
	src/guichan/widgets/window.cpp
	src/net/manaserv/attributes.cpp
	src/net/manaserv/beinghandler.cpp
	src/net/manaserv/charhandler.cpp
	src/net/manaserv/gamehandler.h
	src/net/manaserv/inventoryhandler.cpp
	src/net/manaserv/inventoryhandler.h
	src/net/manaserv/itemhandler.cpp
	src/net/manaserv/loginhandler.cpp
	src/net/manaserv/network.cpp

1 files changed, 19 insertions, 0 deletions

diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index 85fd215ac..3a09810d0 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -569,6 +569,25 @@ void Theme::fillFontsList(std::vector<std::string> &list)
     PHYSFS_permitSymbolicLinks(0);
 }
 
+void Theme::fillSoundsList(std::vector<std::string> &list)
+{
+    char **skins = PHYSFS_enumerateFiles(
+        branding.getStringValue("systemsounds").c_str());
+
+    for (char **i = skins; *i; i++)
+    {
+        if (!PHYSFS_isDirectory((
+            branding.getStringValue("systemsounds") + *i).c_str()))
+        {
+            std::string str = *i;
+            if (findCutLast(str, ".ogg"))
+                list.push_back(str);
+        }
+    }
+
+    PHYSFS_freeList(skins);
+}
+
 void Theme::selectSkin()
 {
     prepareThemePath();