Merge lp:~paulliu/friends/for-conor into lp:~cjcurran/friends/correct-contact-name

Proposed by Ying-Chun Liu
Status: Merged
Approved by: Conor Curran
Approved revision: 37
Merged at revision: 37
Proposed branch: lp:~paulliu/friends/for-conor
Merge into: lp:~cjcurran/friends/correct-contact-name
Diff against target: 13 lines (+3/-1)
1 file modified
friends/protocols/facebook.py (+3/-1)
To merge this branch: bzr merge lp:~paulliu/friends/for-conor
Reviewer Review Type Date Requested Status
Conor Curran Approve
Review via email: mp+132053@code.launchpad.net
To post a comment you must log in.
Conor Curran (cjcurran) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'friends/protocols/facebook.py'
2--- friends/protocols/facebook.py 2012-10-30 08:44:44 +0000
3+++ friends/protocols/facebook.py 2012-10-30 10:50:27 +0000
4@@ -294,7 +294,9 @@
5
6 if("username" in contact_json.keys()):
7 vcaws = EBook.VCardAttribute.new('', 'X-FOLKS-WEB-SERVICES-IDS')
8- vcaws.add_value("jabber:" + contact_json['username'] + "@chat.facebook.com")
9+ vcaws_param = EBook.VCardAttributeParam.new ("jabber")
10+ vcaws_param.add_value(contact_json['username'] + "@chat.facebook.com")
11+ vcaws.add_param(vcaws_param)
12 log.debug("Adding folks web services id as jabber:%s@chat.facebook.com", contact_json['username'])
13 vcard.add_attribute(vcaws)
14

Subscribers

People subscribed via source and target branches

to all changes: