← Back to branch summary

~ubuntu-branches/debian/experimental/kopete/experimental

« back to all changes in this revision

Viewing changes to protocols/jabber/jabbercontact.cpp

  • Committer: Package Import Robot
  • Author(s): Maximiliano Curia
  • Date: 2015-02-24 11:32:57 UTC
  • mfrom: (1.1.41 vivid)
  • Revision ID: package-import@ubuntu.com-20150224113257-gnupg4v7lzz18ij0
Tags: 4:14.12.2-1
* New upstream release (14.12.2).
* Bump Standards-Version to 3.9.6, no changes needed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
protocols/jabber/jabbercontact.cpp
164
164
        connect(removeAuthAction, SIGNAL(triggered(bool)), SLOT(slotRemoveAuth()));
165
165
        actionAuthorization->addAction(removeAuthAction);
166
166
 
167
 
#ifdef GOOGLETALK_SUPPORT
168
 
 
169
 
        if ( account()->enabledGoogleTalk() ) {
170
 
 
171
 
                KAction *googleTalkCallAction;
172
 
                googleTalkCallAction = new KAction( this );
173
 
                googleTalkCallAction->setIcon( (KIcon("voicecall") ) );
174
 
                googleTalkCallAction->setText( i18n ("Call Google Talk contact") );
175
 
                googleTalkCallAction->setEnabled( account()->supportGoogleTalk(contactId()) );
176
 
                connect(googleTalkCallAction, SIGNAL(triggered(bool)), SLOT(makeGoogleTalkCallAction()));
177
 
                actions->append(googleTalkCallAction);
 
167
#ifdef LIBJINGLE_SUPPORT
 
168
 
 
169
        if ( account()->enabledLibjingle() ) {
 
170
 
 
171
                KAction *libjingleCallAction;
 
172
                libjingleCallAction = new KAction( this );
 
173
                libjingleCallAction->setIcon( (KIcon("voicecall") ) );
 
174
                libjingleCallAction->setText( i18n ("Call contact") );
 
175
                libjingleCallAction->setEnabled( account()->supportLibjingle(contactId()) );
 
176
                connect(libjingleCallAction, SIGNAL(triggered(bool)), SLOT(makeLibjingleCallAction()));
 
177
                actions->append(libjingleCallAction);
178
178
 
179
179
        }
180
180
 
1438
1438
}
1439
1439
#endif
1440
1440
 
1441
 
#ifdef GOOGLETALK_SUPPORT
 
1441
#ifdef LIBJINGLE_SUPPORT
1442
1442
 
1443
 
void JabberContact::makeGoogleTalkCallAction()
 
1443
void JabberContact::makeLibjingleCallAction()
1444
1444
{
1445
 
        account()->makeGoogleTalkCall(contactId());
 
1445
        account()->makeLibjingleCall(contactId());
1446
1446
}
1447
1447
 
1448
1448
#endif