From 39376a25782b876a568464541ff3bf112b8307db Mon Sep 17 00:00:00 2001 From: Eion Robb Date: Thu, 4 Dec 2014 20:37:28 +0000 Subject: SkypeWeb : Fix for rejecting auth requests, potential fix for null avatarUrl's for a buddy causing a crash --- skypeweb/skypeweb_contacts.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/skypeweb/skypeweb_contacts.c b/skypeweb/skypeweb_contacts.c index 885067c..5f0fbe4 100644 --- a/skypeweb/skypeweb_contacts.c +++ b/skypeweb/skypeweb_contacts.c @@ -82,7 +82,7 @@ skypeweb_got_imagemessage(PurpleUtilFetchUrlData *url_data, gpointer user_data, icon_id = purple_imgstore_add_with_id((gpointer)url_text, len, NULL); msg_tmp = g_strdup_printf("", icon_id); - purple_conversation_write(conv, conv->name, msg_tmp, PURPLE_MESSAGE_SYSTEM, time(NULL)); + purple_conversation_write(conv, conv->name, msg_tmp, PURPLE_MESSAGE_SYSTEM | PURPLE_MESSAGE_IMAGES, time(NULL)); g_free(msg_tmp); purple_imgstore_unref_by_id(icon_id); @@ -416,7 +416,7 @@ skypeweb_got_friend_profiles(SkypeWebAccount *sa, JsonNode *node, gpointer user_ purple_blist_server_alias_buddy(buddy, json_object_get_string_member(contact, "firstname")); new_avatar = json_object_get_string_member(contact, "avatarUrl"); - if (new_avatar && (!sbuddy->avatar_url || !g_str_equal(sbuddy->avatar_url, new_avatar))) { + if (new_avatar && *new_avatar && (!sbuddy->avatar_url || !g_str_equal(sbuddy->avatar_url, new_avatar))) { g_free(sbuddy->avatar_url); sbuddy->avatar_url = g_strdup(new_avatar); skypeweb_get_icon(buddy); @@ -633,7 +633,7 @@ skypeweb_auth_reject_cb(gpointer sender) sa = buddy->account->gc->proto_data; - url = g_strdup_printf("/users/self/contacts/auth-request/%s/reject", purple_url_encode(buddy->name)); + url = g_strdup_printf("/users/self/contacts/auth-request/%s/decline", purple_url_encode(buddy->name)); skypeweb_post_or_get(sa, SKYPEWEB_METHOD_PUT | SKYPEWEB_METHOD_SSL, SKYPEWEB_CONTACTS_HOST, url, NULL, NULL, NULL, TRUE); -- cgit v1.2.3