erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

primitivus: fixed actionResult call (fix gateways management)

Browse source
This commit is contained in:
Goffi 2012-11-14 21:31:38 +01:00
commit ced79bca8d
2 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
frontends/src/primitivus/gateways.py
View file

@ -52,9 +52,9 @@ class GatewaysManager(urwid.WidgetWrap, QuickGatewaysManager):
popup = sat_widgets.Alert(_("Error"), _("You must enter an external server JID"), ok_cb=self.host.removePopUp)
self.host.showPopUp(popup)
return
id = self.host.bridge.findGateways(server, self.host.profile)
self.host.current_action_ids.add(id)
self.host.current_action_ids_cb[id] = self.host.onGatewaysFound
action_id = self.host.bridge.findGateways(server, self.host.profile)
self.host.current_action_ids.add(action_id)
self.host.current_action_ids_cb[action_id] = self.host.onGatewaysFound
self.host.removeWindow()
def addGateway(self, widget_list, gateway, param):
@ -78,11 +78,11 @@ class GatewaysManager(urwid.WidgetWrap, QuickGatewaysManager):
def onRegister(self, button):
"""Called when register button is clicked"""
gateway_jid = button.gateway_jid
id = self.host.bridge.in_band_register(gateway_jid, self.host.profile)
self.host.current_action_ids.add(id)
action_id = self.host.bridge.in_band_register(gateway_jid, self.host.profile)
self.host.current_action_ids.add(action_id)
def onUnregister(self, button):
"""Called when unregister button is clicked"""
gateway_jid = button.gateway_jid
id = self.host.bridge.gatewayRegister("CANCEL",gateway_jid, None, self.host.profile)
self.host.current_action_ids.add(id)
action_id = self.host.bridge.gatewayRegister("CANCEL",gateway_jid, None, self.host.profile)
self.host.current_action_ids.add(action_id)

5
frontends/src/primitivus/primitivus
View file

@ -429,7 +429,10 @@ class PrimitivusApp(QuickApp):
pop_up_widget = sat_widgets.ConfirmDialog(data["message"], no_cb=refuse_cb, yes_cb=accept_cb)
self.showPopUp(pop_up_widget)
def actionResult(self, type, id, data):
def actionResult(self, type, id, data, profile):
if not self.check_profile(profile):
return
if not id in self.current_action_ids:
debug (_('unknown id, ignoring'))
return