aboutsummaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/data/quote.ui1
-rw-r--r--main/src/ui/conversation_content_view/quote_widget.vala6
2 files changed, 6 insertions, 1 deletions
diff --git a/main/data/quote.ui b/main/data/quote.ui
index 1fcd133e..9d843c75 100644
--- a/main/data/quote.ui
+++ b/main/data/quote.ui
@@ -53,6 +53,7 @@
</child>
<child>
<object class="GtkLabel" id="message">
+ <property name="use_markup">1</property>
<property name="ellipsize">end</property>
<property name="halign">start</property>
<property name="xalign">0</property>
diff --git a/main/src/ui/conversation_content_view/quote_widget.vala b/main/src/ui/conversation_content_view/quote_widget.vala
index b267e6bc..aedce687 100644
--- a/main/src/ui/conversation_content_view/quote_widget.vala
+++ b/main/src/ui/conversation_content_view/quote_widget.vala
@@ -28,7 +28,11 @@ namespace Dino.Ui.Quote {
this.display_name = Util.get_participant_display_name(stream_interactor, conversation, content_item.jid, true);
if (content_item.type_ == MessageItem.TYPE) {
var message = ((MessageItem) content_item).message;
- this.message = Dino.message_body_without_reply_fallback(message);
+ this.message = Markup.escape_text(Dino.message_body_without_reply_fallback(message));
+
+ if (message.body.has_prefix("/me ")) {
+ this.message = @"<i><b>$(Markup.escape_text(display_name))</b> " + this.message.substring(4) + "</i>";
+ }
} else if (content_item.type_ == FileItem.TYPE) {
var file_transfer = ((FileItem) content_item).file_transfer;
this.message = _("File") + ": " + file_transfer.file_name;