From 298d2bbe7d00fcc5fba39b5a219aa82d9f5f5253 Mon Sep 17 00:00:00 2001
From: Yana Stamcheva <yana@jitsi.org>
Date: Tue, 7 Feb 2006 10:01:20 +0000
Subject: [PATCH] the MetaContactListService was removed until it's ready for
 use

---
 .../communicator/impl/gui/main/CommunicatorMain.java   |  9 +++++----
 .../java/sip/communicator/impl/gui/main/MainFrame.java | 10 ++++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/net/java/sip/communicator/impl/gui/main/CommunicatorMain.java b/src/net/java/sip/communicator/impl/gui/main/CommunicatorMain.java
index c4ce828de..c80f32998 100755
--- a/src/net/java/sip/communicator/impl/gui/main/CommunicatorMain.java
+++ b/src/net/java/sip/communicator/impl/gui/main/CommunicatorMain.java
@@ -18,7 +18,6 @@
 
 import net.java.sip.communicator.impl.gui.main.configforms.ConfigurationFrame;
 import net.java.sip.communicator.impl.gui.main.utils.ImageLoader;
-import net.java.sip.communicator.service.contactlist.MetaContactListService;
 
 import com.l2fprod.gui.plaf.skin.Skin;
 import com.l2fprod.gui.plaf.skin.SkinLookAndFeel;
@@ -34,7 +33,7 @@ public class CommunicatorMain {
 	
 	private MainFrame mainFrame;
 	
-	private MetaContactListService contactList;
+	//private MetaContactListService contactList;
 	
 	public CommunicatorMain(){
 		
@@ -42,7 +41,7 @@ public CommunicatorMain(){
 		  
 		ConfigurationFrame 	configFrame = new ConfigurationFrame();
 		
-	    mainFrame = new MainFrame(this.getUser());
+	    mainFrame = new MainFrame(this.getUser(), getContactList());
 	      
 	    mainFrame.setConfigFrame(configFrame);
 	    
@@ -173,9 +172,11 @@ public static void main(String args[]){
 		communicatorMain.show();
 	}
 
+	/*
 	public void setContactList(MetaContactListService contactList) {
 		this.contactList = contactList;
 		
 		this.mainFrame.setContactList(contactList);
-	}	
+	}
+	*/
 }
diff --git a/src/net/java/sip/communicator/impl/gui/main/MainFrame.java b/src/net/java/sip/communicator/impl/gui/main/MainFrame.java
index 18ef3a0f1..9114a5a42 100755
--- a/src/net/java/sip/communicator/impl/gui/main/MainFrame.java
+++ b/src/net/java/sip/communicator/impl/gui/main/MainFrame.java
@@ -46,17 +46,19 @@ public class MainFrame extends JFrame {
 
 	private QuickMenu quickMenu;
 
-	private MetaContactListService contactList;
+	private ContactList contactList;
 
 	private User user;
 
 	private Dimension minimumFrameSize = new Dimension(
 			Constants.MAINFRAME_MIN_WIDTH, Constants.MAINFRAME_MIN_HEIGHT);
 
-	public MainFrame(User user) {
+	public MainFrame(User user, ContactList contactList) {
 		
 		this.user = user;
 
+		this.contactList = contactList;
+		
 		callPanel = new CallPanel(this);
 		tabbedPane = new MainTabbedPane(this);
 		quickMenu = new QuickMenu(this);
@@ -100,12 +102,12 @@ public CallPanel getCallPanel() {
 		return callPanel;
 	}
 
-	public MetaContactListService getContactList() {
+	public ContactList getContactList() {
 		
 		return this.contactList;
 	}
 
-	public void setContactList(MetaContactListService contactList) {
+	public void setContactList(ContactList contactList) {
 		
 		this.contactList = contactList;
 	}