diff options
Diffstat (limited to 'Swift')
| -rw-r--r-- | Swift/QtUI/QtSwift.cpp | 9 | 
1 files changed, 6 insertions, 3 deletions
| diff --git a/Swift/QtUI/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp index 370d7c3..383e5ca 100644 --- a/Swift/QtUI/QtSwift.cpp +++ b/Swift/QtUI/QtSwift.cpp @@ -1,82 +1,85 @@  #include "QtSwift.h"  #include "QtLoginWindowFactory.h"  #include "QtChatWindowFactory.h"  #include "QtLoginWindow.h"  #include "QtChatTabs.h"  #include "QtMainWindowFactory.h"  #include "Roster/QtTreeWidgetFactory.h"  #include "QtSystemTray.h"  #include "QtSoundPlayer.h"  #include "QtXMLConsoleWidgetFactory.h"  #include <boost/bind.hpp>  #include <QSplitter>  #include "Swiften/Application/Application.h"  #include "Swiften/Application/Platform/PlatformApplication.h"  #include "Swiften/Base/String.h"  #include "Swiften/Base/Platform.h"  #include "Swiften/Elements/Presence.h"  #include "Swiften/Client/Client.h"  #include "Swift/Controllers/ChatController.h"  #include "Swift/Controllers/MainController.h"  #include "Swift/QtUI/BuildVersion.h"  #include "SwifTools/AutoUpdater/AutoUpdater.h"  #include "SwifTools/AutoUpdater/PlatformAutoUpdaterFactory.h"  namespace Swift{  #if defined(SWIFTEN_PLATFORM_MACOSX)  #define SWIFT_APPCAST_URL "http://swift.im/appcast/psi-mac-dev.xml"  #else   #define SWIFT_APPCAST_URL ""  #endif -QtSwift::QtSwift(bool netbookMode) { +QtSwift::QtSwift(bool netbookMode) : autoUpdater_(NULL) {  	if (netbookMode) {  		splitter_ = new QSplitter();  	} else {  		splitter_ = NULL;  	}  	QCoreApplication::setApplicationName("Swift");  	QCoreApplication::setOrganizationName("Swift");  	QCoreApplication::setOrganizationDomain("swift.im");  	QCoreApplication::setApplicationVersion(buildVersion);  	tabs_ = new QtChatTabs();  	settings_ = new QtSettingsProvider();  	application_ = new PlatformApplication("Swift");  	treeWidgetFactory_ = new QtTreeWidgetFactory();   	systemTray_ = new QtSystemTray();  	loginWindowFactory_ = new QtLoginWindowFactory(splitter_, systemTray_, settings_);  	chatWindowFactory_ = new QtChatWindowFactory(treeWidgetFactory_, splitter_, settings_, tabs_);  	rosterWindowFactory_ = new QtMainWindowFactory(treeWidgetFactory_);  	xmlConsoleWidgetFactory_ = new QtXMLConsoleWidgetFactory(tabs_);  	soundPlayer_ = new QtSoundPlayer();  	if (splitter_) {  		splitter_->show();  	}  	mainController_ = new MainController(chatWindowFactory_, rosterWindowFactory_, loginWindowFactory_, treeWidgetFactory_, settings_, application_, systemTray_, soundPlayer_, xmlConsoleWidgetFactory_); -	autoUpdater_ = PlatformAutoUpdaterFactory().createAutoUpdater(SWIFT_APPCAST_URL); -	autoUpdater_->checkForUpdates(); +	PlatformAutoUpdaterFactory autoUpdaterFactory; +	if (autoUpdaterFactory.isSupported()) { +		autoUpdater_ = autoUpdaterFactory.createAutoUpdater(SWIFT_APPCAST_URL); +		autoUpdater_->checkForUpdates(); +	}  }  QtSwift::~QtSwift() {  	delete autoUpdater_;  	delete chatWindowFactory_;  	delete rosterWindowFactory_;  	delete loginWindowFactory_;  	delete treeWidgetFactory_;  	delete mainController_;  	delete settings_;  	delete application_;  	delete systemTray_;  	delete splitter_;  	delete soundPlayer_;  	delete tabs_;  	delete xmlConsoleWidgetFactory_;  }  } | 
 Swift
 Swift