diff options
| author | Eion Robb <eion@robbmob.com> | 2021-02-15 23:50:22 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-15 23:50:22 +0300 |
| commit | c4906b80c0f3b04f964c8a632b4eff7526a00eac (patch) | |
| tree | c58e19c55208e4881d696feb2984fa5bdde8d186 /skypeweb/skypeweb_messages.c | |
| parent | 42df93659e50fac89f2bc39433051d94b65a1340 (diff) | |
| parent | bebec9759c8a3c1b5ce8174234e7639c440fcc7d (diff) | |
Merge pull request #676 from jpalus/master
Fix direction of uri messages
Diffstat (limited to 'skypeweb/skypeweb_messages.c')
| -rw-r--r-- | skypeweb/skypeweb_messages.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/skypeweb/skypeweb_messages.c b/skypeweb/skypeweb_messages.c index 71c7b5c..959fb31 100644 --- a/skypeweb/skypeweb_messages.c +++ b/skypeweb/skypeweb_messages.c @@ -28,7 +28,7 @@ static GString* make_last_timestamp_setting(const gchar *convname) { return rv; } -static gboolean +gboolean skypeweb_is_user_self(SkypeWebAccount *sa, const gchar *username) { if (!username || *username == 0) { return FALSE; @@ -434,15 +434,13 @@ process_message_resource(SkypeWebAccount *sa, JsonObject *resource) g_free(html); } else if (g_str_equal(messagetype, "RichText/UriObject") || g_str_equal(messagetype, "RichText/Media_Video")) { PurpleIMConversation *imconv; + const gchar* conv_buddy = skypeweb_is_user_self(sa, from) ? convbuddyname : from; - if (skypeweb_is_user_self(sa, from)) { - from = convbuddyname; - } if (from != NULL) { - imconv = purple_conversations_find_im_with_account(from, sa->account); + imconv = purple_conversations_find_im_with_account(conv_buddy, sa->account); if (imconv == NULL) { - imconv = purple_im_conversation_new(sa->account, from); + imconv = purple_im_conversation_new(sa->account, conv_buddy); } conv = PURPLE_CONVERSATION(imconv); |