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

Don't send xHtml if not needed. Fix #4612.

This commit is contained in:
Julien Pivotto 2009-01-21 19:53:02 +00:00
parent 66fc900f5f
commit 114909c3a9
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/message_textview.py
View File

@ -221,10 +221,9 @@ class MessageTextView(gtk.TextView):
tags['bold'] = False tags['bold'] = False
iter = buffer.get_start_iter() iter = buffer.get_start_iter()
old = buffer.get_start_iter() old = buffer.get_start_iter()
start, finish = buffer.get_bounds()
plaintext = buffer.get_text(start, finish, False)
text = '' text = ''
modified = False modified = False
def xhtml_special(text): def xhtml_special(text):
text = text.replace('<', '&lt;') text = text.replace('<', '&lt;')
text = text.replace('>', '&gt;') text = text.replace('>', '&gt;')
@ -238,17 +237,15 @@ class MessageTextView(gtk.TextView):
text += self.begin_tags[tag_name] text += self.begin_tags[tag_name]
modified = True modified = True
while (iter.forward_to_tag_toggle(None) and not iter.is_end()): while (iter.forward_to_tag_toggle(None) and not iter.is_end()):
modified = True
text += xhtml_special(buffer.get_text(old, iter)) text += xhtml_special(buffer.get_text(old, iter))
old.forward_to_tag_toggle(None) old.forward_to_tag_toggle(None)
new_tags = [] new_tags, old_tags, end_tags = [], [], []
old_tags = []
end_tags = []
for tag in iter.get_toggled_tags(True): for tag in iter.get_toggled_tags(True):
tag_name = tag.get_property('name') tag_name = tag.get_property('name')
if tag_name not in self.begin_tags: if tag_name not in self.begin_tags:
continue continue
new_tags.append(tag_name) new_tags.append(tag_name)
modified = True
for tag in iter.get_tags(): for tag in iter.get_tags():
tag_name = tag.get_property('name') tag_name = tag.get_property('name')
@ -279,7 +276,7 @@ class MessageTextView(gtk.TextView):
continue continue
text += self.end_tags[tag_name] text += self.end_tags[tag_name]
if modified and text != plaintext: if modified:
return '<p>' + self.make_clickable_urls(text) + '</p>' return '<p>' + self.make_clickable_urls(text) + '</p>'
else: else:
return None return None