roster.get_status_message don't take pep_dict anymore.
This commit is contained in:
parent
1c1d6b6c26
commit
ef281d8608
|
@ -3021,11 +3021,7 @@ class Interface:
|
|||
self.roster.send_status(a, show, message)
|
||||
self.roster.send_pep(a, pep_dict)
|
||||
for show in shows:
|
||||
if len(shows[show]) == 1:
|
||||
pep_dict = helpers.get_pep_dict(shows[show][0])
|
||||
else:
|
||||
pep_dict = helpers.get_global_pep()
|
||||
message = self.roster.get_status_message(show, pep_dict, on_message)
|
||||
message = self.roster.get_status_message(show, on_message)
|
||||
return False
|
||||
|
||||
def show_systray(self):
|
||||
|
|
|
@ -2099,16 +2099,17 @@ class RosterWindow:
|
|||
always_ask
|
||||
show_pep can be False to hide pep things from status message or True
|
||||
'''
|
||||
empty_pep = {'activity': '', 'subactivity': '', 'activity_text': '',
|
||||
'mood': '', 'mood_text': ''}
|
||||
if show in gajim.config.get_per('defaultstatusmsg'):
|
||||
if gajim.config.get_per('defaultstatusmsg', show, 'enabled'):
|
||||
on_response(gajim.config.get_per('defaultstatusmsg', show,
|
||||
'message'), None)
|
||||
'message'), empty_pep)
|
||||
return
|
||||
if not always_ask and ((show == 'online' and not gajim.config.get(
|
||||
'ask_online_status')) or (show in ('offline', 'invisible') and not \
|
||||
gajim.config.get('ask_offline_status'))):
|
||||
on_response('', {'activity': '', 'subactivity': '',
|
||||
'activity_text': '', 'mood': '', 'mood_text': ''})
|
||||
on_response('', empty_pep)
|
||||
return
|
||||
|
||||
dlg = dialogs.ChangeStatusMessageDialog(on_response, show, show_pep)
|
||||
|
|
Loading…
Reference in New Issue