rpms/kdegraphics/devel kdegraphics-3.4.2-kpdf-toc.patch, NONE, 1.1 kdegraphics.spec, 1.56, 1.57

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdegraphics/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18004

Modified Files:
	kdegraphics.spec 
Added Files:
	kdegraphics-3.4.2-kpdf-toc.patch 
Log Message:
- backport CVS patch to fix kpdf crash when trying to
  expand sub-bookmarks in the bookmark tree #167390


kdegraphics-3.4.2-kpdf-toc.patch:
 toc.cpp |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE kdegraphics-3.4.2-kpdf-toc.patch ---
--- kdegraphics-3.4.2/kpdf/ui/toc.cpp.tn	2005-09-05 17:06:46.000000000 +0200
+++ kdegraphics-3.4.2/kpdf/ui/toc.cpp	2005-09-05 17:07:22.000000000 +0200
@@ -121,7 +121,12 @@
 
 void TOC::slotExecuted( QListViewItem *i )
 {
-    const QDomElement & e = static_cast< TOCItem* >( i )->element();
+    TOCItem* tocItem = dynamic_cast<TOCItem*>( i );
+    // that filters clicks on [+] that for a strange reason don't seem to be TOCItem*
+    if (tocItem == NULL)
+        return;
+    const QDomElement & e = tocItem->element();
+ 
     QString externalFileName = e.attribute( "ExternalFileName" );
     if ( !externalFileName.isEmpty() )
     {


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- kdegraphics.spec	31 Aug 2005 11:21:31 -0000	1.56
+++ kdegraphics.spec	5 Sep 2005 16:38:16 -0000	1.57
@@ -13,7 +13,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.4.2
-Release: 2
+Release: 3
 Name: kdegraphics
 Summary: K Desktop Environment - Graphics Applications
 Epoch: 7
@@ -31,6 +31,7 @@
 Patch101: kdegraphics-3.4.2-kpdf-110171.patch
 Patch102: kdegraphics-3.4.2-kpdf-110000.patch
 Patch103: kdegraphics-3.4.2-kpdf-crash.patch
+Patch104: kdegraphics-3.4.2-kpdf-toc.patch
 
 %ifnarch %{no_scanner_archs}
 BuildRequires: sane-backends-devel >= 1.0.3-10
@@ -269,6 +270,7 @@
 %patch101 -p1 -b .kpdf-110171
 %patch102 -p1 -b .kddf-110000
 %patch103 -p1 -b .crash
+%patch104 -p1 -b .crash
 
 %if %{rhel}
   echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kfax\"" >kfax/configure.in.in
@@ -366,6 +368,10 @@
 %{_includedir}/kde/*
 
 %changelog
+* Mon Sep 05 2005 Than Ngo <than at redhat.com> 7:3.4.2-3
+- backport CVS patch to fix kpdf crash when trying to
+  expand sub-bookmarks in the bookmark tree #167390
+
 * Wed Aug 31 2005 Than Ngo <than at redhat.com> 7:3.4.2-2
 - backport CVS patch to fix rendering problem in kpdf
 - backport CVS patch to fix bug #kde110171