mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-04 21:27:58 +02:00
Code Issues Releases Wiki Activity

WIP: headless: fix crashes in sipjabber

Browse Source
This commit is contained in:
Dominik Schmidt
2011-11-16 15:21:01 +01:00
parent b431c34d5f
commit add5308bc3
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -75,24 +75,26 @@ JabberPlugin::JabberPlugin( const QString& pluginId )
{ {
qDebug() << Q_FUNC_INFO; qDebug() << Q_FUNC_INFO;
m_configWidget = QWeakPointer< QWidget >( new QWidget );
m_ui = new Ui_JabberConfig;
m_ui->setupUi( m_configWidget.data() );
m_configWidget.data()->setVisible( false );
m_currentUsername = accountName(); m_currentUsername = accountName();
m_currentServer = readServer(); m_currentServer = readServer();
m_currentPassword = readPassword(); m_currentPassword = readPassword();
m_currentPort = readPort(); m_currentPort = readPort();
#ifndef ENABLE_HEADLESS
m_configWidget = QWeakPointer< QWidget >( new QWidget );
m_ui = new Ui_JabberConfig;
m_ui->setupUi( m_configWidget.data() );
m_configWidget.data()->setVisible( false );
m_ui->jabberUsername->setText( m_currentUsername ); m_ui->jabberUsername->setText( m_currentUsername );
m_ui->jabberPassword->setText( m_currentPassword ); m_ui->jabberPassword->setText( m_currentPassword );
m_ui->jabberServer->setText( m_currentServer ); m_ui->jabberServer->setText( m_currentServer );
m_ui->jabberPort->setValue( m_currentPort ); m_ui->jabberPort->setValue( m_currentPort );
m_ui->jidExistsLabel->hide(); m_ui->jidExistsLabel->hide();
connect( m_ui->jabberUsername, SIGNAL( textChanged( QString ) ), SLOT( onCheckJidExists( QString ) ) ); connect( m_ui->jabberUsername, SIGNAL( textChanged( QString ) ), SLOT( onCheckJidExists( QString ) ) );
#endif
// setup JID object // setup JID object
Jreen::JID jid = Jreen::JID( accountName() ); Jreen::JID jid = Jreen::JID( accountName() );
@@ -149,7 +151,9 @@ JabberPlugin::JabberPlugin( const QString& pluginId )
connect(m_roster, SIGNAL(subscriptionReceived(Jreen::RosterItem::Ptr,Jreen::Presence)), connect(m_roster, SIGNAL(subscriptionReceived(Jreen::RosterItem::Ptr,Jreen::Presence)),
SLOT(onSubscriptionReceived(Jreen::RosterItem::Ptr,Jreen::Presence))); SLOT(onSubscriptionReceived(Jreen::RosterItem::Ptr,Jreen::Presence)));
#ifndef ENABLE_HEADLESS
connect(m_avatarManager, SIGNAL(newAvatar(QString)), SLOT(onNewAvatar(QString))); connect(m_avatarManager, SIGNAL(newAvatar(QString)), SLOT(onNewAvatar(QString)));
#endif
} }
JabberPlugin::~JabberPlugin() JabberPlugin::~JabberPlugin()