copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

same as [7379] in 2 other functions. fixes #2534

This commit is contained in:
Yann Leboulanger 2006-11-13 07:31:05 +00:00
parent 0f53cbb3f6
commit 1611d77fbc
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/roster_window.py
View File

@ -3552,21 +3552,22 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
def iconCellDataFunc(self, column, renderer, model, iter, data = None): def iconCellDataFunc(self, column, renderer, model, iter, data = None):
'''When a row is added, set properties for icon renderer''' '''When a row is added, set properties for icon renderer'''
theme = gajim.config.get('roster_theme') theme = gajim.config.get('roster_theme')
if model[iter][C_TYPE] == 'account': type_ = model[iter][C_TYPE]
if type_ == 'account':
color = gajim.config.get_per('themes', theme, 'accountbgcolor') color = gajim.config.get_per('themes', theme, 'accountbgcolor')
if color: if color:
renderer.set_property('cell-background', color) renderer.set_property('cell-background', color)
else: else:
self.set_renderer_color(renderer, gtk.STATE_ACTIVE) self.set_renderer_color(renderer, gtk.STATE_ACTIVE)
renderer.set_property('xalign', 0) renderer.set_property('xalign', 0)
elif model[iter][C_TYPE] == 'group': elif type_ == 'group':
color = gajim.config.get_per('themes', theme, 'groupbgcolor') color = gajim.config.get_per('themes', theme, 'groupbgcolor')
if color: if color:
renderer.set_property('cell-background', color) renderer.set_property('cell-background', color)
else: else:
self.set_renderer_color(renderer, gtk.STATE_PRELIGHT) self.set_renderer_color(renderer, gtk.STATE_PRELIGHT)
renderer.set_property('xalign', 0.2) renderer.set_property('xalign', 0.2)
else: elif type_: # prevent type_ = None, see http://trac.gajim.org/ticket/2534
jid = model[iter][C_JID].decode('utf-8') jid = model[iter][C_JID].decode('utf-8')
account = model[iter][C_ACCOUNT].decode('utf-8') account = model[iter][C_ACCOUNT].decode('utf-8')
if jid in gajim.newly_added[account]: if jid in gajim.newly_added[account]:
@ -3648,19 +3649,20 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
def fill_secondary_pixbuf_rederer(self, column, renderer, model, iter, data=None): def fill_secondary_pixbuf_rederer(self, column, renderer, model, iter, data=None):
'''When a row is added, set properties for secondary renderer (avatar or padlock)''' '''When a row is added, set properties for secondary renderer (avatar or padlock)'''
theme = gajim.config.get('roster_theme') theme = gajim.config.get('roster_theme')
if model[iter][C_TYPE] == 'account': type_ = model[iter][C_TYPE]
if type_ == 'account':
color = gajim.config.get_per('themes', theme, 'accountbgcolor') color = gajim.config.get_per('themes', theme, 'accountbgcolor')
if color: if color:
renderer.set_property('cell-background', color) renderer.set_property('cell-background', color)
else: else:
self.set_renderer_color(renderer, gtk.STATE_ACTIVE) self.set_renderer_color(renderer, gtk.STATE_ACTIVE)
elif model[iter][C_TYPE] == 'group': elif type_ == 'group':
color = gajim.config.get_per('themes', theme, 'groupbgcolor') color = gajim.config.get_per('themes', theme, 'groupbgcolor')
if color: if color:
renderer.set_property('cell-background', color) renderer.set_property('cell-background', color)
else: else:
self.set_renderer_color(renderer, gtk.STATE_PRELIGHT) self.set_renderer_color(renderer, gtk.STATE_PRELIGHT)
else: # contact elif type_: # prevent type_ = None, see http://trac.gajim.org/ticket/2534
jid = model[iter][C_JID].decode('utf-8') jid = model[iter][C_JID].decode('utf-8')
account = model[iter][C_ACCOUNT].decode('utf-8') account = model[iter][C_ACCOUNT].decode('utf-8')
if jid in gajim.newly_added[account]: if jid in gajim.newly_added[account]: