summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-11-27 23:37:37 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-11-27 23:37:37 (GMT)
commit91570ab79252b37afeae3b230cb6023c5b52547a (patch)
tree011d77857557a28671a63a444dcf8e10db64ab3f /Swiften
parentba717874781a33ea40a1aea1ad8b9efce3580fc2 (diff)
downloadswift-91570ab79252b37afeae3b230cb6023c5b52547a.zip
swift-91570ab79252b37afeae3b230cb6023c5b52547a.tar.bz2
Integrated Sparkle auto-updater.
Diffstat (limited to 'Swiften')
-rw-r--r--Swiften/Application/MacOSX/MacOSXApplication.h2
-rw-r--r--Swiften/Application/SConscript3
2 files changed, 4 insertions, 1 deletions
diff --git a/Swiften/Application/MacOSX/MacOSXApplication.h b/Swiften/Application/MacOSX/MacOSXApplication.h
index e408ffd..cd5e69f 100644
--- a/Swiften/Application/MacOSX/MacOSXApplication.h
+++ b/Swiften/Application/MacOSX/MacOSXApplication.h
@@ -1,23 +1,25 @@
#ifndef SWIFTEN_MacOSXApplication_H
#define SWIFTEN_MacOSXApplication_H
#include "Swiften/Application/Application.h"
#include "Swiften/Application/MacOSX/MacOSXApplicationMessageDisplay.h"
+#include "Swiften/Application/MacOSX/MacOSXApplicationInitializer.h"
namespace Swift {
class ApplicationMessageDisplay;
class MacOSXApplication : public Application {
public:
MacOSXApplication(const String& name);
virtual boost::filesystem::path getHomeDir() const;
virtual ApplicationMessageDisplay* getApplicationMessageDisplay();
boost::filesystem::path getSettingsDir() const;
private:
+ MacOSXApplicationInitializer initializer_;
MacOSXApplicationMessageDisplay messageDisplay_;
};
}
#endif
diff --git a/Swiften/Application/SConscript b/Swiften/Application/SConscript
index d13b63b..7696bd7 100644
--- a/Swiften/Application/SConscript
+++ b/Swiften/Application/SConscript
@@ -1,15 +1,16 @@
Import("swiften_env")
sources = [
"Application.cpp",
"ApplicationMessageDisplay.cpp",
]
if swiften_env["PLATFORM"] == "darwin" :
sources += [
"MacOSX/MacOSXApplication.cpp",
- "MacOSX/MacOSXApplicationMessageDisplay.mm"
+ "MacOSX/MacOSXApplicationMessageDisplay.mm",
+ "MacOSX/MacOSXApplicationInitializer.mm",
]
objects = swiften_env.StaticObject(sources)
swiften_env.Append(SWIFTEN_OBJECTS = [objects])