cleanup and a FIXME for dkirov

src/common/gajim.py

@@ -70,7 +70,10 @@ events_for_ui = {}
 #... and its mutex
 mutex_events_for_ui = mutex.mutex()
 
-socks5quue = None
+socks5quue = None # FIXME: this var has a typo in queue but I think it is also not used!
+
+SHOW_LIST = ['offline', 'connecting', 'online', 'chat', 'away', 'xa', 'dnd',
+	'invisible']
 
 def get_nick_from_jid(jid):
 	pos = jid.find('@')

src/tooltips.py

@@ -190,8 +190,7 @@ class NotificationAreaTooltip(BaseTooltip, StatusTable):
 				status_idx = gajim.connections[account].connected
 				# uncomment the following to hide offline accounts
 				# if status_idx == 0: continue
-				from common.connection import STATUS_LIST
-				status = STATUS_LIST[status_idx]
+				status = gajim.SHOW_LIST[status_idx]
 				message = gajim.connections[account].status
 				single_line = helpers.get_uf_show(status)
 				if message is None: