rpms/kdepim/F-9 kdepim-3.5.10-#465211.patch, NONE, 1.1 kdepim.spec, 1.174, 1.175

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdepim/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21136/F-9

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-3.5.10-#465211.patch 
Log Message:
* Mon Mar 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:3.5.10-3
- backport fix for KOrganizer crash (#465211, kde#171651, kde#171787) from 4.2

kdepim-3.5.10-#465211.patch:

--- NEW FILE kdepim-3.5.10-#465211.patch ---
diff -ur kdepim-3.5.10/korganizer/resourceview.cpp kdepim-3.5.10-#465211/korganizer/resourceview.cpp
--- kdepim-3.5.10/korganizer/resourceview.cpp	2008-08-19 20:16:06.000000000 +0200
+++ kdepim-3.5.10-#465211/korganizer/resourceview.cpp	2009-03-16 02:41:23.000000000 +0100
@@ -159,8 +159,10 @@
           createSubresourceItems();
       }
     } else {
-      if ( mResource->save() ) mResource->setActive( false );
+      // mView->requestClose must be called before mResource->save() because
+      // save causes closeResource do be called.
       mView->requestClose( mResource );
+      if ( mResource->save() ) mResource->setActive( false );
     }
 
     setOpen( mResource->isActive() && childCount() > 0 );


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-9/kdepim.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- kdepim.spec	29 Sep 2008 19:50:37 -0000	1.174
+++ kdepim.spec	16 Mar 2009 01:46:46 -0000	1.175
@@ -17,7 +17,7 @@
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 3.5.10
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -46,6 +46,10 @@
 # http://bugs.kde.org/show_bug.cgi?id=170259
 # https://bugzilla.redhat.com/show_bug.cgi?id=464622
 Patch100: kdepim-3.5.10-kabcdistlistupdater.patch
+# fix KOrganizer crash (#465211, kde#171651, kde#171787)
+# backported from 4.2/4.3
+# http://websvn.kde.org/?view=rev&revision=924024
+Patch101: kdepim-3.5.10-#465211.patch
 
 Provides: kdepim3 = %{version}-%{release}
 
@@ -148,6 +152,7 @@
 %patch6 -p0 -b .gnokii
 %patch7 -p1 -b .metakit_sparc64
 %patch100 -p0 -b .kabcdistlistupdater
+%patch101 -p1 -b .#465211
 
 %if 0%{?fedora} > 8
 pushd kitchensync
@@ -278,6 +283,9 @@
 
 
 %changelog
+* Mon Mar 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:3.5.10-3
+- backport fix for KOrganizer crash (#465211, kde#171651, kde#171787) from 4.2
+
 * Mon Sep 29 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:3.5.10-2
 - add converter for old kabc distribution lists (#464622)