From 9448a325c7d9fba69cdc856baf1e037764728f00 Mon Sep 17 00:00:00 2001
From: Nikos Kouremenos <kourem@gmail.com>
Date: Tue, 10 Oct 2006 15:58:48 +0000
Subject: [PATCH] use introduced functions

---
 src/roster_window.py | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/roster_window.py b/src/roster_window.py
index 22d7c36b7..413247307 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -222,6 +222,8 @@ class RosterWindow:
 		if jid == gajim.get_jid_from_account(account):
 			self.add_self_contact(account)
 			return
+		if contact.sub != 'from':
+			return
 		if gajim.jid_is_transport(contact.jid):
 			# if jid is transport, check if we wanna show it in roster
 			if not gajim.config.get('show_transports_group'):
@@ -238,12 +240,7 @@ class RosterWindow:
 		elif contact.name or len(contact.groups):
 			hide = False
 
-		observer = False
-		if hide:
-			if contact.sub == 'from':
-				observer = True
-			else:
-				return
+		observer = contact.is_observer()
 
 		if observer:
 			# if he has a tag, remove it
@@ -397,14 +394,9 @@ class RosterWindow:
 			return
 		if contact.jid in gajim.to_be_removed[account]:
 			gajim.to_be_removed[account].remove(contact.jid)
-		# JEP-0162
-		hide = True
-		if contact.sub in ('both', 'to', 'from'):
-			hide = False
-		elif contact.ask == 'subscribe':
-			hide = False
-		elif contact.name or len(contact.groups):
-			hide = False
+		
+		
+		hide = contact.is_hidden_in_roster()
 
 		showOffline = gajim.config.get('showoffline')
 		if (contact.show in ('offline', 'error') or hide) and \