EnDroid

Merge lp:~isoschiz/endroid/lp1212803 into lp:endroid

  1. lp1212803
  2. Merge into trunk
Proposed by Martin Morrison
Status: Merged
Approved by: Simon C
Approved revision: 47
Merged at revision: 50
Proposed branch: lp:~isoschiz/endroid/lp1212803
Merge into: lp:endroid
Diff against target: 12 lines (+1/-1)
1 file modified
src/endroid/wokkelhandler.py (+1/-1)
To merge this branch: bzr merge lp:~isoschiz/endroid/lp1212803
Reviewer Review Type Date Requested Status
Simon C Approve
Review via email: mp+180732@code.launchpad.net

Commit message

Merge fix to lp:1212803

Description of the change

Fixes the linked bug.

To post a comment you must log in.
Revision history for this message
Simon C (slimey) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/endroid/wokkelhandler.py'
2--- src/endroid/wokkelhandler.py 2013-08-14 18:18:15 +0000
3+++ src/endroid/wokkelhandler.py 2013-08-18 12:35:51 +0000
4@@ -134,7 +134,7 @@
5 'perhaps from a room? : {}'.format(message.body))
6 return
7
8- sender_jid = user.entity.userhost()
9+ sender_jid = user.entity.full()
10 room_userhost = room.roomJID.userhost()
11
12 m = Message("muc", sender_jid, message.body,

Subscribers

People subscribed via source and target branches