diff options
| -rw-r--r-- | docs/example.mana | 1 | ||||
| -rw-r--r-- | mana.files | 1 | ||||
| -rw-r--r-- | src/gui/serverdialog.cpp | 12 | ||||
| -rwxr-xr-x | update-creator.sh | 1 |
4 files changed, 11 insertions, 4 deletions
diff --git a/docs/example.mana b/docs/example.mana index 795d8d40..aa87b96f 100644 --- a/docs/example.mana +++ b/docs/example.mana @@ -13,6 +13,7 @@ filename / path as a command line parameter <option name="appShort" value="mana"/> <option name="appIcon" value="icons/mana.png"/> <option name="loginMusic" value="Magick - Real.ogg"/> + <option name="onlineServerList" value="http://manasource.org/serverlist.xml"/> <option name="defaultServer" value="testing.manasource.org"/> <option name="defaultPort" value="9601"/> <option name="defaultUpdateHost" value="http://updates.themanaworld.org"/> @@ -26,6 +26,7 @@ ./data/icons/Makefile.am ./data/Makefile.am ./docs/clientupdates.txt +./docs/example.mana ./docs/FAQ.txt ./docs/HACKING.txt ./docs/items.txt diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp index f439420b..3d6c0b6f 100644 --- a/src/gui/serverdialog.cpp +++ b/src/gui/serverdialog.cpp @@ -420,10 +420,14 @@ void ServerDialog::setFieldsReadOnly(const bool readOnly) void ServerDialog::downloadServerList() { - // try to load the configuration value for the onlineServerList - std::string listFile = config.getValue("onlineServerList", "void"); - // if there is no entry, try to load the file from the default updatehost - if (listFile == "void") + // Try to load the configuration value for the onlineServerList + std::string listFile = branding.getValue("onlineServerList", std::string()); + + if (listFile.empty()) + listFile = config.getValue("onlineServerList", std::string()); + + // Fall back to manasource.org when neither branding nor config set it + if (listFile.empty()) listFile = "http://manasource.org/serverlist.xml"; mDownload = new Net::Download(this, listFile, &downloadUpdate); diff --git a/update-creator.sh b/update-creator.sh index e0c5463f..edda5613 100755 --- a/update-creator.sh +++ b/update-creator.sh @@ -4,4 +4,5 @@ find -name \*.cpp \ -o -name \*.am \ -o -name \*.txt \ -o -name \*.xml \ + -o -name \*.mana \ | sort > mana.files |