SVN commit 775292 by rjarosz:

Save settings from account preferences tab.

CCBUG: 154972



 M  +8 -2      msnchatsession.cpp  
 M  +6 -0      ui/msneditaccountui.ui  
 M  +13 -0     ui/msneditaccountwidget.cpp  


--- trunk/KDE/kdenetwork/kopete/protocols/msn/msnchatsession.cpp #775291:775292
@@ -190,8 +190,14 @@
 		this, SLOT( slotSwitchBoardClosed() ) );
 	connect( m_chatService, SIGNAL( receivedTypingMsg( const QString &, bool ) ),
 		this, SLOT( receivedTypingMsg( const QString &, bool ) ) );
-	connect( this, SIGNAL( myselfTyping( bool ) ),
-		m_chatService, SLOT( sendTypingMsg( bool ) ) );
+
+	KConfigGroup config(KGlobal::config(), "MSN");
+	if ( config.readEntry( "SendTypingNotification", true ) )
+	{
+		connect( this, SIGNAL( myselfTyping( bool ) ),
+			m_chatService, SLOT( sendTypingMsg( bool ) ) );
+	}
+
 	connect( m_chatService, SIGNAL( msgAcknowledgement(unsigned int, bool) ),
 		this, SLOT( slotAcknowledgement(unsigned int, bool) ) );
 	connect( m_chatService, SIGNAL( invitation( const QString&, const QString& ) ),
--- trunk/KDE/kdenetwork/kopete/protocols/msn/ui/msneditaccountui.ui #775291:775292
@@ -429,6 +429,9 @@
             </property>
             <item>
              <widget class="QCheckBox" name="SendJabber" >
+              <property name="enabled" >
+               <bool>false</bool>
+              </property>
               <property name="whatsThis" >
                <string>If you have a Jabber account, you may let Jabber users on an MSN gateway know that you are also using Jabber.</string>
               </property>
@@ -442,6 +445,9 @@
             </item>
             <item>
              <widget class="KComboBox" name="JabberAccount" >
+              <property name="enabled" >
+               <bool>false</bool>
+              </property>
               <property name="whatsThis" >
                <string>If you have a Jabber account, you may let Jabber users on an MSN gateway know that you are also using Jabber.</string>
               </property>
--- trunk/KDE/kdenetwork/kopete/protocols/msn/ui/msneditaccountwidget.cpp #775291:775292
@@ -135,6 +135,12 @@
 
 		d->ui->m_useDisplayPicture->setChecked( config->readEntry( "exportCustomPicture", false ));
 
+		d->ui->NotifyNewChat->setChecked( config->readEntry( "NotifyNewChat", false ));
+		d->ui->DownloadPicture->setCurrentIndex( config->readEntry( "DownloadPicture", 1 ));
+		d->ui->useCustomEmoticons->setChecked( config->readEntry( "useCustomEmoticons", true ));
+		d->ui->exportEmoticons->setChecked( config->readEntry( "exportEmoticons", false ));
+		d->ui->SendClientInfo->setChecked( config->readEntry( "SendClientInfo", true ));
+		d->ui->SendTypingNotification->setChecked( config->readEntry( "SendTypingNotification", true ));
 	}
 	else
 	{
@@ -169,6 +175,13 @@
 	account()->setExcludeConnect( d->ui->m_autologin->isChecked() );
 	d->ui->m_password->save( &static_cast<MSNAccount *>(account())->password() );
 
+	config->writeEntry( "NotifyNewChat", d->ui->NotifyNewChat->isChecked() );
+	config->writeEntry( "DownloadPicture", d->ui->DownloadPicture->currentIndex() );
+	config->writeEntry( "useCustomEmoticons", d->ui->useCustomEmoticons->isChecked() );
+	config->writeEntry( "exportEmoticons", d->ui->exportEmoticons->isChecked() );
+	config->writeEntry( "SendClientInfo", d->ui->SendClientInfo->isChecked() );
+	config->writeEntry( "SendTypingNotification", d->ui->SendTypingNotification->isChecked() );
+	
 	config->writeEntry( "exportCustomPicture", d->ui->m_useDisplayPicture->isChecked() );
 	if (d->ui->optionOverrideServer->isChecked() ) {
 		config->writeEntry( "serverName", d->ui->m_serverName->text() );