# HG changeset patch
# User Nikita Kozlov <nikita@beem-project.com>
# Date 1295178511 -3600
# Node ID 8e627c5cae7376c2d7945faf89fad76303f79643
# Parent  30d32b73be7c03a860480bb38b3db53913195041
checkstyle

diff -r 30d32b73be7c -r 8e627c5cae73 src/com/beem/project/beem/BeemService.java
--- a/src/com/beem/project/beem/BeemService.java	Sun Jan 16 12:44:59 2011 +0100
+++ b/src/com/beem/project/beem/BeemService.java	Sun Jan 16 12:48:31 2011 +0100
@@ -48,7 +48,6 @@
 import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.ConnectionConfiguration.SecurityMode;
 import org.jivesoftware.smack.Roster.SubscriptionMode;
-import org.jivesoftware.smack.provider.PrivacyProvider;
 import org.jivesoftware.smack.provider.ProviderManager;
 import org.jivesoftware.smackx.provider.DelayInfoProvider;
 import org.jivesoftware.smackx.provider.DiscoverInfoProvider;
diff -r 30d32b73be7c -r 8e627c5cae73 src/com/beem/project/beem/service/XmppConnectionAdapter.java
--- a/src/com/beem/project/beem/service/XmppConnectionAdapter.java	Sun Jan 16 12:44:59 2011 +0100
+++ b/src/com/beem/project/beem/service/XmppConnectionAdapter.java	Sun Jan 16 12:48:31 2011 +0100
@@ -238,7 +238,7 @@
 
 	    mAdaptee.login(mLogin, mPassword, mResource);
 	    mChatManager = new BeemChatManager(mAdaptee.getChatManager(), mService);
-	    //nikita: I commented this line because of the logs provided in http://www.beem-project.com/issues/321 
+	    //nikita: I commented this line because of the logs provided in http://www.beem-project.com/issues/321
 	    //Also, since the privacylistmanager isn't finished and used, it will be safer to not initialize it
 	    //mPrivacyListManager = new PrivacyListManagerAdapter(PrivacyListManager.getInstanceFor(mAdaptee));
 	    mService.initJingle(mAdaptee);
@@ -462,7 +462,7 @@
 	    sdm = new ServiceDiscoveryManager(mAdaptee);
 
 	sdm.addFeature("http://jabber.org/protocol/disco#info");
-	//nikita: must be uncommented when the feature will be enabled 
+	//nikita: must be uncommented when the feature will be enabled
 	//sdm.addFeature("jabber:iq:privacy");
 	sdm.addFeature("http://jabber.org/protocol/caps");
 	sdm.addFeature("urn:xmpp:avatar:metadata");