From 1e78707dab946689eb078a5b0550cd4b0098cf79 Mon Sep 17 00:00:00 2001 From: Nikos Kouremenos Date: Tue, 15 Nov 2005 16:48:40 +0000 Subject: [PATCH] clean ups --- src/groupchat_window.py | 3 +-- src/roster_window.py | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/groupchat_window.py b/src/groupchat_window.py index 828c909ce..50d5194f6 100644 --- a/src/groupchat_window.py +++ b/src/groupchat_window.py @@ -399,7 +399,6 @@ class GroupchatWindow(chat.Chat): status = status.strip() if status != '': status = gtkgui_helpers.reduce_chars_newlines(status, max_lines = 1) - colorstring = 'dimgrey' # escape markup entities and make them small italic and fg color color = gtkgui_helpers._get_fade_color(self.list_treeview[room_jid], selected, focus) @@ -433,7 +432,7 @@ class GroupchatWindow(chat.Chat): def chg_contact_status(self, room_jid, nick, show, status, role, affiliation, jid, reason, actor, statusCode, new_nick, account): - '''When a user changes his or her status''' + '''When an occupant changes his or her status''' if show == 'invisible': return if not role: diff --git a/src/roster_window.py b/src/roster_window.py index 9858bcb54..c2ea4406d 100644 --- a/src/roster_window.py +++ b/src/roster_window.py @@ -110,8 +110,6 @@ class RosterWindow: model = self.tree.get_model() if self.get_account_iter(account): return - show_list = ['offline', 'connecting', 'online', 'chat', - 'away', 'xa', 'dnd', 'invisible'] if self.regroup: show = helpers.get_global_show() @@ -119,7 +117,7 @@ class RosterWindow: _('Merged accounts'), 'account', '', 'all', False, None]) return - show = show_list[gajim.connections[account].connected] + show = gajim.SHOW_LIST[gajim.connections[account].connected] tls_pixbuf = None if gajim.con_types.has_key(account) and \ @@ -234,7 +232,7 @@ class RosterWindow: return self.transports_state_images[transport] return self.jabber_state_images - def draw_contact(self, jid, account, selected=False, focus=False): + def draw_contact(self, jid, account, selected = False, focus = False): '''draw the correct state image, name and avatar''' model = self.tree.get_model() iters = self.get_contact_iter(jid, account)