Moved some message handling from GUI to core

1 files changed, 2 insertions, 14 deletions

diff --git a/src/gui/Conversation.vala b/src/gui/Conversation.vala
index 811fa5c..246aba0 100644
--- a/src/gui/Conversation.vala
+++ b/src/gui/Conversation.vala
@@ -64,23 +64,11 @@ public class Conversation {
     conversations.remove(widget);
   }
   
-  public void sent_message(string type, string message) {
+  public void chat_message(string type, string from, string message) {
     if(type != "chat")
       return;
     
-    string str = me + ": " + message;
-    
-    if(content.buffer.text.length != 0)
-      str = "\n" + str;
-    
-    content.buffer.text += str;
-  }
-  
-  public void receive_message(string type, string message) {
-    if(type != "chat")
-      return;
-    
-    string str = display_name + ": " + message;
+    string str = from + ": " + message;
     
     if(content.buffer.text.length != 0)
       str = "\n" + str;