Merge.
authorVincent Veronis <veroni_v@epitech.net>
Thu, 01 Oct 2009 17:24:45 +0200
changeset 426 7a884504e36c
parent 425 2e33fad3ec98 (current diff)
parent 421 c566f7fd7df1 (diff)
child 427 ac5021ad2ac1
Merge.
--- a/src/com/beem/project/beem/BeemService.java	Thu Oct 01 17:23:21 2009 +0200
+++ b/src/com/beem/project/beem/BeemService.java	Thu Oct 01 17:24:45 2009 +0200
@@ -127,9 +127,9 @@
 	    mHost = mSettings.getString("settings_key_xmpp_server", "");
 	    mPort = Integer.parseInt(mSettings.getString("settings_key_xmpp_port", "5222"));
 	}
-
 	if (mSettings.getBoolean("settings_key_gmail", false)) {
 	    mHost = "talk.google.com";
+	    mLogin = tmpJid;
 	}
 
 	initConnectionConfig();