--- a/src/com/beem/project/beem/jingle/JingleService.java	Thu Sep 17 17:39:05 2009 +0200
+++ b/src/com/beem/project/beem/jingle/JingleService.java	Thu Sep 17 17:50:26 2009 +0200
@@ -5,7 +5,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smackx.jingle.JingleManager;
@@ -16,10 +15,7 @@
 import org.jivesoftware.smackx.jingle.media.JingleMediaManager;
 import org.jivesoftware.smackx.jingle.media.PayloadType;
 import org.jivesoftware.smackx.jingle.nat.BasicTransportManager;
-import org.jivesoftware.smackx.jingle.nat.ICETransportManager;
-import org.jivesoftware.smackx.jingle.nat.JingleTransportManager;
 import org.jivesoftware.smackx.jingle.nat.TransportCandidate;
-import org.jivesoftware.smackx.workgroup.agent.TranscriptManager;
 
 import android.util.Log;
 
@@ -28,7 +24,7 @@
  * @author nikita
  */
 public class JingleService {
-    private static final String TAG = "JingleService"; 
+    private static final String TAG = "JingleService";
     private JingleManager mJingleManager;
     private List<JingleMediaManager> mMediaManagers;
     private JingleSession mIn;

--- a/src/com/beem/project/beem/service/Contact.java	Thu Sep 17 17:39:05 2009 +0200
+++ b/src/com/beem/project/beem/service/Contact.java	Thu Sep 17 17:50:26 2009 +0200
@@ -6,15 +6,12 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-
 import org.jivesoftware.smack.RosterGroup;
 import org.jivesoftware.smack.packet.Presence;
 import org.jivesoftware.smack.util.StringUtils;
-
 import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
-
 import com.beem.project.beem.utils.Status;
 
 /**
@@ -80,8 +77,8 @@
 	mName = mJID;
 	mStatus = Status.CONTACT_STATUS_DISCONNECT;
 	mRes = new ArrayList<String>();
-	String res = StringUtils.parseResource(jid); 
-	if (! "".equals(res))
+	String res = StringUtils.parseResource(jid);
+	if (!"".equals(res))
 	    mRes.add(res);
 	mGroups = new ArrayList<String>();
     }
@@ -328,7 +325,7 @@
 	Uri u = Uri.parse(build.toString());
 	return u;
     }
-    
+
     /**
      * Get a URI to access the specific contact on this resource.
      * @param resource the resource of the contact
@@ -341,8 +338,7 @@
 	if (!"".equals(name))
 	    build.append('@');
 	build.append(StringUtils.parseServer(mJID));
-	if (!"".equals(resource))
-	{
+	if (!"".equals(resource)) {
 	    build.append('/');
 	    build.append(resource);
 	}

--- a/src/com/beem/project/beem/service/RosterAdapter.java	Thu Sep 17 17:39:05 2009 +0200
+++ b/src/com/beem/project/beem/service/RosterAdapter.java	Thu Sep 17 17:50:26 2009 +0200
@@ -1,3 +1,6 @@
+/**
+ *
+ */
 package com.beem.project.beem.service;
 
 
@@ -11,7 +14,6 @@
 import org.jivesoftware.smack.RosterListener;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.Presence;
-import org.jivesoftware.smack.util.StringUtils;
 
 import android.os.RemoteCallbackList;
 import android.os.RemoteException;
@@ -90,6 +92,7 @@
 		mAdaptee.removeEntry(entry);
 	    } else {
 		mAdaptee.getGroup(group).removeEntry(entry);
+		mRosterListener.onEntryDeleteFromGroup(group, contact.getJID());
 	    }
 	} catch (XMPPException e) {
 	    e.printStackTrace();
@@ -196,7 +199,7 @@
 	 * Event which is fired when an entry is deleted for a group.
 	 * @param group the group the entry was.
 	 * @param jid the jid of the entry which is deleted.
-	 * /
+	 */
 	public void onEntryDeleteFromGroup(String group, String jid) {
 	    //Log.i(TAG, "entry delete listener");
 	    final int n = mRemoteRosListeners.beginBroadcast();
@@ -210,7 +213,7 @@
 	    }
 	    mRemoteRosListeners.finishBroadcast();
 
-	} */
+	}
 
 	/**
 	 * {@inheritDoc}
@@ -291,7 +294,7 @@
 		} catch (RemoteException e) {
 		    // The RemoteCallbackList will take care of removing the
 		    // dead listeners.
-		    Log.w(TAG, "Error while updating roster entries presence", e);
+		    Log.w(TAG, "Error while updating roster entries", e);
 		}
 	    }
 	    mRemoteRosListeners.finishBroadcast();

--- a/src/com/beem/project/beem/service/XmppConnectionAdapter.java	Thu Sep 17 17:39:05 2009 +0200
+++ b/src/com/beem/project/beem/service/XmppConnectionAdapter.java	Thu Sep 17 17:50:26 2009 +0200
@@ -231,8 +231,8 @@
      * Set the privacy list to use.
      * @param mPrivacyList the mPrivacyList to set
      */
-    public void setPrivacyList(PrivacyListManagerAdapter privacyList) {
-	this.mPrivacyList = privacyList;
+    public void setPrivacyList(PrivacyListManagerAdapter PrivacyList) {
+	this.mPrivacyList = PrivacyList;
     }
 
     /**
@@ -332,7 +332,7 @@
 		} catch (RemoteException e) {
 		    // The RemoteCallbackList will take care of removing the
 		    // dead listeners.
-		    Log.w(TAG, "Eror while triggering remote connection listeners", e);
+		    Log.w(TAG, "Error while triggering remote connection listeners", e);
 		}
 	    }
 	    mRemoteConnListeners.finishBroadcast();

--- a/src/com/beem/project/beem/ui/SendIM.java	Thu Sep 17 17:39:05 2009 +0200
+++ b/src/com/beem/project/beem/ui/SendIM.java	Thu Sep 17 17:50:26 2009 +0200
@@ -427,14 +427,13 @@
 	    // TODO Auto-generated method stub
 
 	}
-	
+
 	@Override
-        public void onEntryDeleteFromGroup(String group, String jid)
-                throws RemoteException {
+        public void onEntryDeleteFromGroup(String group, String jid) throws RemoteException {
 	    // TODO Auto-generated method stub
-	    
+
         }
-	
+
 	@Override
 	public void onPresenceChanged(PresenceAdapter presence) throws RemoteException {
 	    if (mContact.getJID().equals(StringUtils.parseBareAddress(presence.getFrom()))) {