diff options
| author | George Hazan <george.hazan@gmail.com> | 2023-12-25 13:41:15 +0300 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2023-12-25 13:41:15 +0300 |
| commit | b2d8179423721eb6cc58286dde0b1f4c94dd87ce (patch) | |
| tree | 770ff79d509516b0e60f6e3a108d26c00f5869cd | |
| parent | 86d22dec4247e5f582c4a1080e9fecca805defa1 (diff) | |
Jabber: Photo userinfo page conflicts with AVS and thus should be displayed only if AVS is absent
| -rw-r--r-- | protocols/JabberG/src/jabber_userinfo.cpp | 10 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_vcard.cpp | 8 |
2 files changed, 11 insertions, 7 deletions
diff --git a/protocols/JabberG/src/jabber_userinfo.cpp b/protocols/JabberG/src/jabber_userinfo.cpp index e4cd046a4f..6688a21ee1 100644 --- a/protocols/JabberG/src/jabber_userinfo.cpp +++ b/protocols/JabberG/src/jabber_userinfo.cpp @@ -955,10 +955,12 @@ int CJabberProto::OnUserInfoInit(WPARAM wParam, LPARAM hContact) uip.szTitle.w = LPGENW("Account");
g_plugin.addUserInfo(wParam, &uip);
- uip.pDialog = new JabberUserPhotoDlg(this);
- uip.position = 2000000000;
- uip.szTitle.w = LPGENW("Photo");
- g_plugin.addUserInfo(wParam, &uip);
+ if (!ServiceExists(MS_AV_GETAVATARBITMAP)) {
+ uip.pDialog = new JabberUserPhotoDlg(this);
+ uip.position = 2000000000;
+ uip.szTitle.w = LPGENW("Photo");
+ g_plugin.addUserInfo(wParam, &uip);
+ }
CheckOmemoUserInfo(wParam, uip);
}
diff --git a/protocols/JabberG/src/jabber_vcard.cpp b/protocols/JabberG/src/jabber_vcard.cpp index 41cb908e0b..44c4220af6 100644 --- a/protocols/JabberG/src/jabber_vcard.cpp +++ b/protocols/JabberG/src/jabber_vcard.cpp @@ -1066,9 +1066,11 @@ void CJabberProto::OnUserInfoInit_VCard(WPARAM wParam, LPARAM) uip.szTitle.w = LPGENW("Work");
g_plugin.addUserInfo(wParam, &uip);
- uip.pDialog = new JabberVcardPhotoDlg(this);
- uip.szTitle.w = LPGENW("Photo");
- g_plugin.addUserInfo(wParam, &uip);
+ if (!ServiceExists(MS_AV_GETAVATARBITMAP)) {
+ uip.pDialog = new JabberVcardPhotoDlg(this);
+ uip.szTitle.w = LPGENW("Photo");
+ g_plugin.addUserInfo(wParam, &uip);
+ }
uip.pDialog = new JabberVcardNoteDlg(this);
uip.szTitle.w = LPGENW("Note");
|