rpms/kdenetwork/devel kdenetwork-4.0.3-krdc-kde#160728.patch, NONE, 1.1 kdenetwork.spec, 1.138, 1.139 kdenetwork-4.0.3-libidn.patch, 1.2, NONE

[Kevin Kofler (kkofler)]

Author: kkofler

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

Modified Files:
	kdenetwork.spec 
Added Files:
	kdenetwork-4.0.3-krdc-kde#160728.patch 
Removed Files:
	kdenetwork-4.0.3-libidn.patch 
Log Message:
* Sat Apr 12 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.3-5
- fix segfault in krdc VNC on remote server disconnection (#442127, kde#160728)

kdenetwork-4.0.3-krdc-kde#160728.patch:

--- NEW FILE kdenetwork-4.0.3-krdc-kde#160728.patch ---
Index: krdc/vnc/vncview.cpp
===================================================================
--- krdc/vnc/vncview.cpp	(revision 796114)
+++ krdc/vnc/vncview.cpp	(revision 796115)
@@ -244,6 +244,11 @@
 void VncView::paintEvent(QPaintEvent *event)
 {
 //     kDebug(5011) << "paint event: x: " << m_x << ", y: " << m_y << ", w: " << m_w << ", h: " << m_h;
+    if (m_frame.isNull() || m_frame.format() == QImage::Format_Invalid) {
+        kDebug(5011) << "no valid image to paint";
+        RemoteView::paintEvent(event);
+        return;
+    }
 
     event->accept();
 


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- kdenetwork.spec	3 Apr 2008 17:43:59 -0000	1.138
+++ kdenetwork.spec	12 Apr 2008 16:18:56 -0000	1.139
@@ -1,12 +1,12 @@
 
 # FIXME/TODO: needed BuildRequires 
-# mDNS, Decibel
+# Decibel
 
 Summary: K Desktop Environment - Network Applications
 Name: kdenetwork
 Epoch: 7
 Version: 4.0.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
@@ -14,6 +14,8 @@
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
 
 # upstream patches
+# fix segfault in krdc VNC on remote server disconnection (#442127, kde#160728)
+Patch100: kdenetwork-4.0.3-krdc-kde#160728.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -87,6 +89,7 @@
 
 %prep
 %setup -q
+%patch100 -p0 -b .kde#160728
 
 %build
 mkdir -p %{_target_platform}
@@ -163,6 +166,9 @@
 
 
 %changelog
+* Sat Apr 12 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.3-5
+- fix segfault in krdc VNC on remote server disconnection (#442127, kde#160728)
+
 * Thu Apr 03 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.3-4
 - rebuild (again) for the fixed %%{_kde4_buildtype}
 


--- kdenetwork-4.0.3-libidn.patch DELETED ---