mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-09 23:57:34 +02:00
Code Issues Releases Wiki Activity

* SIP Jabber cleanup (gloox).

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-03-19 09:45:02 +01:00
parent 77164b0d89
commit 36997366e1
1 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/sip/jabber/jabber.cpp
View File

@@ -25,6 +25,7 @@
#include <QInputDialog>
#include <QLineEdit>
JabberPlugin::JabberPlugin()
: p( 0 ),
m_menu ( 0 ),
@@ -32,6 +33,7 @@ JabberPlugin::JabberPlugin()
{
}
void
JabberPlugin::setProxy( QNetworkProxy* proxy )
{
@@ -45,24 +47,28 @@ JabberPlugin::name()
return QString( MYNAME );
}
const QString
JabberPlugin::friendlyName()
{
return QString( "Jabber" );
}
const QString
JabberPlugin::accountName()
{
return TomahawkSettings::instance()->jabberUsername();
}
QMenu*
JabberPlugin::menu()
{
return m_menu;
}
bool
JabberPlugin::connectPlugin( bool startup )
{
@@ -103,59 +109,64 @@ JabberPlugin::connectPlugin( bool startup )
QObject::connect( p, SIGNAL( authError( int, QString ) ), SLOT( onAuthError( int, QString ) ) );
p->resolveHostSRV();
return true;
}
void
void
JabberPlugin::onConnected()
{
if( !m_menu ) {
m_menu = new QMenu( QString( "Jabber (").append( accountName() ).append( ")" ) );
m_addFriendAction = m_menu->addAction( "Add Friend..." );
connect( m_addFriendAction, SIGNAL( triggered() ),
this, SLOT( showAddFriendDialog() ) ) ;
if ( !m_menu )
{
m_menu = new QMenu( QString( "Jabber (" ).append( accountName() ).append( ")" ) );
m_addFriendAction = m_menu->addAction( tr( "Add Friend..." ) );
connect( m_addFriendAction, SIGNAL( triggered() ), SLOT( showAddFriendDialog() ) ) ;
emit addMenu( m_menu );
}
emit connected();
}
void
void
JabberPlugin::onDisconnected()
{
if( m_menu && m_addFriendAction ) {
if ( m_menu && m_addFriendAction )
{
emit removeMenu( m_menu );
delete m_menu;
m_menu = 0;
m_addFriendAction = 0;
}
emit disconnected();
}
void
JabberPlugin::onAuthError( int code, const QString& message )
{
if ( code == gloox::ConnAuthenticationFailed )
{
emit error( SipPlugin::AuthError, message );
}
else
{
emit error( SipPlugin::ConnectionError, message );
}
}
void
JabberPlugin::showAddFriendDialog()
{
bool ok;
QString id = QInputDialog::getText( 0, tr( "Add Friend" ),
tr( "Enter Jabber ID:" ), QLineEdit::Normal,
"", &ok );
tr( "Enter Jabber ID:" ), QLineEdit::Normal, "", &ok );
if ( !ok )
return;