From 29f41b223a43e1c0c28e93ca703c137fd0217aad Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Thu, 6 Apr 2006 16:20:59 +0000 Subject: [PATCH] we can now disable avatars by setting width or height to 0. Partially fixes #1816 --- src/gajim.py | 10 ++++++---- src/vcard.py | 6 ++++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/gajim.py b/src/gajim.py index 4a6f875be..be3010db0 100755 --- a/src/gajim.py +++ b/src/gajim.py @@ -1053,15 +1053,17 @@ class Interface: path_to_original_file = path_to_file + '.' + typ pixbuf.save(path_to_original_file, typ) # Generate and save the resized, color avatar - path_to_normal_file = path_to_file + '_notif_size_colored.png' pixbuf = gtkgui_helpers.get_scaled_pixbuf( gtkgui_helpers.get_pixbuf_from_data(photo_decoded), 'notification') - pixbuf.save(path_to_normal_file, 'png') + if pixbuf: + path_to_normal_file = path_to_file + '_notif_size_colored.png' + pixbuf.save(path_to_normal_file, 'png') # Generate and save the resized, black and white avatar - path_to_bw_file = path_to_file + '_notif_size_bw.png' bwbuf = gtkgui_helpers.get_scaled_pixbuf( gtkgui_helpers.make_pixbuf_grayscale(pixbuf), 'notification') - bwbuf.save(path_to_bw_file, 'png') + if bwbuf: + path_to_bw_file = path_to_file + '_notif_size_bw.png' + bwbuf.save(path_to_bw_file, 'png') def add_event(self, account, jid, typ, args): '''add an event to the awaiting_events var''' diff --git a/src/vcard.py b/src/vcard.py index d6be6a7fb..c87225afc 100644 --- a/src/vcard.py +++ b/src/vcard.py @@ -224,8 +224,10 @@ class VcardWindow: dialogs.ErrorDialog(_('Could not load image'), msg) continue else: - path_to_file = os.path.join(gajim.TMP, 'avatar_scaled.png') - scaled_pixbuf.save(path_to_file, 'png') + if scaled_pixbuf: + path_to_file = os.path.join(gajim.TMP, + 'avatar_scaled.png') + scaled_pixbuf.save(path_to_file, 'png') done = True else: done = True