diff options
author | Matthias Schiffer <mschiffer@universe-factory.net> | 2010-10-05 03:34:02 +0200 |
---|---|---|
committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2010-10-05 03:34:02 +0200 |
commit | 3d451b3dc69d91b04c1153f63436b63940287b13 (patch) | |
tree | 93c647b492621c39225b25eb185962de60353f30 /src/gui/Ephraim.vala | |
parent | 2444ac841fad00133f231e9667ab427c4ce4d39e (diff) | |
download | ephraim-3d451b3dc69d91b04c1153f63436b63940287b13.tar ephraim-3d451b3dc69d91b04c1153f63436b63940287b13.zip |
Sending work now, too
Diffstat (limited to 'src/gui/Ephraim.vala')
-rw-r--r-- | src/gui/Ephraim.vala | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/Ephraim.vala b/src/gui/Ephraim.vala index fb5e77f..5ddcd5e 100644 --- a/src/gui/Ephraim.vala +++ b/src/gui/Ephraim.vala @@ -17,7 +17,7 @@ public class Ephraim { unowned Gtk.TreeView rosterView = builder.get_object("Roster") as Gtk.TreeView; - Gee.TreeMap<Eva.Ref, Conversation> conversations = new Gee.TreeMap<Eva.Ref, Conversation>(); + Gee.TreeMap<string, Conversation> conversations = new Gee.TreeMap<string, Conversation>(); unowned Gtk.Notebook conversationNotebook = builder.get_object("Conversations") as Gtk.Notebook; ContactList roster = new ContactList(rosterView); @@ -28,22 +28,22 @@ public class Ephraim { coreconn.update_contact.connect(roster.update_contact); - coreconn.new_conversation.connect((conv_ref, jid) => { + coreconn.new_conversation.connect((jid) => { Contact contact = roster.get_contact(jid); Conversation conv = new Conversation(conversationNotebook, jid, contact != null ? contact.display_string : null); - conversations[conv_ref] = conv; + conversations[jid] = conv; conv.send_message.connect((type, message) => coreconn.send_message(jid, type, message)); }); - coreconn.chat_message.connect((conv_ref, from, type, message) => { - if(!(conv_ref in conversations.keys)) { + coreconn.chat_message.connect((jid, from, type, message) => { + if(!(jid in conversations.keys)) { warn_if_reached(); return; } - conversations[conv_ref].chat_message(from, type, message); + conversations[jid].chat_message(from, type, message); }); //if(!coreconn.start()) |