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

List:       kde-commits
Subject:    KDE/kdenetwork/kopete/protocols/jabber
From:       Pali Rohár <pali.rohar () gmail ! com>
Date:       2012-12-11 1:06:22
Message-ID: 20121211010622.63D5DAC867 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1328052 by pali:

Fix resource selection for Jabber contacts when "Merge all messages from all \
resources to one window/tab" is enabled


 M  +1 -10     jabbercontact.cpp  
 M  +0 -3      jabbergroupmembercontact.cpp  


--- trunk/KDE/kdenetwork/kopete/protocols/jabber/jabbercontact.cpp #1328051:1328052
@@ -361,9 +361,6 @@
 					m.setDirection( Kopete::Message::Internal );
 					m.setImportance(Kopete::Message::Low);
 
-					if ( account()->mergeMessages() )
-						mManager->appendMessage ( m, QString() );
-					else
 						mManager->appendMessage ( m, message.from().resource () );
 				}
 			}
@@ -449,9 +446,6 @@
 	// append message to (eventually new) manager and preselect the originating \
resource  if ( newMessage )
 	{
-		if ( account()->mergeMessages() )
-			mManager->appendMessage ( *newMessage, QString() );
-		else
 			mManager->appendMessage ( *newMessage, message.from().resource () );
 
 		delete newMessage;
@@ -476,9 +470,6 @@
 		msg.setDirection( Kopete::Message::Inbound );
 		msg.setRequestedPlugin( viewPlugin );
 
-		if ( account()->mergeMessages() )
-			mManager->appendMessage ( msg, QString() );
-		else
 			mManager->appendMessage ( msg, message.from().resource () );
 	}
 }
@@ -935,7 +926,7 @@
 		for ( ; it != end ; ++it )
 		{
 			JabberChatSession *mManager = *it;
-			if ( mManager->resource().isEmpty () || ( mManager->resource () == resource ) )
+			if ( account()->mergeMessages () || mManager->resource().isEmpty () || ( \
mManager->resource () == resource ) )  {
 				// we found a matching manager, return this one
 				kDebug(JABBER_DEBUG_GLOBAL) << "Found an existing message manager for this \
                resource.";
--- trunk/KDE/kdenetwork/kopete/protocols/jabber/jabbergroupmembercontact.cpp \
#1328051:1328052 @@ -163,9 +163,6 @@
 					m.setDirection( Kopete::Message::Internal );
 					m.setImportance(Kopete::Message::Low);
 					
-					if ( account()->mergeMessages() )
-						mManager->appendMessage ( m, QString() );
-					else
 						mManager->appendMessage ( m, message.from().resource () );
 				}*/
 			}


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