multi-profile/subscription misc fixes
This commit is contained in:
parent
534612084c
commit
6cfa6a1413
1 changed files with 21 additions and 23 deletions
|
|
@ -118,6 +118,7 @@ class MainWindow(wx.Frame, QuickApp):
|
|||
|
||||
def plug_profile(self, profile_key='@DEFAULT@'):
|
||||
"""Hide profile panel then plug profile"""
|
||||
debug (_('plugin profile %s' % profile_key))
|
||||
self.profile_pan.Hide()
|
||||
self.contactList.Show()
|
||||
self.sizer.Layout()
|
||||
|
|
@ -330,7 +331,7 @@ class MainWindow(wx.Frame, QuickApp):
|
|||
def __updateStatus(self):
|
||||
show = filter(lambda x:x[1] == self.statusBox.GetValue(), const_STATUS)[0][0]
|
||||
status = self.statusTxt.GetValue()
|
||||
self.bridge.setPresence(show=show, statuses={'default':status}) #FIXME: manage multilingual statuses
|
||||
self.bridge.setPresence(show=show, statuses={'default':status}, profile_key=self.profile) #FIXME: manage multilingual statuses
|
||||
|
||||
def onStatusChange(self, e):
|
||||
debug(_("Status change request"))
|
||||
|
|
@ -352,7 +353,7 @@ class MainWindow(wx.Frame, QuickApp):
|
|||
if dlg.ShowModal() == wx.ID_OK:
|
||||
jid=JID(dlg.GetValue())
|
||||
if jid.is_valid():
|
||||
self.bridge.addContact(jid.short)
|
||||
self.bridge.addContact(jid.short, profile_key=self.profile)
|
||||
else:
|
||||
error (_("'%s' is an invalid JID !"), jid)
|
||||
#TODO: notice the user
|
||||
|
|
@ -378,7 +379,7 @@ class MainWindow(wx.Frame, QuickApp):
|
|||
|
||||
if dlg.ShowModal() == wx.ID_YES:
|
||||
info(_("Unsubscribing %s presence"), target.short)
|
||||
self.bridge.delContact(target.short)
|
||||
self.bridge.delContact(target.short, profile_key=self.profile)
|
||||
|
||||
dlg.Destroy()
|
||||
|
||||
|
|
@ -393,7 +394,7 @@ class MainWindow(wx.Frame, QuickApp):
|
|||
dlg.ShowModal()
|
||||
dlg.Destroy()
|
||||
return
|
||||
id = self.bridge.getCard(target.short)
|
||||
id = self.bridge.getCard(target.short, profile_key=self.profile)
|
||||
self.current_action_ids.add(id)
|
||||
self.current_action_ids_cb[id] = self.onProfileReceived
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue