[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdenetwork/kopete/protocols/msn
From:       Carlo Segato <brandon.ml () gmail ! com>
Date:       2008-02-19 1:27:00
Message-ID: 1203384420.634580.28897.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 776910 by segato:

Fix to make msn reads the real account config

 M  +8 -9      msnchatsession.cpp  
 M  +2 -2      msncontact.cpp  
 M  +5 -5      msnswitchboardsocket.cpp  


--- trunk/KDE/kdenetwork/kopete/protocols/msn/msnchatsession.cpp #776909:776910
@@ -191,8 +191,8 @@
 	connect( m_chatService, SIGNAL( receivedTypingMsg( const QString &, bool ) ),
 		this, SLOT( receivedTypingMsg( const QString &, bool ) ) );
 
-	KConfigGroup config(KGlobal::config(), "MSN");
-	if ( config.readEntry( "SendTypingNotification", true ) )
+    KConfigGroup *config=account()->configGroup();
+	if ( config->readEntry( "SendTypingNotification", true ) )
 	{
 		connect( this, SIGNAL( myselfTyping( bool ) ),
 			m_chatService, SLOT( sendTypingMsg( bool ) ) );
@@ -236,8 +236,8 @@
 	if(!m_messagesQueue.empty() || !m_invitations.isEmpty())
 		sendMessageQueue();
 
-	KConfigGroup config(KGlobal::config(), "MSN");
-	if ( members().count()==1 && config.readEntry( "DownloadPicture", 1 ) >= 1 && \
!c->object().isEmpty() && \
!c->hasProperty(Kopete::Global::Properties::self()->photo().key())) +    KConfigGroup \
*config=account()->configGroup(); +	if ( members().count()==1 && config->readEntry( \
"DownloadPicture", 1 ) >= 1 && !c->object().isEmpty() && \
!c->hasProperty(Kopete::Global::Properties::self()->photo().key()))  \
slotRequestPicture();  }
 
@@ -616,8 +616,8 @@
 		}
 		else
 		{
-			KConfigGroup config(KGlobal::config(), "MSN");
-			if ( config.readEntry( "DownloadPicture", 1 ) >= 1 && !c->object().isEmpty() )
+            KConfigGroup *config=account()->configGroup();
+			if ( config->readEntry( "DownloadPicture", 1 ) >= 1 && !c->object().isEmpty() )
 				slotRequestPicture();
 		}
 	}
@@ -647,9 +647,8 @@
 	if(c && m_newSession &&  !view(false))
 	{
 		//this was originaly in MSNAccount::slotCreateChat
-		KConfigGroup group = KGlobal::config()->group( "MSN" );
-		bool notifyNewChat = group.readEntry( "NotifyNewChat", false );
-		if (  notifyNewChat  )
+        KConfigGroup *config=account()->configGroup();
+        if (  config->readEntry( "NotifyNewChat", false )  )
 		{
 			// this internal message should open the window if they not exist
 			QString body = i18n( "%1 has started a chat with you", \
                c->metaContact()->displayName() );
--- trunk/KDE/kdenetwork/kopete/protocols/msn/msncontact.cpp #776909:776910
@@ -717,8 +717,8 @@
 	removeProperty( Kopete::Global::Properties::self()->photo()  ) ;
 	emit displayPictureChanged();
 
-	KConfigGroup config(KGlobal::config(), "MSN");
-	if ( config.readEntry( "DownloadPicture", 2 ) >= 2 && !obj.isEmpty()
+    KConfigGroup *config=account()->configGroup();
+	if ( config->readEntry( "DownloadPicture", 2 ) >= 2 && !obj.isEmpty()
 			 && account()->myself()->onlineStatus().status() != \
Kopete::OnlineStatus::Invisible )  manager(Kopete::Contact::CanCreate); //create the \
manager which will download the photo automatically.  }
--- trunk/KDE/kdenetwork/kopete/protocols/msn/msnswitchboardsocket.cpp #776909:776910
@@ -411,8 +411,8 @@
 	{
 		// TODO remove Displatcher.
 		bool useEmoticons( Kopete::AppearanceSettings::self()->useEmoticons() );
-		KConfigGroup msnConfig(KGlobal::config(), "MSN");
-		bool useCustomEmoticons( msnConfig.readEntry( "useCustomEmoticons", true ) );
+        KConfigGroup *msnConfig=m_account->configGroup();
+		bool useCustomEmoticons( msnConfig->readEntry( "useCustomEmoticons", true ) );
 
 		if ( useEmoticons && useCustomEmoticons )
 		{
@@ -685,8 +685,8 @@
 	}
 #endif
 
-	KConfigGroup config(KGlobal::config(), "MSN");
-	if ( config.readEntry( "exportEmoticons", false ) )
+    KConfigGroup *config=m_account->configGroup();
+	if ( config->readEntry( "exportEmoticons", false ) )
 	{
 		QMap<QString, QStringList> emap = Kopete::Emoticons::self()->emoticonAndPicList();
 
@@ -714,7 +714,7 @@
 
 	// User-Agent is not a official flag, but GAIM has it
 	QString UA;
-	if( config.readEntry("SendClientInfo", true) )
+	if( config->readEntry("SendClientInfo", true) )
 	{
 		UA="User-Agent: Kopete/"+escape(KGlobal::mainComponent().aboutData()->version())+"\r\n";
  }


[prev in list] [next in list] [prev in thread] [next in thread]