From 92b7cabdc5146a4bc3f5b48936f3cc3f245ff439 Mon Sep 17 00:00:00 2001
From: Lukas Tinkl <ltinkl@fedoraproject.org>
Date: Aug 19 2009 09:39:14 +0000
Subject: fix crash when editting toolbars (KDE bug #200815)


---

diff --git a/kdelibs-4.3.1-toolbarEditCrash.patch b/kdelibs-4.3.1-toolbarEditCrash.patch
new file mode 100644
index 0000000..2402e06
--- /dev/null
+++ b/kdelibs-4.3.1-toolbarEditCrash.patch
@@ -0,0 +1,26 @@
+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);
diff --git a/kdelibs.spec b/kdelibs.spec
index 329822a..37a3919 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -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@@|%{version}-%{release}|" kio/kio/kprotocolmanage
 %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@redhat.com> - 4.3.0-6
+- fix crash when editting toolbars (kdebug:200815)
+
 * Tue Aug 18 2009 Lukáš Tinkl <ltinkl@redhat.com> - 4.3.0.5
 - fix KDE bug #19538, copy file after rename uses old file name