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

keep image tags when we replace the temporary image by the downloaded image. Fixes #8182

Browse source
This commit is contained in:
Yann Leboulanger 2015-11-15 14:28:31 +01:00
parent ec991fd06d
commit 821b701a66
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/htmltextview.py
View file

@ -521,11 +521,11 @@ class HtmlHandler(xml.sax.handler.ContentHandler):
tag.title = title tag.title = title
return tag return tag
def _update_img(self, output, attrs, img_mark): def _update_img(self, output, attrs, img_mark, tags):
'''Callback function called after the function helpers.download_image. '''Callback function called after the function helpers.download_image.
''' '''
mem, alt = output mem, alt = output
self._process_img(attrs, (mem, alt, img_mark)) self._process_img(attrs, (mem, alt, img_mark, tags))
def _process_img(self, attrs, loaded=None): def _process_img(self, attrs, loaded=None):
'''Process a img tag. '''Process a img tag.
@ -534,6 +534,7 @@ class HtmlHandler(xml.sax.handler.ContentHandler):
update = False update = False
pixbuf = None pixbuf = None
replace_mark = None replace_mark = None
replace_tags = None
try: try:
if attrs['src'].startswith('data:image/'): if attrs['src'].startswith('data:image/'):
@ -543,14 +544,14 @@ class HtmlHandler(xml.sax.handler.ContentHandler):
mem = base64.standard_b64decode(urllib.parse.unquote( mem = base64.standard_b64decode(urllib.parse.unquote(
img).encode('utf-8')) img).encode('utf-8'))
elif loaded is not None: elif loaded is not None:
(mem, alt, replace_mark) = loaded (mem, alt, replace_mark, replace_tags) = loaded
update = True update = True
else: else:
if self.conv_textview: if self.conv_textview:
img_mark = self.textbuf.create_mark(None, self.iter, True) img_mark = self.textbuf.create_mark(None, self.iter, True)
gajim.thread_interface(helpers.download_image, [ gajim.thread_interface(helpers.download_image, [
self.conv_textview.account, attrs], self._update_img, self.conv_textview.account, attrs], self._update_img,
[attrs, img_mark]) [attrs, img_mark, self._get_style_tags()])
alt = attrs.get('alt', '') alt = attrs.get('alt', '')
if alt: if alt:
alt += '\n' alt += '\n'
@ -608,7 +609,10 @@ class HtmlHandler(xml.sax.handler.ContentHandler):
self.textbuf.delete(working_iter, next_iter) self.textbuf.delete(working_iter, next_iter)
self.textbuf.delete_mark(replace_mark) self.textbuf.delete_mark(replace_mark)
if pixbuf is not None: if pixbuf is not None:
tags = self._get_style_tags() if replace_mark:
tags = replace_tags
else:
tags = self._get_style_tags()
if tags: if tags:
tmpmark = self.textbuf.create_mark(None, working_iter, True) tmpmark = self.textbuf.create_mark(None, working_iter, True)
self.textbuf.insert_pixbuf(working_iter, pixbuf) self.textbuf.insert_pixbuf(working_iter, pixbuf)