From 19d99e0a892babfb672e8ff77dcad80f1eaaa1a6 Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Wed, 12 Oct 2005 20:17:58 +0000 Subject: [PATCH] remove the image in tc window when we get the vcard and there is no image in it --- src/tabbed_chat_window.py | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/src/tabbed_chat_window.py b/src/tabbed_chat_window.py index cb669a97a..1afd211d0 100644 --- a/src/tabbed_chat_window.py +++ b/src/tabbed_chat_window.py @@ -237,27 +237,30 @@ class TabbedChatWindow(chat.Chat): return 0 # FIXME: always zero why?? def show_avatar(self, jid, resource): - if self.plugin.avatar_pixbufs[jid] is None: - return # contact has no avatar - - pixbuf = self.plugin.avatar_pixbufs[jid] - w = gajim.config.get('avatar_width') - h = gajim.config.get('avatar_height') - scaled_buf = pixbuf.scale_simple(w, h, gtk.gdk.INTERP_HYPER) - - x = None + # Get the XML instance + xml = None if self.xmls.has_key(jid): - x = self.xmls[jid] + xml = self.xmls[jid] else: # it can be xmls[jid/resource] if it's a vcard from pm jid_with_resource = jid + '/' + resource if self.xmls.has_key(jid_with_resource): - x = self.xmls[jid_with_resource] + xml = self.xmls[jid_with_resource] + if not xml: + return + + if self.plugin.avatar_pixbufs[jid] is None: + # contact has no avatar + scaled_buf = None + else: + pixbuf = self.plugin.avatar_pixbufs[jid] + w = gajim.config.get('avatar_width') + h = gajim.config.get('avatar_height') + scaled_buf = pixbuf.scale_simple(w, h, gtk.gdk.INTERP_HYPER) - if x is not None: - image = x.get_widget('avatar_image') - image.set_from_pixbuf(scaled_buf) - image.show_all() + image = xml.get_widget('avatar_image') + image.set_from_pixbuf(scaled_buf) + image.show_all() def set_state_image(self, jid): prio = 0