diff options
author | Matthias Schiffer <mschiffer@universe-factory.net> | 2010-07-17 23:49:06 +0200 |
---|---|---|
committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2010-07-17 23:49:06 +0200 |
commit | 69aaef2680ff5c96b34ad983b665a80c06c20224 (patch) | |
tree | 08ae44133e45f3f49d8f2324f23feb9c6f028246 /src/core/ephraim_conv.erl | |
parent | 0aac619ba4dccd81018bddaa4690213b14cfe2b6 (diff) | |
download | ephraim-69aaef2680ff5c96b34ad983b665a80c06c20224.tar ephraim-69aaef2680ff5c96b34ad983b665a80c06c20224.zip |
Use nickname from VCard if no nickname is set
Diffstat (limited to 'src/core/ephraim_conv.erl')
-rw-r--r-- | src/core/ephraim_conv.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/ephraim_conv.erl b/src/core/ephraim_conv.erl index 199787a..3342bc9 100644 --- a/src/core/ephraim_conv.erl +++ b/src/core/ephraim_conv.erl @@ -25,7 +25,7 @@ loop(State) -> Body = exmpp_message:get_body(Packet), if Body =/= undefined -> - ephraim ! {ui_update, {chat_message, State#conv_state.jid, Type, State#conv_state.jid, Body}}; + ephraim ! {ui_update, {chat_message, State#conv_state.jid, Type, ephraim:get_alias(State#conv_state.jid), Body}}; true -> io:format("Received strange message from ~p:~n~p~n", [State#conv_state.jid, Packet]) end, @@ -36,7 +36,7 @@ loop(State) -> Packet2 = exmpp_message:set_type(Packet, Type), Packet3 = exmpp_xml:set_attribute(Packet2, to, State#conv_state.jid), ephraim ! {send_packet, Packet3}, - ephraim ! {ui_update, {chat_message, State#conv_state.jid, Type, State#conv_state.my_jid, Message}}, + ephraim ! {ui_update, {chat_message, State#conv_state.jid, Type, ephraim:get_alias(State#conv_state.my_jid), Message}}, loop(State); Msg -> |