add more check. see #2534

This commit is contained in:
Yann Leboulanger 2006-11-13 07:54:52 +00:00
parent 1611d77fbc
commit 94a1d2f9b0
1 changed files with 9 additions and 0 deletions

View File

@ -3568,6 +3568,9 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
self.set_renderer_color(renderer, gtk.STATE_PRELIGHT)
renderer.set_property('xalign', 0.2)
elif type_: # prevent type_ = None, see http://trac.gajim.org/ticket/2534
if not model[iter][C_JID]:
# This can append when at the moment we add the row
return
jid = model[iter][C_JID].decode('utf-8')
account = model[iter][C_ACCOUNT].decode('utf-8')
if jid in gajim.newly_added[account]:
@ -3621,6 +3624,9 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
gtkgui_helpers.get_theme_font_for_option(theme, 'groupfont'))
renderer.set_property('xpad', 4)
elif type_: # prevent type_ = None, see http://trac.gajim.org/ticket/2534
if not model[iter][C_JID]:
# This can append when at the moment we add the row
return
jid = model[iter][C_JID].decode('utf-8')
account = model[iter][C_ACCOUNT].decode('utf-8')
color = gajim.config.get_per('themes', theme, 'contacttextcolor')
@ -3663,6 +3669,9 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
else:
self.set_renderer_color(renderer, gtk.STATE_PRELIGHT)
elif type_: # prevent type_ = None, see http://trac.gajim.org/ticket/2534
if not model[iter][C_JID]:
# This can append when at the moment we add the row
return
jid = model[iter][C_JID].decode('utf-8')
account = model[iter][C_ACCOUNT].decode('utf-8')
if jid in gajim.newly_added[account]: