mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-11 16:44:05 +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

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

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