EnDroid

Merge lp:~jmillican/endroid/minor-fix into lp:endroid

  1. minor-fix
  2. Merge into trunk
Proposed by Jonathan Millican
Status: Merged
Approved by: Martin Morrison
Approved revision: 17
Merged at revision: 17
Proposed branch: lp:~jmillican/endroid/minor-fix
Merge into: lp:endroid
Diff against target: 21 lines (+2/-2)
1 file modified
src/endroid/__init__.py (+2/-2)
To merge this branch: bzr merge lp:~jmillican/endroid/minor-fix
Reviewer Review Type Date Requested Status
Martin Morrison Approve
Review via email: mp+120796@code.launchpad.net

Commit message

Fixed a couple of bugs resulting from making UserManagement a class.

Description of the change

Found these bugs in initialising MUC. Minor change needs merging to make EnDroid work for all cases.

To post a comment you must log in.
Revision history for this message
Martin Morrison (isoschiz) wrote :

And this is why we need a regressible test suite.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/endroid/__init__.py'
2--- src/endroid/__init__.py 2012-08-13 23:58:35 +0000
3+++ src/endroid/__init__.py 2012-08-22 14:36:20 +0000
4@@ -97,7 +97,7 @@
5 # Then join all the rooms we are configured in (and init their plugins)
6 roomjoinds = []
7 for rjid, rconf in self.conf['rooms'].items():
8- pm = PluginManager(self.messagehandler, rjid)
9+ pm = PluginManager(self.messagehandler, self.usermanagement, rjid)
10 if rconf['plugins']:
11 for p in rconf['plugins']:
12 pm.load(p, rconf['plugindata'][p])
13@@ -109,7 +109,7 @@
14 logging.info("Joining Room " + rjid + " as \"" + rnick + "\"")
15
16 d = self.wh.join(JID(rjid), rnick)
17- d.addCallback(UserManagement.joined_room)
18+ d.addCallback(self.usermanagement.joined_room)
19 roomjoinds.append(d)
20
21 yield DeferredList(roomjoinds)

Subscribers

People subscribed via source and target branches