Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/EionRobb/skype4pidgin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEion Robb <eion@robbmob.com>2017-08-23 13:10:14 +0300
committerGitHub <noreply@github.com>2017-08-23 13:10:14 +0300
commite46ae51ad5917d98225673ad9ac35a53b1e243aa (patch)
treed57364df23a12bbc3422211001fe941fa174539f
parent2c461450c78775a5d831359dd99551a6e208ce75 (diff)
parent02738c074a24235bda318a2fb5c24ee7b5d60491 (diff)
Merge pull request #563 from xavery/invite-message-new-json
Fix #562 : Invite message not displayed
-rw-r--r--skypeweb/skypeweb_contacts.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/skypeweb/skypeweb_contacts.c b/skypeweb/skypeweb_contacts.c
index 177cd7b..139b52e 100644
--- a/skypeweb/skypeweb_contacts.c
+++ b/skypeweb/skypeweb_contacts.c
@@ -1414,6 +1414,8 @@ skypeweb_got_authrequests(SkypeWebAccount *sa, JsonNode *node, gpointer user_dat
time_t event_timestamp = purple_str_to_time(event_time_iso, TRUE, NULL, NULL, NULL);
const gchar *sender = json_object_get_string_member(invite, "mri");
const gchar *greeting = json_object_get_string_member(invite, "greeting");
+ if (!greeting)
+ greeting = json_object_get_string_member(json_array_get_object_element(invites, 0), "message");
const gchar *displayname = json_object_get_string_member(invite, "displayname");
latest_timestamp = MAX(latest_timestamp, event_timestamp);