misc bugfixes
- wix: added forgotten profile in gateways management - xml_tools: removed XMLClass to the 2 methods as a direct methods - plugin_xep_100 (gateways discovery): added error callback
This commit is contained in:
parent
f9bbbed6a0
commit
2f2594de6b
10 changed files with 112 additions and 91 deletions
|
|
@ -156,7 +156,7 @@ class QuickApp():
|
|||
return
|
||||
debug(_("Connected"))
|
||||
self.setStatusOnline(True)
|
||||
self.bridge.joinMUC('conference.necton2.int', 'test', self.profiles[self.profile]['whoami'].node, self.profile) #gof:
|
||||
#self.bridge.joinMUC('conference.necton2.int', 'test', self.profiles[self.profile]['whoami'].node, self.profile) #gof:
|
||||
|
||||
|
||||
def disconnected(self, profile):
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ CARD_HEIGHT = 136
|
|||
MIN_WIDTH = 950 #Minimum size of the panel
|
||||
MIN_HEIGHT = 500
|
||||
|
||||
suits_order = ['pique', 'coeur', 'trefle', 'carreau', 'atout'] #I have swith the usual order 'trefle' and 'carreau' because card are more easy to see if suit colour change (black, red, black, red)
|
||||
suits_order = ['pique', 'coeur', 'trefle', 'carreau', 'atout'] #I have switched the usual order 'trefle' and 'carreau' because card are more easy to see if suit colour change (black, red, black, red)
|
||||
values_order = map(str,range(1,11))+["valet","cavalier","dame","roi"]
|
||||
|
||||
class Card():
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ class GatewaysManager(wx.Frame):
|
|||
"""Open the gateway manager on given server"""
|
||||
server = self.ext_server_text.GetValue()
|
||||
debug(_("Opening gateways manager on [%s]") % server)
|
||||
id = self.host.bridge.findGateways(server)
|
||||
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
|
||||
self.MakeModal(False)
|
||||
|
|
@ -157,7 +157,7 @@ class GatewaysManager(wx.Frame):
|
|||
def register_cb(event):
|
||||
"""Called when register button is clicked"""
|
||||
gateway_jid = event.GetEventObject().gateway_jid
|
||||
id = self.host.bridge.in_band_register(gateway_jid)
|
||||
id = self.host.bridge.in_band_register(gateway_jid, self.host.profile)
|
||||
self.host.current_action_ids.add(id)
|
||||
self.MakeModal(False)
|
||||
self.Destroy()
|
||||
|
|
@ -165,7 +165,7 @@ class GatewaysManager(wx.Frame):
|
|||
def unregister_cb(event):
|
||||
"""Called when unregister button is clicked"""
|
||||
gateway_jid = event.GetEventObject().gateway_jid
|
||||
id = self.host.bridge.gatewayRegister("CANCEL",gateway_jid, None)
|
||||
id = self.host.bridge.gatewayRegister("CANCEL",gateway_jid, None, self.host.profile)
|
||||
self.host.current_action_ids.add(id)
|
||||
self.MakeModal(False)
|
||||
self.Destroy()
|
||||
|
|
|
|||
|
|
@ -452,7 +452,7 @@ class MainWindow(wx.Frame, QuickApp):
|
|||
|
||||
def onFindGateways(self, e):
|
||||
debug(_("Find Gateways request"))
|
||||
id = self.bridge.findGateways(self.profiles[self.profile]['whoami'].domain)
|
||||
id = self.bridge.findGateways(self.profiles[self.profile]['whoami'].domain, self.profile)
|
||||
self.current_action_ids.add(id)
|
||||
self.current_action_ids_cb[id] = self.onGatewaysFound
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue