Skip to content

Commit

Permalink
fix compilation after PR52 merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@jaroslawp
jaroslawp committed Sep 4, 2017
1 parent 2736eba commit 2683ee1
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion libmattermost.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2584,7 +2584,7 @@ mm_process_room_message(MattermostAccount *ma, JsonObject *post, JsonObject *dat

// check we didn't send this ourselves
if (msg_flags == PURPLE_MESSAGE_RECV || !g_hash_table_remove(ma->sent_message_ids, pending_post_id)) {
gchar *msg_pre = mm_markdown_to_html(msg_text);
gchar *msg_pre = mm_markdown_to_html(ma, msg_text);
gchar *msg_post = g_regex_replace(ma->mention_me_regex, msg_pre, -1, 0, MATTERMOST_MENTION_ME_REPLACE, G_REGEX_MATCH_NOTEMPTY, NULL);
gchar *message = g_regex_replace(ma->mention_all_regex, msg_post, -1, 0, MATTERMOST_MENTION_ALL_REPLACE, G_REGEX_MATCH_NOTEMPTY, NULL);

Expand Down

2 comments on commit 2683ee1

@jaroslawp
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops. my confilct resolution for PR52 was no good,. fixed.

@EionRobb
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops :)

Please sign in to comment.