we are now ablt to save a status message that contain sevral lines

This commit is contained in:
Yann Leboulanger 2005-12-01 20:11:48 +00:00
parent 8fd1717afd
commit 775aa283b2
2 changed files with 6 additions and 3 deletions

View File

@ -835,8 +835,8 @@ class PreferencesWindow:
# on_msg_treemodel_row_changed but message is None
# (hasn't been added yet) so do not TB
return
gajim.config.set_per('statusmsg', val, 'message',
model[iter][1].decode('utf-8'))
msg = helpers.to_one_line(model[iter][1].decode('utf-8'))
gajim.config.set_per('statusmsg', val, 'message', msg)
iter = model.iter_next(iter)
gajim.interface.save_config()
@ -889,6 +889,7 @@ class PreferencesWindow:
for msg in gajim.config.get_per('statusmsg'):
iter = model.append()
val = gajim.config.get_per('statusmsg', msg, 'message')
val = helpers.from_one_line(val)
model.set(iter, 0, msg, 1, val)
def on_msg_cell_edited(self, cell, row, new_text):

View File

@ -232,7 +232,9 @@ class ChangeStatusMessageDialog:
self.message_buffer.set_text(msg)
self.values = {'':''} # have an empty string selectable, so user can clear msg
for msg in gajim.config.get_per('statusmsg'):
self.values[msg] = gajim.config.get_per('statusmsg', msg, 'message')
val = gajim.config.get_per('statusmsg', msg, 'message')
val = helpers.from_one_line(val)
self.values[msg] = val
sorted_keys_list = helpers.get_sorted_keys(self.values)
liststore = gtk.ListStore(str, str)
message_comboboxentry = self.xml.get_widget('message_comboboxentry')