copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

allow default status message to be on several lines. Fixes #5580

Browse source
This commit is contained in:
Yann Leboulanger 2010-01-29 19:40:15 +01:00
parent b56de4fea8
commit 7035a5cb24
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/config.py
View file

@ -1026,6 +1026,7 @@ class PreferencesWindow:
status.sort() status.sort()
for status_ in status: for status_ in status:
msg = gajim.config.get_per('defaultstatusmsg', status_, 'message') msg = gajim.config.get_per('defaultstatusmsg', status_, 'message')
msg = helpers.from_one_line(msg)
enabled = gajim.config.get_per('defaultstatusmsg', status_, 'enabled') enabled = gajim.config.get_per('defaultstatusmsg', status_, 'enabled')
iter_ = model.append() iter_ = model.append()
uf_show = helpers.get_uf_show(status_) uf_show = helpers.get_uf_show(status_)
@ -1043,6 +1044,7 @@ class PreferencesWindow:
def on_default_msg_treemodel_row_changed(self, model, path, iter_): def on_default_msg_treemodel_row_changed(self, model, path, iter_):
status = model[iter_][0] status = model[iter_][0]
message = model[iter_][2].decode('utf-8') message = model[iter_][2].decode('utf-8')
message = helpers.to_one_line(message)
gajim.config.set_per('defaultstatusmsg', status, 'enabled', gajim.config.set_per('defaultstatusmsg', status, 'enabled',
model[iter_][3]) model[iter_][3])
gajim.config.set_per('defaultstatusmsg', status, 'message', message) gajim.config.set_per('defaultstatusmsg', status, 'message', message)

5
src/roster_window.py
View file

@ -2136,8 +2136,9 @@ class RosterWindow:
'mood': '', 'mood_text': ''} 'mood': '', 'mood_text': ''}
if show in gajim.config.get_per('defaultstatusmsg'): if show in gajim.config.get_per('defaultstatusmsg'):
if gajim.config.get_per('defaultstatusmsg', show, 'enabled'): if gajim.config.get_per('defaultstatusmsg', show, 'enabled'):
on_response(gajim.config.get_per('defaultstatusmsg', show, msg = gajim.config.get_per('defaultstatusmsg', show, 'message')
'message'), empty_pep) msg = helpers.from_one_line(msg)
on_response(msg, empty_pep)
return return
if not always_ask and ((show == 'online' and not gajim.config.get( if not always_ask and ((show == 'online' and not gajim.config.get(
'ask_online_status')) or (show in ('offline', 'invisible') and not \ 'ask_online_status')) or (show in ('offline', 'invisible') and not \