rpms/kdebase/devel kdebase-3.5.4-kde#133665.patch, NONE, 1.1 kdebase.spec, 1.221, 1.222

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17441

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.4-kde#133665.patch 
Log Message:
fix #133665, crash in kiosk mode



kdebase-3.5.4-kde#133665.patch:
 kdiconview.cc |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE kdebase-3.5.4-kde#133665.patch ---
Index: kdesktop/kdiconview.cc
===================================================================
--- kdesktop/kdiconview.cc	(Revision 581570)
+++ kdesktop/kdiconview.cc	(Revision 581571)
@@ -1222,8 +1222,11 @@
 
     QString actionText = KIO::pasteActionText();
     bool paste = !actionText.isEmpty();
-    if ( paste )
-        m_actionCollection.action( "paste" )->setText( actionText );
+    if ( paste ) {
+        KAction* pasteAction = m_actionCollection.action( "paste" );
+        if ( pasteAction )
+            pasteAction->setText( actionText );
+    }
     slotEnableAction( "paste", paste );
 }
 


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- kdebase.spec	7 Sep 2006 15:21:00 -0000	1.221
+++ kdebase.spec	7 Sep 2006 15:29:06 -0000	1.222
@@ -63,6 +63,7 @@
 Patch104: kdebase-3.5.4-kde#132873.patch
 Patch105: kdebase-3.5.4-kdm.patch
 Patch106: kdebase-3.5.4-kde#53642.patch
+Patch107: kdebase-3.5.4-kde#133665.patch
 
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: libxml2 >= 2.6.5
@@ -180,6 +181,7 @@
 %patch104 -p0 -b .kde#132873
 %patch105 -p0 -b .kdm-crash
 %patch106 -p0 -b .kde#53642
+%patch107 -p0 -b .kde#133665
 
 %if %{rhel}
    rm -rf kdeprint/kdeprintfax
@@ -552,6 +554,7 @@
 * Thu Sep 07 2006 Than Ngo <than at redhat.com> 6:3.5.4-7
 - apply upstream patch
    fix #53642, Menubar is always visible after coming back from fullscreen
+   fix #133665, crash in kiosk mode
 
 * Mon Aug 28 2006 Than Ngo <than at redhat.com> 6:3.5.4-6
 - fix broken deps for s390(x)