mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 22:26:32 +02:00
Code Issues Releases Wiki Activity

fix merge config changes

Browse Source
This commit is contained in:
Leo Franchi
2011-05-03 16:38:45 -04:00
parent ea7e8f6ede
commit c72f6cf508
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/sip/jreen/jabber.cpp
View File

@@ -77,6 +77,10 @@ JabberPlugin::JabberPlugin( const QString& pluginId )
m_ui->jabberPassword->setText( readPassword() ); m_ui->jabberPassword->setText( readPassword() );
m_ui->jabberServer->setText( readServer() ); m_ui->jabberServer->setText( readServer() );
m_ui->jabberPort->setValue( readPort() ); m_ui->jabberPort->setValue( readPort() );
m_currentUsername = accountName();
m_currentServer = readServer();
m_currentPassword = readPassword();
m_currentPort = readPort();
// setup JID object // setup JID object
Jreen::JID jid = Jreen::JID( accountName() ); Jreen::JID jid = Jreen::JID( accountName() );
@@ -915,7 +919,7 @@ JabberPlugin::saveConfig()
{ {
TomahawkSettings::instance()->setValue( pluginId() + "/autoconnect", m_ui->checkBoxAutoConnect->isChecked() ); TomahawkSettings::instance()->setValue( pluginId() + "/autoconnect", m_ui->checkBoxAutoConnect->isChecked() );
TomahawkSettings::instance()->setValue( pluginId() + "/username", m_ui->jabberUsername->text() ); TomahawkSettings::instance()->setValue( pluginId() + "/username", m_ui->jabberUsername->text() );
TomahawkSettings::instance()->setValue( pluginId() + "/pasword", m_ui->jabberPassword->text() ); TomahawkSettings::instance()->setValue( pluginId() + "/password", m_ui->jabberPassword->text() );
TomahawkSettings::instance()->setValue( pluginId() + "/port", m_ui->jabberPort->value() ); TomahawkSettings::instance()->setValue( pluginId() + "/port", m_ui->jabberPort->value() );
TomahawkSettings::instance()->setValue( pluginId() + "/server", m_ui->jabberServer->text() ); TomahawkSettings::instance()->setValue( pluginId() + "/server", m_ui->jabberServer->text() );