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

Do not set tab to active color when we shouldn't, fix bug in [6914]

This commit is contained in:
Jean-Marie Traissard 2006-09-25 14:36:24 +00:00
parent 0b54816178
commit ee7b16c405
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/chat_control.py
View File

@ -1283,7 +1283,7 @@ class ChatControl(ChatControlBase):
if chatstate in ('inactive', 'gone') and\
self.parent_win.get_active_control() != self:
color = self.lighten_color(color)
else: # active or no chatstate
elif chatstate == 'active' : # active, get color from gtk
color = self.parent_win.notebook.style.fg[gtk.STATE_ACTIVE]

15
src/groupchat_control.py
View File

@ -363,23 +363,24 @@ class GroupchatControl(ChatControlBase):
has_focus = self.parent_win.window.get_property('has-toplevel-focus')
current_tab = self.parent_win.get_active_control() == self
color_name = None
color = None
theme = gajim.config.get('roster_theme')
if chatstate == 'attention' and (not has_focus or not current_tab):
self.attention_flag = True
color = gajim.config.get_per('themes', theme,
color_name = gajim.config.get_per('themes', theme,
'state_muc_directed_msg_color')
elif chatstate:
if chatstate == 'active' or (current_tab and has_focus):
self.attention_flag = False
# get active color from gtk
color = self.parent_win.notebook.style.fg[gtk.STATE_ACTIVE]
elif chatstate == 'newmsg' and (not has_focus or not current_tab) and\
not self.attention_flag:
color = gajim.config.get_per('themes', theme, 'state_muc_msg_color')
if color:
color = gtk.gdk.colormap_get_system().alloc_color(color)
else:
color = self.parent_win.notebook.style.fg[gtk.STATE_ACTIVE]
color_name = gajim.config.get_per('themes', theme, 'state_muc_msg_color')
if color_name:
color = gtk.gdk.colormap_get_system().alloc_color(color_name)
label_str = self.name
return (label_str, color)