From 8877d45bc55612ab58b1d7add698ed9bd5375f3b Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Mon, 7 Nov 2005 16:17:06 +0000 Subject: [PATCH] prevent wrong color to be shown when no bgcolor is selected (do the same as in roster) --- src/groupchat_window.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/groupchat_window.py b/src/groupchat_window.py index 06875acce..14863f475 100644 --- a/src/groupchat_window.py +++ b/src/groupchat_window.py @@ -363,16 +363,16 @@ class GroupchatWindow(chat.Chat): name = nick # add status msg, if not empty, under contact name in the treeview - if status and gajim.config.get('show_status_msgs_in_roster'): - status = status.strip() + if status and gajim.config.get('show_status_msgs_in_roster'): + status = status.strip() if status != '': colorstring = 'dimgrey' - # escape markup entities and make them small italic and fg color + # escape markup entities and make them small italic and fg color #color = gtkgui_helpers._get_fade_color(self.list_treeview[room_jid], # selected) #colorstring = "#%04x%04x%04x" % (color.red, color.green, color.blue) name += '\n' '%s'\ - % (colorstring, gtkgui_helpers.escape_for_pango_markup(status)) + % (colorstring, gtkgui_helpers.escape_for_pango_markup(status)) role_iter = self.get_role_iter(room_jid, role) if not role_iter: @@ -1529,8 +1529,12 @@ current room topic.') % command, room_jid) if model.iter_parent(iter): bgcolor = gajim.config.get_per('themes', theme, 'contactbgcolor') else: # it is root (eg. group) + print 'grp' bgcolor = gajim.config.get_per('themes', theme, 'groupbgcolor') - renderer.set_property('cell-background', bgcolor) + if bgcolor: + renderer.set_property('cell-background', bgcolor) + else: + renderer.set_property('cell-background', None) def on_list_treeview_button_press_event(self, widget, event): '''popup user's group's or agent menu'''