[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdenetwork/kopete/protocols/jabber
From:       Pali Rohár <pali.rohar () gmail ! com>
Date:       2013-05-21 13:41:29
Message-ID: 20130521134129.3864DAC85D () svn ! kde ! org
[Download RAW message or body]

SVN commit 1355852 by pali:

Now connecting to Google XMPP server working also without specifing explicit \
talk.google.com server So also check for Google Talk account from JID domain \
(gmail.com)


 M  +2 -1      jabberaccount.cpp  
 M  +4 -1      ui/jabbereditaccountwidget.cpp  


--- trunk/KDE/kdenetwork/kopete/protocols/jabber/jabberaccount.cpp #1355851:1355852
@@ -1741,7 +1741,8 @@
 
 bool JabberAccount::enabledGoogleTalk()
 {
-	return configGroup()->readEntry("GoogleTalk", ( server() == "talk.google.com" ? \
true : false ) ); +	XMPP::Jid jid ( myself()->contactId () );
+	return configGroup()->readEntry("GoogleTalk", ( ( server() == "talk.google.com" || \
jid.domain() == "gmail.com" ) ? true : false ) );  }
 
 void JabberAccount::enableGoogleTalk(bool b)
--- trunk/KDE/kdenetwork/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp \
#1355851:1355852 @@ -47,6 +47,8 @@
 #include "dlgjabberchangepassword.h"
 #include "privacydlg.h"
 
+#include "xmpp.h"
+
 #ifdef JINGLE_SUPPORT
 //FIXME:Should be replaced by Solid.
 #include "alsaio.h"
@@ -361,7 +363,8 @@
 	}
 
 #ifdef GOOGLETALK_SUPPORT
-	if ( GoogleTalk->isChecked() && mServer->text().trimmed() != "talk.google.com" )
+	XMPP::Jid jid ( account()->myself()->contactId () );
+	if ( GoogleTalk->isChecked() && ( mServer->text().trimmed() != "talk.google.com" && \
jid.domain() != "gmail.com" ) )  {
 		KMessageBox::sorry(this, i18n("Google Talk libjingle support is only for \
GTalk/Gmail account, which connect to server talk.google.com."), i18n("Invalid Google \
Talk"));  return false;


[prev in list] [next in list] [prev in thread] [next in thread]