fix crash when editting toolbars (KDE bug #200815)
This commit is contained in:
parent
0754b46075
commit
92b7cabdc5
26
kdelibs-4.3.1-toolbarEditCrash.patch
Normal file
26
kdelibs-4.3.1-toolbarEditCrash.patch
Normal file
@ -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);
|
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
Summary: K Desktop Environment 4 - Libraries
|
Summary: K Desktop Environment 4 - Libraries
|
||||||
Version: 4.3.0
|
Version: 4.3.0
|
||||||
Release: 5%{?dist}
|
Release: 6%{?dist}
|
||||||
|
|
||||||
%if 0%{?fedora} > 8
|
%if 0%{?fedora} > 8
|
||||||
Name: kdelibs
|
Name: kdelibs
|
||||||
@ -92,6 +92,8 @@ Patch102: kdelibs-4.3.1-unmountfix.patch
|
|||||||
Patch103: kdelibs-4.3.1-copyurls.patch
|
Patch103: kdelibs-4.3.1-copyurls.patch
|
||||||
# http://bugs.kde.org/195385
|
# http://bugs.kde.org/195385
|
||||||
Patch104: kdelibs-4.3.1-copyrename.patch
|
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
|
BuildRequires: qt4-devel >= 4.5.0
|
||||||
# qt4%{_?_isa} isn't provided yet -- Rex
|
# 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
|
%patch102 -p0 -b .unmountfix
|
||||||
%patch103 -p0 -b .copyurls
|
%patch103 -p0 -b .copyurls
|
||||||
%patch104 -p0 -b .copyrename
|
%patch104 -p0 -b .copyrename
|
||||||
|
%patch105 -p0 -b .toolbarEditCrash
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
@ -412,6 +415,9 @@ rm -rf %{buildroot}
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%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
|
* 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
|
- fix KDE bug #19538, copy file after rename uses old file name
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user