rpms/kdenetwork/F-10 kdenetwork-4.3.0-jabber-kde#111537.patch, NONE, 1.1 kdenetwork.spec, 1.173, 1.174

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdenetwork/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27961

Modified Files:
	kdenetwork.spec 
Added Files:
	kdenetwork-4.3.0-jabber-kde#111537.patch 
Log Message:
- fix bz#515586, backport patch to fix this issue


kdenetwork-4.3.0-jabber-kde#111537.patch:
 jabberaccount.cpp |   10 ++++++++++
 jabberaccount.h   |   10 ++++++++++
 jabbercontact.cpp |   15 ++++++++++++---
 3 files changed, 32 insertions(+), 3 deletions(-)

--- NEW FILE kdenetwork-4.3.0-jabber-kde#111537.patch ---
Index: kopete/protocols/jabber/jabberaccount.h
===================================================================
--- kopete/protocols/jabber/jabberaccount.h	(Revision 985394)
+++ kopete/protocols/jabber/jabberaccount.h	(Revision 985395)
@@ -128,6 +128,16 @@
 	 * called when the account is removed in the config ui
 	*/
 	virtual bool removeAccount();
+
+	/**
+	 * return if kopete show all messges from all resources to one session
+	 */
+	bool mergeMessages();
+
+	/**
+	 * set if kopete will merge all messages to one session
+	 */
+	void setMergeMessages(bool b);
 	
 #ifdef JINGLE_SUPPORT
 	JingleCallsManager *jingleCallsManager() const {return m_jcm;}
Index: kopete/protocols/jabber/jabbercontact.cpp
===================================================================
--- kopete/protocols/jabber/jabbercontact.cpp	(Revision 985394)
+++ kopete/protocols/jabber/jabbercontact.cpp	(Revision 985395)
@@ -341,7 +341,10 @@
 					m.setPlainBody( i18n("%1 has ended his/her participation in the chat session.", metaContact()->displayName()) );
 					m.setDirection( Kopete::Message::Internal );
 
-					mManager->appendMessage ( m, message.from().resource () );
+					if ( account()->mergeMessages() )
+						mManager->appendMessage ( m, QString() );
+					else
+						mManager->appendMessage ( m, message.from().resource () );
 				}
 			}
 		}
@@ -426,7 +429,10 @@
 	// append message to (eventually new) manager and preselect the originating resource
 	if ( newMessage )
 	{
-		mManager->appendMessage ( *newMessage, message.from().resource () );
+		if ( account()->mergeMessages() )
+			mManager->appendMessage ( *newMessage, QString() );
+		else
+			mManager->appendMessage ( *newMessage, message.from().resource () );
 
 		delete newMessage;
 	}
@@ -450,7 +456,10 @@
 		msg.setDirection( Kopete::Message::Inbound );
 		msg.setRequestedPlugin( viewPlugin );
 
-		mManager->appendMessage ( msg, message.from().resource () );
+		if ( account()->mergeMessages() )
+			mManager->appendMessage ( msg, QString() );
+		else
+			mManager->appendMessage ( msg, message.from().resource () );
 	}
 }
 
Index: kopete/protocols/jabber/jabberaccount.cpp
===================================================================
--- kopete/protocols/jabber/jabberaccount.cpp	(Revision 985394)
+++ kopete/protocols/jabber/jabberaccount.cpp	(Revision 985395)
@@ -1720,6 +1720,16 @@
 		Kopete::AccountManager::self()->removeAccount( this ); //this will delete this
 }
 
+void JabberAccount::setMergeMessages(bool b)
+{
+	configGroup()->writeEntry("MergeMessages", b);
+}
+
+bool JabberAccount::mergeMessages()
+{
+	return configGroup()->readEntry("MergeMessages", true);
+}
+
 /*
 JabberMoodAction::JabberMoodAction(const Mood::Type type, QObject *parent):
 KAction(parent)


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-10/kdenetwork.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -p -r1.173 -r1.174
--- kdenetwork.spec	5 Aug 2009 13:01:17 -0000	1.173
+++ kdenetwork.spec	25 Aug 2009 09:16:18 -0000	1.174
@@ -2,7 +2,7 @@ Summary: K Desktop Environment - Network
 Name: kdenetwork
 Epoch: 7
 Version: 4.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
@@ -12,8 +12,12 @@ Source1: krdc-icons.tar.bz2
 
 ## upstream me!  -- Rex :)
 Patch1: kdenetwork-4.2.98-kdrc-icon.patch
+
 # upstream patches (4.3 branch):
 
+# upstream patches (4.4 branch):
+Patch200: kdenetwork-4.3.0-jabber-kde#111537.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: avahi-compat-libdns_sd-devel
@@ -94,6 +98,8 @@ Requires: kdelibs4-devel
 # 4.3 upstream patches
 chmod +x kopete/kopete/kconf_update/kopete-update_yahoo_server.pl
 
+# 4.4 upstream patches
+%patch200 -p0 -b .bz#515586-kopete
 
 %build
 mkdir -p %{_target_platform}
@@ -180,6 +186,9 @@ fi
 
 
 %changelog
+* Mon Aug 24 2009 Than Ngo <than at redhat.com> - 4.3.0-2
+- fix bz#515586, backport patch to fix this issue
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0