rpms/kdelibs/F-10 kdelibs-4.3.1-toolbarEditCrash.patch, NONE, 1.1 kdelibs.spec, 1.437, 1.438

[Lukas Tinkl]

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29747/F-10

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.3.1-toolbarEditCrash.patch 
Log Message:
fix crash when editting toolbars (KDE bug #200815)


kdelibs-4.3.1-toolbarEditCrash.patch:
 kstandardaction.cpp |   15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

--- NEW FILE kdelibs-4.3.1-toolbarEditCrash.patch ---
Index: kdeui/actions/kstandardaction.cpp
===================================================================
--- kdeui/actions/kstandardaction.cpp	(revision 1013099)
+++ kdeui/actions/kstandardaction.cpp	(revision 1013100)
@@ -198,12 +198,15 @@
   }
 
   if (recvr && slot) {
-    if (id != OpenRecent)
-      QObject::connect(pAction, SIGNAL(triggered(bool)), recvr, slot);
-    else
-      // FIXME KAction port: probably a good idea to find a cleaner way to do this
-      // Open Recent is a special case - provide the selected URL
-      QObject::connect(pAction, SIGNAL(urlSelected(const KUrl &)), recvr, slot);
+      if (id == OpenRecent) {
+          // FIXME KAction port: probably a good idea to find a cleaner way to do this
+          // Open Recent is a special case - provide the selected URL
+          QObject::connect(pAction, SIGNAL(urlSelected(const KUrl &)), recvr, slot);
+      } else if (id == ConfigureToolbars) { // #200815
+          QObject::connect(pAction, SIGNAL(triggered(bool)), recvr, slot, Qt::QueuedConnection);
+      } else {
+          QObject::connect(pAction, SIGNAL(triggered(bool)), recvr, slot);
+      }
   }
 
   KActionCollection *collection = qobject_cast<KActionCollection *>(parent);


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.437
retrieving revision 1.438
diff -u -p -r1.437 -r1.438
--- kdelibs.spec	18 Aug 2009 12:02:42 -0000	1.437
+++ kdelibs.spec	19 Aug 2009 09:39:14 -0000	1.438
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -92,6 +92,8 @@ Patch102: kdelibs-4.3.1-unmountfix.patch
 Patch103: kdelibs-4.3.1-copyurls.patch
 # http://bugs.kde.org/195385
 Patch104: kdelibs-4.3.1-copyrename.patch
+# http://bugs.kde.org/200815
+Patch105: kdelibs-4.3.1-toolbarEditCrash.patch
 
 BuildRequires: qt4-devel >= 4.5.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -231,6 +233,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{versi
 %patch102 -p0 -b .unmountfix
 %patch103 -p0 -b .copyurls
 %patch104 -p0 -b .copyrename
+%patch105 -p0 -b .toolbarEditCrash
 
 %build
 
@@ -412,6 +415,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 19 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.3.0-6
+- fix crash when editting toolbars (kdebug:200815)
+
 * Tue Aug 18 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.3.0.5
 - fix KDE bug #19538, copy file after rename uses old file name