diff options
| author | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2016-12-19 06:05:54 +0300 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2016-12-19 06:05:54 +0300 |
| commit | 63f6579e56af870fa9ad7289a1a71cd5a27f5d76 (patch) | |
| tree | 0483281e31286d4894c744c97f060cb5b35ed481 /protocols | |
| parent | 758762fbc91f2002a9e41957ca34a5d772d575f4 (diff) | |
| parent | 8b3c1e649624c2f270ade8d6f0fafd8b9cf3e493 (diff) | |
Merge branch 'master' of github.com:miranda-ng/miranda-ng
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/FacebookRM/src/entities.h | 12 | ||||
| -rw-r--r-- | protocols/Steam/src/steam_contacts.cpp | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/protocols/FacebookRM/src/entities.h b/protocols/FacebookRM/src/entities.h index 5274d9d2b2..0026606ca6 100644 --- a/protocols/FacebookRM/src/entities.h +++ b/protocols/FacebookRM/src/entities.h @@ -149,17 +149,17 @@ struct facebook_notification void setIcon(const std::string &iconUrl) { - if (iconUrl == "https://www.facebook.com/rsrc.php/v2/yj/r/6WffvhOaXGY.png") + if (iconUrl == "https://www.facebook.com/rsrc.php/v3/yj/r/6WffvhOaXGY.png") icon = "like"; - else if (iconUrl == "https://www.facebook.com/rsrc.php/v2/y1/r/RvGKklgAefT.png") + else if (iconUrl == "https://www.facebook.com/rsrc.php/v3/y1/r/RvGKklgAefT.png") icon = "love"; - else if (iconUrl == "https://www.facebook.com/rsrc.php/v2/yV/r/McJA2ZjdJmf.png") + else if (iconUrl == "https://www.facebook.com/rsrc.php/v3/yV/r/McJA2ZjdJmf.png") icon = "haha"; - else if (iconUrl == "https://www.facebook.com/rsrc.php/v2/yL/r/IfsimazVjj4.png") + else if (iconUrl == "https://www.facebook.com/rsrc.php/v3/yL/r/IfsimazVjj4.png") icon = "wow"; - else if (iconUrl == "https://www.facebook.com/rsrc.php/v2/yH/r/jOeSrGlcPLG.png") + else if (iconUrl == "https://www.facebook.com/rsrc.php/v3/yH/r/jOeSrGlcPLG.png") icon = "sad"; - else if (iconUrl == "https://www.facebook.com/rsrc.php/v2/yL/r/IfsimazVjj4.png") + else if (iconUrl == "https://www.facebook.com/rsrc.php/v3/y9/r/6K8v8Ju8kL2.png") icon = "angry"; else icon = NULL; diff --git a/protocols/Steam/src/steam_contacts.cpp b/protocols/Steam/src/steam_contacts.cpp index 6e95c48805..39bd619363 100644 --- a/protocols/Steam/src/steam_contacts.cpp +++ b/protocols/Steam/src/steam_contacts.cpp @@ -173,10 +173,10 @@ void CSteamProto::UpdateContact(MCONTACT hContact, JSONNode *data) // status // NOTE: this here is wrong info, probably depending on publicity of steam profile, but we don't need this at all, we get status updates by polling - // NOTE: polling won't always give us info about all contacts (e.g. in case of quick disconnect and reconnect), so we try to use this anyway - node = json_get(data, "personastate"); - WORD status = SteamToMirandaStatus(json_as_int(node)); + /*node = json_get(data, "personastate"); + status = SteamToMirandaStatus(json_as_int(node)); SetContactStatus(hContact, status); + */ // client node = json_get(data, "personastateflags"); |