Skip to content
Snippets Groups Projects
Commit 2315fa2b authored by Yann Leboulanger's avatar Yann Leboulanger
Browse files

fix saving avatar in info window. Fixes #4188

parent 3c7e7f50
No related branches found
No related tags found
No related merge requests found
...@@ -768,7 +768,7 @@ def destroy_widget(widget): ...@@ -768,7 +768,7 @@ def destroy_widget(widget):
def on_avatar_save_as_menuitem_activate(widget, jid, account, def on_avatar_save_as_menuitem_activate(widget, jid, account,
default_name = ''): default_name = ''):
def on_continue(response): def on_continue(response, file_path):
if response < 0: if response < 0:
return return
# Get pixbuf # Get pixbuf
...@@ -795,9 +795,11 @@ default_name = ''): ...@@ -795,9 +795,11 @@ default_name = ''):
if os.path.exists(file_path): if os.path.exists(file_path):
os.remove(file_path) os.remove(file_path)
new_file_path = '.'.join(file_path.split('.')[:-1]) + '.jpeg' new_file_path = '.'.join(file_path.split('.')[:-1]) + '.jpeg'
def on_ok(file_path, pixbuf):
pixbuf.save(file_path, 'jpeg')
dialogs.ConfirmationDialog(_('Extension not supported'), dialogs.ConfirmationDialog(_('Extension not supported'),
_('Image cannot be saved in %(type)s format. Save as %(new_filename)s?') % {'type': type_, 'new_filename': new_file_path}, _('Image cannot be saved in %(type)s format. Save as %(new_filename)s?') % {'type': type_, 'new_filename': new_file_path},
on_response_ok = (on_ok2, new_file_path, pixbuf)) on_response_ok = (on_ok, new_file_path, pixbuf))
else: else:
dialog.destroy() dialog.destroy()
...@@ -819,7 +821,7 @@ default_name = ''): ...@@ -819,7 +821,7 @@ default_name = ''):
return return
dialog2 = dialogs.FTOverwriteConfirmationDialog( dialog2 = dialogs.FTOverwriteConfirmationDialog(
_('This file already exists'), _('What do you want to do?'), _('This file already exists'), _('What do you want to do?'),
propose_resume=False, on_response=on_continue) propose_resume=False, on_response=(on_continue, file_path))
dialog2.set_transient_for(dialog) dialog2.set_transient_for(dialog)
dialog2.set_destroy_with_parent(True) dialog2.set_destroy_with_parent(True)
else: else:
...@@ -830,7 +832,7 @@ default_name = ''): ...@@ -830,7 +832,7 @@ default_name = ''):
' directory.')) ' directory.'))
return return
on_continue(0) on_continue(0, file_path)
def on_cancel(widget): def on_cancel(widget):
dialog.destroy() dialog.destroy()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment