diff options
| -rw-r--r-- | plugins/TabSRMM/src/msgdialog.cpp | 8 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/msgdlgutils.cpp | 12 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/msgs.h | 1 |
3 files changed, 8 insertions, 13 deletions
diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp index 691c89e7e3..b2660e4df5 100644 --- a/plugins/TabSRMM/src/msgdialog.cpp +++ b/plugins/TabSRMM/src/msgdialog.cpp @@ -3093,14 +3093,6 @@ quote_from_last: SendMessage(hwndDlg, DM_REMAKELOG, 0, 0);
break;
- case DM_PROTOAVATARCHANGED:
- dat->ace = Utils::loadAvatarFromAVS(dat->hContact);
-
- ShowPicture(dat, TRUE);
- if (dat->Panel->isActive())
- SendMessage(hwndDlg, WM_SIZE, 0, 0);
- return 0;
-
case DM_MYAVATARCHANGED:
{
const char *szProto = dat->cache->getActiveProto();
diff --git a/plugins/TabSRMM/src/msgdlgutils.cpp b/plugins/TabSRMM/src/msgdlgutils.cpp index 92dc7c6b31..7300b48d64 100644 --- a/plugins/TabSRMM/src/msgdlgutils.cpp +++ b/plugins/TabSRMM/src/msgdlgutils.cpp @@ -537,10 +537,14 @@ void TSAPI ProcessAvatarChange(HWND hwnd, LPARAM lParam) if (((LPNMHDR)lParam)->code == NM_AVATAR_CHANGED) {
HWND hwndDlg = GetParent(hwnd);
TWindowData *dat = (TWindowData*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
- if (dat) {
- GetAvatarVisibility(hwndDlg, dat);
- SendMessage(hwndDlg, WM_SIZE, 0, 1);
- }
+ if (!dat)
+ return;
+
+ dat->ace = Utils::loadAvatarFromAVS(dat->hContact);
+
+ ShowPicture(dat, TRUE);
+ if (dat->Panel->isActive())
+ SendMessage(hwndDlg, WM_SIZE, 0, 0);
}
}
diff --git a/plugins/TabSRMM/src/msgs.h b/plugins/TabSRMM/src/msgs.h index cba8d7e694..b83f4a1a49 100644 --- a/plugins/TabSRMM/src/msgs.h +++ b/plugins/TabSRMM/src/msgs.h @@ -571,7 +571,6 @@ struct TNewWindowData #define DM_DELAYEDSCROLL (TM_USER+78)
#define DM_REPLAYQUEUE (TM_USER+79)
#define DM_REFRESHTABINDEX (TM_USER+83)
-#define DM_PROTOAVATARCHANGED (TM_USER+84)
#define DM_SMILEYOPTIONSCHANGED (TM_USER+85)
#define DM_MYAVATARCHANGED (TM_USER+86)
#define DM_PRINTCLIENT (TM_USER+87)
|