diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2006-08-13 10:20:19 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2006-08-13 10:20:19 +0000 |
| commit | d3385829ca6f7d52e21706b25b14fe1083cfe984 (patch) | |
| tree | aea368b2434a49864b33183f95b6aae36abef3b7 /src/gui/updatewindow.cpp | |
| parent | 7d287027babe615e01ddcf20edc1057f7d778c58 (diff) | |
| download | mana-d3385829ca6f7d52e21706b25b14fe1083cfe984.tar.gz mana-d3385829ca6f7d52e21706b25b14fe1083cfe984.tar.bz2 mana-d3385829ca6f7d52e21706b25b14fe1083cfe984.tar.xz mana-d3385829ca6f7d52e21706b25b14fe1083cfe984.zip | |
Merged Guichan 0.5.0 support from guichan-0.5.0 branch, plus several updates
from the 0.1.0 branch.
Diffstat (limited to 'src/gui/updatewindow.cpp')
| -rw-r--r-- | src/gui/updatewindow.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp index 3f5fe7bb..654ecaaf 100644 --- a/src/gui/updatewindow.cpp +++ b/src/gui/updatewindow.cpp @@ -107,7 +107,7 @@ UpdaterWindow::~UpdaterWindow() } // Remove possibly leftover temporary download - remove((mBasePath + "/updates/download.temp").c_str()); + ::remove((mBasePath + "/updates/download.temp").c_str()); delete[] mCurlError; } @@ -129,7 +129,7 @@ void UpdaterWindow::enable() mPlayButton->requestFocus(); } -void UpdaterWindow::action(const std::string& eventId) +void UpdaterWindow::action(const std::string& eventId, gcn::Widget* widget) { if (eventId == "cancel") { @@ -299,8 +299,8 @@ int UpdaterWindow::downloadThread(void *ptr) // Any existing file with this name is deleted first, otherwise the // rename will fail on Windows. - remove(newName.c_str()); - rename(outFilename.c_str(), newName.c_str()); + ::remove(newName.c_str()); + ::rename(outFilename.c_str(), newName.c_str()); } } |