Mercurial > libervia-web
comparison src/browser/libervia_main.py @ 692:7a9c7b9f6a28
browser_side: use host.default_muc instead of C.DEFAULT_MUC
author | souliane <souliane@mailoo.org> |
---|---|
date | Thu, 09 Apr 2015 11:37:25 +0200 |
parents | 3845a086f0b3 |
children | 82123705474b |
comparison
equal
deleted
inserted
replaced
691:16079280a39e | 692:7a9c7b9f6a28 |
---|---|
401 else: | 401 else: |
402 self.bridge.getMassiveMblogs('GROUP', list(wid.accepted_groups), None, profile=C.PROF_KEY_NONE, callback=wid.massiveInsert) | 402 self.bridge.getMassiveMblogs('GROUP', list(wid.accepted_groups), None, profile=C.PROF_KEY_NONE, callback=wid.massiveInsert) |
403 | 403 |
404 #we ask for our own microblogs: | 404 #we ask for our own microblogs: |
405 self.loadOurMainEntries() | 405 self.loadOurMainEntries() |
406 | |
407 def gotDefaultMUC(default_muc): | |
408 self.default_muc = default_muc | |
409 self.bridge.getDefaultMUC(profile=None, callback=gotDefaultMUC) | |
406 | 410 |
407 def addContactList(self, dummy): | 411 def addContactList(self, dummy): |
408 contact_list = ContactList(self) | 412 contact_list = ContactList(self) |
409 self.panel.addContactList(contact_list) | 413 self.panel.addContactList(contact_list) |
410 | 414 |
1088 """Show a failure that has been returned when trying to join an invalid room. | 1092 """Show a failure that has been returned when trying to join an invalid room. |
1089 | 1093 |
1090 @param failure (defer.Failure): Failure instance | 1094 @param failure (defer.Failure): Failure instance |
1091 """ | 1095 """ |
1092 # FIXME: remove asap, see self.showFailure | 1096 # FIXME: remove asap, see self.showFailure |
1093 msg = _(u"Invalid room identifier. Please give a room short or full identifier like 'room' or 'room@%s'.") % C.DEFAULT_MUC_SERVICE | 1097 msg = _(u"Invalid room identifier. Please give a room short or full identifier like 'room' or '%s'.") % self.default_muc |
1094 self.showFailure(err_data, msg) | 1098 self.showFailure(err_data, msg) |
1095 | 1099 |
1096 | 1100 |
1097 if __name__ == '__main__': | 1101 if __name__ == '__main__': |
1098 app = SatWebFrontend() | 1102 app = SatWebFrontend() |