Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_news

Conflicts:
	CMakeLists.txt
	gui/MainWindow.h

1 files changed, 9 insertions, 2 deletions

diff --git a/logic/updater/UpdateChecker.h b/logic/updater/UpdateChecker.h
index 59fb8e47..a47e8903 100644
--- a/logic/updater/UpdateChecker.h
+++ b/logic/updater/UpdateChecker.h
@@ -25,7 +25,10 @@ class UpdateChecker : public QObject
 
 public:
 	UpdateChecker();
-	void checkForUpdate();
+	void checkForUpdate(bool notifyNoUpdate);
+
+	void setCurrentChannel(const QString &channel) { m_currentChannel = channel; }
+	void setChannelListUrl(const QString &url) { m_channelListUrl = url; }
 
 	/*!
 	 * Causes the update checker to download the channel list from the URL specified in config.h (generated by CMake).
@@ -62,14 +65,18 @@ signals:
 	//! Signal emitted when the channel list finishes loading or fails to load.
 	void channelListLoaded();
 
+	void noUpdateFound();
+
 private slots:
-	void updateCheckFinished();
+	void updateCheckFinished(bool notifyNoUpdate);
 	void updateCheckFailed();
 
 	void chanListDownloadFinished();
 	void chanListDownloadFailed();
 
 private:
+	friend class UpdateCheckerTest;
+
 	NetJobPtr indexJob;
 	NetJobPtr chanListJob;