From 775aa283b29200c1f269a814e2c28a93ffc6bb00 Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Thu, 1 Dec 2005 20:11:48 +0000 Subject: [PATCH] we are now ablt to save a status message that contain sevral lines --- src/config.py | 5 +++-- src/dialogs.py | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/config.py b/src/config.py index 7c98e9dab..d6864332f 100644 --- a/src/config.py +++ b/src/config.py @@ -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): diff --git a/src/dialogs.py b/src/dialogs.py index 18f315f32..18d6d7dcf 100644 --- a/src/dialogs.py +++ b/src/dialogs.py @@ -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')