# HG changeset patch
# User Philippe Lago <lago_p@epitech.net>
# Date 1245751345 -7200
# Node ID 8bfaad9cfe93d13290760ac37d25dc75045c9f95
# Parent  48eaf4f0806210471598e4de03e8f58631c19321# Parent  08effaddeaa44e30ede2409e1f7e7710e09c0a3b
merge encore

diff -r 48eaf4f08062 -r 8bfaad9cfe93 src/com/beem/project/beem/service/XmppConnectionAdapter.java
--- a/src/com/beem/project/beem/service/XmppConnectionAdapter.java	Tue Jun 23 11:59:21 2009 +0200
+++ b/src/com/beem/project/beem/service/XmppConnectionAdapter.java	Tue Jun 23 12:02:25 2009 +0200
@@ -185,7 +185,6 @@
 	sdm.addFeature("http://jabber.org/protocol/disco#info");
 	JingleManager.setJingleServiceEnabled();
 	// sdm.addFeature("http://jabber.org/protocol/nick");
-
     }
 
     /**
diff -r 48eaf4f08062 -r 8bfaad9cfe93 src/com/beem/project/beem/service/aidl/IPrivacyListManager.aidl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/com/beem/project/beem/service/aidl/IPrivacyListManager.aidl	Tue Jun 23 12:02:25 2009 +0200
@@ -0,0 +1,25 @@
+package com.beem.project.beem.service.aidl;
+
+
+
+/**
+ * An aidl interface for Privacy List Manager.
+ */
+interface IPrivacyListManager {
+
+	/**
+	 *	@return: return a list of blocked users
+	 */
+	List<String> getBlockedUsers();
+	
+	/**
+	 *	@return: return a list of blocked users
+	 */
+	List<String> getBlockedUsersByList(in String listName);
+	
+	/**
+	 *	@param: block an user
+	 */
+	void addBlockedUser(in String jid);
+    
+}
\ No newline at end of file