changeset 3811c43b31b8 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=3811c43b31b8 description: fix pixbuf saves and missing import
diffstat:
src/gtkgui_helpers.py | 6 +++--- src/gui_interface.py | 6 +++--- src/profile_window.py | 2 +- src/vcard.py | 1 + 4 files changed, 8 insertions(+), 7 deletions(-)
diffs (82 lines):
diff -r 12e91e17fdd9 -r 3811c43b31b8 src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Mon Dec 31 19:05:59 2012 +0400 +++ b/src/gtkgui_helpers.py Mon Dec 31 19:38:32 2012 +0400 @@ -421,7 +421,7 @@ return None
if want_type: - typ = pixbufloader.get_format()['name'] + typ = pixbufloader.get_format().get_name() return pixbuf, typ else: return pixbuf @@ -828,14 +828,14 @@
# Save image try: - pixbuf.save(file_path, image_format) + pixbuf.savev(file_path, image_format, [], []) except Exception, e: log.debug('Error saving avatar: %s' % str(e)) if os.path.exists(file_path): os.remove(file_path) new_file_path = '.'.join(file_path.split('.')[:-1]) + '.jpeg' def on_ok(file_path, pixbuf): - pixbuf.save(file_path, 'jpeg') + pixbuf.savev(file_path, 'jpeg', [], []) dialogs.ConfirmationDialog(_('Extension not supported'), _('Image cannot be saved in %(type)s format. Save as ' '%(new_filename)s?') % {'type': image_format, diff -r 12e91e17fdd9 -r 3811c43b31b8 src/gui_interface.py --- a/src/gui_interface.py Mon Dec 31 19:05:59 2012 +0400 +++ b/src/gui_interface.py Mon Dec 31 19:38:32 2012 +0400 @@ -2489,7 +2489,7 @@ extension = '.png' path_to_original_file = path_to_file + extension try: - pixbuf.save(path_to_original_file, typ) + pixbuf.savev(path_to_original_file, typ, [], []) except Exception, e: log.error('Error writing avatar file %s: %s' % ( path_to_original_file, str(e))) @@ -2499,7 +2499,7 @@ path_to_normal_file = path_to_file + '_notif_size_colored' + \ extension try: - pixbuf.save(path_to_normal_file, 'png') + pixbuf.savev(path_to_normal_file, 'png', [], []) except Exception, e: log.error('Error writing avatar file %s: %s' % \ (path_to_original_file, str(e))) @@ -2509,7 +2509,7 @@ if bwbuf: path_to_bw_file = path_to_file + '_notif_size_bw' + extension try: - bwbuf.save(path_to_bw_file, 'png') + bwbuf.savev(path_to_bw_file, 'png', [], []) except Exception, e: log.error('Error writing avatar file %s: %s' % \ (path_to_original_file, str(e))) diff -r 12e91e17fdd9 -r 3811c43b31b8 src/profile_window.py --- a/src/profile_window.py Mon Dec 31 19:05:59 2012 +0400 +++ b/src/profile_window.py Mon Dec 31 19:38:32 2012 +0400 @@ -150,7 +150,7 @@ if scaled_pixbuf: path_to_file = os.path.join(gajim.TMP, 'avatar_scaled.png') - scaled_pixbuf.save(path_to_file, 'png') + scaled_pixbuf.savev(path_to_file, 'png', [], []) must_delete = True
fd = open(path_to_file, 'rb') diff -r 12e91e17fdd9 -r 3811c43b31b8 src/vcard.py --- a/src/vcard.py Mon Dec 31 19:05:59 2012 +0400 +++ b/src/vcard.py Mon Dec 31 19:38:32 2012 +0400 @@ -33,6 +33,7 @@
from gi.repository import Gtk from gi.repository import GObject +from gi.repository import Gdk import base64 import time import locale