Index: src/engine/main.cpp |
=================================================================== |
--- a/src/engine/main.cpp |
+++ b/src/engine/main.cpp |
@@ -40,15 +40,31 @@ |
} |
} |
- CriticalSection firstRunLock; |
- bool firstRunActionExecuted = false; |
- |
+ bool updateAvailable; |
Felix Dahlke
2013/08/06 10:40:12
I think you should explicitly initialise this to f
Wladimir Palant
2013/08/13 09:19:51
Not sure why but this variable is again not being
|
void UpdateCallback(const std::string res) |
{ |
- //TODO: Display UI here |
+ if (updateAvailable) |
+ return; |
+ Dictionary* dictionary = Dictionary::GetInstance(); |
+ if (res.length() == 0) |
+ { |
+ std::wstring upToDateText = dictionary->Lookup("updater", "update-already-up-to-date-text"); |
+ std::wstring upToDateTitle = dictionary->Lookup("updater", "update-already-up-to-date-title"); |
+ MessageBox(NULL, upToDateText.c_str(), upToDateTitle.c_str(), MB_OK); |
Felix Dahlke
2013/08/06 10:40:12
How about MB_ICONINFORMATION?
Felix Dahlke
2013/08/09 07:09:27
Will it still have the OK button? What I meant was
Wladimir Palant
2013/08/13 09:19:51
Please use MessageBoxW explicitly, you are using w
|
+ } |
+ else |
+ { |
+ std::wstring errorText = dictionary->Lookup("updater", "update-error-text"); |
+ std::wstring errorTitle = dictionary->Lookup("updater", "update-error-title"); |
+ ReplaceString(errorText, L"?1?", ToUtf16String(res)); |
+ MessageBox(NULL, errorText.c_str(), errorTitle.c_str(), MB_OK); |
Felix Dahlke
2013/08/06 10:40:12
How about MB_ICONEXCLAMATION?
Felix Dahlke
2013/08/09 07:09:27
As above, will this still show the OK button?
Wladimir Palant
2013/08/13 09:19:51
Please use MessageBoxW explicitly, you are using w
|
+ } |
return; |
Felix Dahlke
2013/08/06 10:40:12
That's not really necessary.
|
} |
+ |
+ CriticalSection firstRunLock; |
+ bool firstRunActionExecuted = false; |
Communication::OutputBuffer HandleRequest(Communication::InputBuffer& request) |
{ |
Communication::OutputBuffer response; |
@@ -232,6 +248,7 @@ |
} |
case Communication::PROC_CHECK_FOR_UPDATES: |
{ |
+ updateAvailable = false; |
filterEngine->ForceUpdateCheck(UpdateCallback); |
break; |
} |
@@ -249,14 +266,9 @@ |
} |
break; |
} |
- case Communication::PROC_GET_APP_LOCALE: |
- { |
- response << ToUtf16String(filterEngine->GetAppLocale()); |
- break; |
- } |
case Communication::PROC_GET_DOCUMENTATION_LINK: |
{ |
- response << ToUtf16String(filterEngine->GetDocumentationLink()); |
+ response << ToUtf16String(filterEngine->GetPref("documentation_link")->AsString()); |
break; |
} |
@@ -286,6 +298,7 @@ |
void OnUpdateAvailable(AdblockPlus::JsEnginePtr jsEngine, AdblockPlus::JsValueList& params) |
{ |
+ updateAvailable = true; |
Felix Dahlke
2013/08/06 10:40:12
What about the error below? Shouldn't we try to do
Oleksandr
2013/08/08 14:19:34
hm.. When would be the next time? On automatic upd
Felix Dahlke
2013/08/08 14:29:54
I got this a bit wrong, it'll check for updates an
Oleksandr
2013/08/08 17:06:12
It is empty in what I've seen and based on updater
Felix Dahlke
2013/08/09 07:09:27
Then we should set updateAvailable to true after w
Oleksandr
2013/08/09 07:14:49
Hm. But it is set to true at one line above.. What
Felix Dahlke
2013/08/09 07:18:41
Um, the idea was to move that line below the error
|
if (params.size() < 1) |
{ |
Debug("updateAvailable event missing URL"); |