diff options
Diffstat (limited to 'src/net')
2 files changed, 18 insertions, 4 deletions
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java index 2cc3999..04d9013 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java @@ -382,8 +382,22 @@ public class ProtocolProviderServiceJabberImpl try { //XMPPConnection.DEBUG_ENABLED = true; - String userID - = StringUtils.parseName(getAccountID().getUserID()); + String userID = null; + + /* with a google account (either gmail or google apps + * related ones), the userID MUST be the full e-mail address + * not just the ID + */ + if(getAccountID().getProtocolDisplayName(). + equals("Google Talk")) + { + userID = getAccountID().getUserID(); + } + else + { + userID = StringUtils.parseName(getAccountID().getUserID()); + } + String serviceName = StringUtils.parseServer(getAccountID().getUserID()); diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/jingle/JinglePacketFactory.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/jingle/JinglePacketFactory.java index 65cecd0..b5dd27d 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/jingle/JinglePacketFactory.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/jingle/JinglePacketFactory.java @@ -30,8 +30,8 @@ public class JinglePacketFactory */ public static JingleIQ createRinging(JingleIQ sessionInitiate) { - return createSessionInfo(sessionInitiate.getFrom(), - sessionInitiate.getTo(), + return createSessionInfo(sessionInitiate.getTo(), + sessionInitiate.getFrom(), sessionInitiate.getSID(), SessionInfoType.ringing); } |