From 782ae4c049e2b6fab13d7453cbb0e74610e7d200 Mon Sep 17 00:00:00 2001 From: Marvin W Date: Fri, 12 Jan 2018 21:03:09 +0100 Subject: Move Jid class to xmpp-vala, partially refactor namespace --- main/src/ui/conversation_summary/default_file_display.vala | 3 ++- main/src/ui/conversation_summary/default_message_display.vala | 1 + main/src/ui/conversation_summary/image_display.vala | 3 ++- main/src/ui/conversation_summary/slashme_message_display.vala | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) (limited to 'main/src/ui/conversation_summary') diff --git a/main/src/ui/conversation_summary/default_file_display.vala b/main/src/ui/conversation_summary/default_file_display.vala index 42fe2214..15eab6fe 100644 --- a/main/src/ui/conversation_summary/default_file_display.vala +++ b/main/src/ui/conversation_summary/default_file_display.vala @@ -2,6 +2,7 @@ using Gdk; using Gtk; using Dino.Entities; +using Xmpp; namespace Dino.Ui.ConversationSummary { @@ -26,7 +27,7 @@ public class DefaultFileDisplay : Plugins.MetaConversationItem { this.stream_interactor = stream_interactor; this.file_transfer = file_transfer; - this.jid = file_transfer.direction == FileTransfer.DIRECTION_SENT ? new Jid.with_resource(file_transfer.account.bare_jid.to_string(), file_transfer.account.resourcepart) : file_transfer.counterpart; + this.jid = file_transfer.direction == FileTransfer.DIRECTION_SENT ? file_transfer.account.bare_jid.with_resource(file_transfer.account.resourcepart) : file_transfer.counterpart; this.sort_time = file_transfer.time; this.seccondary_sort_indicator = file_transfer.id + 0.2903; this.display_time = file_transfer.time; diff --git a/main/src/ui/conversation_summary/default_message_display.vala b/main/src/ui/conversation_summary/default_message_display.vala index f843f116..954012a1 100644 --- a/main/src/ui/conversation_summary/default_message_display.vala +++ b/main/src/ui/conversation_summary/default_message_display.vala @@ -1,4 +1,5 @@ using Dino.Entities; +using Xmpp; namespace Dino.Ui.ConversationSummary { diff --git a/main/src/ui/conversation_summary/image_display.vala b/main/src/ui/conversation_summary/image_display.vala index 6093f759..7b77759b 100644 --- a/main/src/ui/conversation_summary/image_display.vala +++ b/main/src/ui/conversation_summary/image_display.vala @@ -1,6 +1,7 @@ using Gtk; using Dino.Entities; +using Xmpp; namespace Dino.Ui.ConversationSummary { @@ -25,7 +26,7 @@ public class ImageDisplay : Plugins.MetaConversationItem { this.stream_interactor = stream_interactor; this.file_transfer = file_transfer; - this.jid = file_transfer.direction == FileTransfer.DIRECTION_SENT ? new Jid.with_resource(file_transfer.account.bare_jid.to_string(), file_transfer.account.resourcepart) : file_transfer.counterpart; + this.jid = file_transfer.direction == FileTransfer.DIRECTION_SENT ? file_transfer.account.bare_jid.with_resource(file_transfer.account.resourcepart) : file_transfer.counterpart; this.sort_time = file_transfer.time; this.seccondary_sort_indicator = file_transfer.id + 0.2903; this.display_time = file_transfer.time; diff --git a/main/src/ui/conversation_summary/slashme_message_display.vala b/main/src/ui/conversation_summary/slashme_message_display.vala index f57950bb..3c8af78c 100644 --- a/main/src/ui/conversation_summary/slashme_message_display.vala +++ b/main/src/ui/conversation_summary/slashme_message_display.vala @@ -1,6 +1,7 @@ using Gtk; using Dino.Entities; +using Xmpp; namespace Dino.Ui.ConversationSummary { -- cgit v1.2.3-54-g00ecf