diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-05-15 21:07:33 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-05-15 21:07:33 +0000 |
| commit | c08a8d0b413a616b721eeb37e4a2e9287c053410 (patch) | |
| tree | 4c6b4b1d1b7899e1143aee14e5c19300d23f5173 /plugins/AVS | |
| parent | 2041c4ed0d7d0dfc7a4035451e5d12c1fd45c6aa (diff) | |
correct notification when avatar is removed
git-svn-id: http://svn.miranda-ng.org/main/trunk@13609 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/AVS')
| -rw-r--r-- | plugins/AVS/src/cache.cpp | 2 | ||||
| -rw-r--r-- | plugins/AVS/src/stdafx.h | 1 | ||||
| -rw-r--r-- | plugins/AVS/src/utils.cpp | 6 |
3 files changed, 7 insertions, 2 deletions
diff --git a/plugins/AVS/src/cache.cpp b/plugins/AVS/src/cache.cpp index 87c6c4e7ca..d14200ac06 100644 --- a/plugins/AVS/src/cache.cpp +++ b/plugins/AVS/src/cache.cpp @@ -107,7 +107,7 @@ CacheNode* FindAvatarInCache(MCONTACT hContact, bool add, bool findAny) // can display the message either as systray notification (baloon popup) or using the
// popup plugin.
-void NotifyMetaAware(MCONTACT hContact, CacheNode *node = NULL, AVATARCACHEENTRY *ace = (AVATARCACHEENTRY*)-1)
+void NotifyMetaAware(MCONTACT hContact, CacheNode *node, AVATARCACHEENTRY *ace)
{
if (g_shutDown)
return;
diff --git a/plugins/AVS/src/stdafx.h b/plugins/AVS/src/stdafx.h index 7027783b64..2331595a0c 100644 --- a/plugins/AVS/src/stdafx.h +++ b/plugins/AVS/src/stdafx.h @@ -133,6 +133,7 @@ void UnloadCache(void); int CreateAvatarInCache(MCONTACT hContact, avatarCacheEntry *ace, char *szProto);
void DeleteAvatarFromCache(MCONTACT hContact, bool bForever);
void PicLoader(LPVOID param);
+void NotifyMetaAware(MCONTACT hContact, CacheNode *node = NULL, AVATARCACHEENTRY *ace = (AVATARCACHEENTRY*)-1);
void InternalDrawAvatar(AVATARDRAWREQUEST *r, HBITMAP hbm, LONG bmWidth, LONG bmHeight, DWORD dwFlags);
diff --git a/plugins/AVS/src/utils.cpp b/plugins/AVS/src/utils.cpp index 106615ec77..fefbfd0596 100644 --- a/plugins/AVS/src/utils.cpp +++ b/plugins/AVS/src/utils.cpp @@ -423,7 +423,11 @@ int ChangeAvatar(MCONTACT hContact, bool fLoad, bool fNotifyHist, int pa_format) PushAvatarRequest(node);
SetEvent(hLoaderEvent);
}
- else node->wipeInfo();
+ else {
+ node->wipeInfo();
+ NotifyMetaAware(hContact, node);
+ }
+
return 0;
}
|