summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-02-06 23:15:13 +0100
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-02-06 23:16:10 +0100
commit762bd357756e35b0a25cc6a66a890dfedb1f6596 (patch)
treeaaeb26a1b3cb527b0f2f860defbce4f74e08059a /src/gui
parent367b2e8b01c42c34c7782c4410db359c2b3ca060 (diff)
downloadmana-762bd357756e35b0a25cc6a66a890dfedb1f6596.tar.gz
mana-762bd357756e35b0a25cc6a66a890dfedb1f6596.tar.bz2
mana-762bd357756e35b0a25cc6a66a890dfedb1f6596.tar.xz
mana-762bd357756e35b0a25cc6a66a890dfedb1f6596.zip
Some cleanups in the initialization of wallpaper paths
The 'paths' configuration in client-data now overrides any configuration in 'branding', so that it will apply after the updates for a certain server have been downloaded. Also, some isDirectory checks have been removed. When the configuration is wrong, it's probably better to see that there is a problem. Reviewed-by: Yohann Ferreira
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/widgets/desktop.cpp2
-rw-r--r--src/gui/widgets/desktop.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp
index d0e2a498..bf833898 100644
--- a/src/gui/widgets/desktop.cpp
+++ b/src/gui/widgets/desktop.cpp
@@ -67,7 +67,7 @@ void Desktop::reloadWallpaper()
setBestFittingWallpaper();
}
-void Desktop::widgetResized(const gcn::Event &event)
+void Desktop::widgetResized(const gcn::Event &)
{
setBestFittingWallpaper();
}
diff --git a/src/gui/widgets/desktop.h b/src/gui/widgets/desktop.h
index 593c8ab0..8ecb7e03 100644
--- a/src/gui/widgets/desktop.h
+++ b/src/gui/widgets/desktop.h
@@ -54,7 +54,7 @@ class Desktop : public Container, gcn::WidgetListener
*/
void reloadWallpaper();
- void widgetResized(const gcn::Event &event);
+ void widgetResized(const gcn::Event &);
void draw(gcn::Graphics *graphics);