rpms/kdenetwork/devel kdenetwork-4.0.2-kopete-crash.patch, NONE, 1.1 kdenetwork.spec, 1.129, 1.130

Than Ngo (than) fedora-extras-commits at redhat.com
Thu Mar 13 16:41:50 UTC 2008


Author: than

Update of /cvs/extras/rpms/kdenetwork/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24084

Modified Files:
	kdenetwork.spec 
Added Files:
	kdenetwork-4.0.2-kopete-crash.patch 
Log Message:
when deleting contact while chat window is open


kdenetwork-4.0.2-kopete-crash.patch:

--- NEW FILE kdenetwork-4.0.2-kopete-crash.patch ---
Index: kopete/libkopete/chatsessionmemberslistmodel.cpp
===================================================================
--- kopete/libkopete/chatsessionmemberslistmodel.cpp	(Revision 784897)
+++ kopete/libkopete/chatsessionmemberslistmodel.cpp	(Revision 784898)
@@ -30,18 +30,23 @@
 
 void ChatSessionMembersListModel::setChatSession(ChatSession *session)
 {
+	if ( m_session )
+		disconnect( m_session, 0, this, 0 );
+
 	m_session = session;
 
-	connect( session, SIGNAL( contactAdded(const Kopete::Contact*, bool) ),
- 	         this, SLOT( slotContactAdded(const Kopete::Contact*) ) );
- 	connect( session, SIGNAL( contactRemoved(const Kopete::Contact*, const QString&, Qt::TextFormat, bool) ),
- 	         this, SLOT( slotContactRemoved(const Kopete::Contact*) ) );
- 	connect( session, SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus & , const Kopete::OnlineStatus &) ),
- 	         this, SLOT( slotContactStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus & ) ) );
-	connect( session, SIGNAL( displayNameChanged() ),
- 	         this, SLOT( slotSessionChanged() ) );
-	connect( session, SIGNAL( photoChanged() ),
- 	         this, SLOT( slotSessionChanged() ) );
+	connect( session, SIGNAL(closing(Kopete::ChatSession*)),
+	         this, SLOT(slotSessionClosed()) );
+	connect( session, SIGNAL(contactAdded(const Kopete::Contact*, bool)),
+	         this, SLOT(slotContactAdded(const Kopete::Contact*)) );
+	connect( session, SIGNAL(contactRemoved(const Kopete::Contact*, const QString&, Qt::TextFormat, bool)),
+	         this, SLOT(slotContactRemoved(const Kopete::Contact*)) );
+	connect( session, SIGNAL(onlineStatusChanged(Kopete::Contact*, const Kopete::OnlineStatus&, const Kopete::OnlineStatus&)),
+	         this, SLOT(slotContactStatusChanged(Kopete::Contact*, const Kopete::OnlineStatus&)) );
+	connect( session, SIGNAL(displayNameChanged()),
+	         this, SLOT(slotSessionChanged()) );
+	connect( session, SIGNAL(photoChanged()),
+	         this, SLOT(slotSessionChanged()) );
 	reset();
 }
 
@@ -140,5 +145,15 @@
 	reset();
 }
 
+void ChatSessionMembersListModel::slotSessionClosed()
+{
+	if ( m_session )
+	{
+		disconnect( m_session, 0, this, 0 );
+		m_session = 0;
+		reset();
+	}
 }
 
+}
+
Index: kopete/libkopete/chatsessionmemberslistmodel.h
===================================================================
--- kopete/libkopete/chatsessionmemberslistmodel.h	(Revision 784897)
+++ kopete/libkopete/chatsessionmemberslistmodel.h	(Revision 784898)
@@ -75,6 +75,11 @@
 	 */
 	void slotSessionChanged();
 
+	/**
+	 * Called when session has been closed
+	 */
+	void slotSessionClosed();
+
 private:
 	Kopete::ChatSession *m_session;
 };


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- kdenetwork.spec	28 Feb 2008 18:18:09 -0000	1.129
+++ kdenetwork.spec	13 Mar 2008 16:41:14 -0000	1.130
@@ -6,12 +6,15 @@
 Name: kdenetwork
 Epoch: 7
 Version: 4.0.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.kde.org
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
+# upstream patches
+Patch100: kdenetwork-4.0.2-kopete-crash.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # FIXME/TODO: Missing BRs from CMakeCache.txt
@@ -96,6 +99,8 @@
 %prep
 %setup -q
 
+# upstream patches
+%patch100 -p1 -b .kopete-crash
 
 %build
 mkdir -p %{_target_platform}
@@ -172,6 +177,9 @@
 
 
 %changelog
+* Thu Mar 13 2008 Than Ngo <than at redhat.com> 4.0.2-2
+- apply upstream patch to fix crash in kopete
+
 * Thu Feb 28 2008 Than Ngo <than at redhat.com> 4.0.2-1
 - 4.0.2
 




More information about the fedora-extras-commits mailing list