← Back to branch summary

~emesene-team/emesene/master

« back to all changes in this revision

Viewing changes to emesene/gui/base/ConversationStatus.py

  • Committer: Sven (Sbte)
  • Date: 2012-09-06 22:13:17 UTC
  • Revision ID: git-v1:213f21f89b82d2974d8424b738b42ad33a89d918
emesene 2.12.9

Show diffs side-by-side

added added

removed removed

Lines of Context:
emesene/gui/base/ConversationStatus.py
39
39
                                       incomming, tstamp, 
40
40
                                       mtype = mtype, mstyle=cstyle)
41
41
 
 
42
        msg.message = MarkupParser.escape(msg.message)
42
43
        if self.config.b_show_emoticons:
43
 
            msg.message = MarkupParser.replace_emotes(
44
 
                                              MarkupParser.escape(msg.message),
 
44
            msg.message = MarkupParser.replace_emotes( msg.message,
45
45
                                              cedict, cepath, msg.sender)
46
46
 
47
47
        msg.message = MarkupParser.urlify(msg.message)