# HG changeset patch
# User Vincent Veronis <veroni_v@epitech.net>
# Date 1254410685 -7200
# Node ID 7a884504e36c31c64c5a5f66c8916122d516c3c2
# Parent  2e33fad3ec9853448ce1d42f70f11846ba776507# Parent  c566f7fd7df1a734b5053a4c82c0d07cd1120474
Merge.

diff -r 2e33fad3ec98 -r 7a884504e36c src/com/beem/project/beem/BeemService.java
--- 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();