rpms/kdenetwork/F-9 kdenetwork-4.0.4-kopete-chatwindow-crash.patch, NONE, 1.1 kdenetwork.spec, 1.141, 1.142

[Lukas Tinkl (ltinkl)]

Author: ltinkl

Update of /cvs/extras/rpms/kdenetwork/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27457

Modified Files:
	kdenetwork.spec 
Added Files:
	kdenetwork-4.0.4-kopete-chatwindow-crash.patch 
Log Message:
KDE bug 161769: kopete causes a sigserv when closing chat window


kdenetwork-4.0.4-kopete-chatwindow-crash.patch:

--- NEW FILE kdenetwork-4.0.4-kopete-chatwindow-crash.patch ---
--- kdenetwork/kopete/kopete/chatwindow/kopetechatwindow.cpp	2008/05/08 12:00:42	805381
+++ kdenetwork/kopete/kopete/chatwindow/kopetechatwindow.cpp	2008/05/08 12:01:04	805382
@@ -908,7 +908,8 @@
 		m_activeView->saveChatSettings();
 	}
 
-	guiFactory()->addClient(view->msgManager());
+	if ( view != 0 )
+		guiFactory()->addClient(view->msgManager());
 // 	createGUI( view->editPart() );
 
 	if( m_activeView )
@@ -916,6 +917,9 @@
 
 	m_activeView = view;
 
+	if ( view == 0 )
+		return;
+
 	if( chatViewList.indexOf( view ) == -1)
 		attachChatView( view );
 


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-9/kdenetwork.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- kdenetwork.spec	7 May 2008 14:45:43 -0000	1.141
+++ kdenetwork.spec	8 May 2008 13:34:48 -0000	1.142
@@ -6,13 +6,14 @@
 Name: kdenetwork
 Epoch: 7
 Version: 4.0.4
-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
+License:   GPLv2
+Group:     Applications/Internet
+URL:       http://www.kde.org
+Source0:   ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:    kdenetwork-4.0.4-kopete-chatwindow-crash.patch 
 
 BuildRequires: avahi-compat-libdns_sd-devel
 BuildRequires: boost-devel
@@ -83,6 +84,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .kopete-chatwindow-crash
 
 %build
 mkdir -p %{_target_platform}
@@ -158,6 +160,9 @@
 
 
 %changelog
+* Thu May  8 2008 Lukáš Tinkl <ltinkl at redhat.com> 4.0.4-2
+- #kdebug:161769: kopete causes a sigserv when closing chat window
+
 * Tue May 06 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.4-1
 - kde-4.0.4