diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2013-01-08 18:10:01 +0000 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2013-01-08 18:10:01 +0000 |
| commit | 82ee92ab91e97f986ebafbee993bf20ff39bde12 (patch) | |
| tree | 3353f33b8ba5f83d6e871856f1ddb4b8849fda17 /plugins/NewsAggregator | |
| parent | 3a2d344affe7ba8fee7bf97f90d402c1580b82a5 (diff) | |
fixed checking news manually
git-svn-id: http://svn.miranda-ng.org/main/trunk@3021 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/NewsAggregator')
| -rw-r--r-- | plugins/NewsAggregator/Src/Services.cpp | 4 | ||||
| -rw-r--r-- | plugins/NewsAggregator/Src/Update.cpp | 2 | ||||
| -rw-r--r-- | plugins/NewsAggregator/Src/Utils.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/plugins/NewsAggregator/Src/Services.cpp b/plugins/NewsAggregator/Src/Services.cpp index c16222014a..21705031da 100644 --- a/plugins/NewsAggregator/Src/Services.cpp +++ b/plugins/NewsAggregator/Src/Services.cpp @@ -228,11 +228,11 @@ INT_PTR NewsAggrGetAvatarInfo(WPARAM wParam, LPARAM lParam) // otherwise, cached avatar is used
if (wParam & GAIF_FORCE && DBGetContactSettingDword(pai->hContact, MODULE, "UpdateTime", 60))
UpdateListAdd(pai->hContact);
- if (!ThreadRunning)
+ if (db_get_b(NULL, MODULE, "AutoUpdate", 1) != 0 && !ThreadRunning)
mir_forkthread(UpdateThreadProc, NULL);
DBVARIANT dbv = {0};
- if(DBGetContactSettingTString(pai->hContact,MODULE,"ImageURL",&dbv))
+ if(DBGetContactSettingTString(pai->hContact, MODULE, "ImageURL", &dbv))
{
return GAIR_NOAVATAR;
}
diff --git a/plugins/NewsAggregator/Src/Update.cpp b/plugins/NewsAggregator/Src/Update.cpp index c0b42eb759..2ff5b0a071 100644 --- a/plugins/NewsAggregator/Src/Update.cpp +++ b/plugins/NewsAggregator/Src/Update.cpp @@ -39,7 +39,7 @@ VOID CALLBACK timerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) if (DBGetContactSettingDword(hContact, MODULE, "UpdateTime", 60))
{
double diff = difftime(time(NULL), DBGetContactSettingDword(hContact, MODULE, "LastCheck", 0));
- if (diff >= DBGetContactSettingDword(hContact, MODULE, "UpdateTime", 60) * 60)
+ if (db_get_b(NULL, MODULE, "AutoUpdate", 1) != 0 && diff >= DBGetContactSettingDword(hContact, MODULE, "UpdateTime", 60) * 60)
{
UpdateListAdd(hContact);
HaveUpdates = TRUE;
diff --git a/plugins/NewsAggregator/Src/Utils.cpp b/plugins/NewsAggregator/Src/Utils.cpp index 50aa1edefa..0a4cca2207 100644 --- a/plugins/NewsAggregator/Src/Utils.cpp +++ b/plugins/NewsAggregator/Src/Utils.cpp @@ -790,7 +790,7 @@ VOID CheckCurrentFeed(HANDLE hContact) DBVARIANT dbURL = {0};
if (DBGetContactSettingTString(hContact, MODULE, "URL", &dbURL))
return;
- else if (db_get_b(NULL, MODULE, "AutoUpdate", 1) != 0 && db_get_b(hContact, MODULE, "CheckState", 1) != 0)
+ else if (db_get_b(hContact, MODULE, "CheckState", 1) != 0)
{
GetNewsData(dbURL.ptszVal, &szData, hContact, NULL);
DBFreeVariant(&dbURL);
|