rpms/kdelibs
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kutils fixes, mostly in plugin selector

Browse Source
This commit is contained in:
Lukas Tinkl 2008-09-08 12:41:53 +00:00
parent df928fb732
commit d87f06f59f
2 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
kdelibs-4.1.1-kutils-fixes.patch Normal file
View File

@ -0,0 +1,40 @@
Index: kutils/kpluginselector.cpp
===================================================================
--- kutils/kpluginselector.cpp (revision 856658)
+++ kutils/kpluginselector.cpp (revision 856659)
@@ -410,7 +410,8 @@
if (!pluginEntryList.contains(pluginEntry) && !listToAdd.contains(pluginEntry) &&
(!pluginInfo.property("X-KDE-PluginInfo-Category").isValid() ||
- !pluginInfo.property("X-KDE-PluginInfo-Category").toString().compare(categoryKey, Qt::CaseInsensitive))) {
+ !pluginInfo.property("X-KDE-PluginInfo-Category").toString().compare(categoryKey, Qt::CaseInsensitive)) &&
+ !pluginInfo.service()->noDisplay()) {
listToAdd << pluginEntry;
if (!pluginSelector_d->showIcons && !pluginInfo.icon().isEmpty()) {
Index: kutils/kpluginselector.cpp
===================================================================
--- kutils/kpluginselector.cpp (revision 856718)
+++ kutils/kpluginselector.cpp (revision 856719)
@@ -411,7 +411,7 @@
if (!pluginEntryList.contains(pluginEntry) && !listToAdd.contains(pluginEntry) &&
(!pluginInfo.property("X-KDE-PluginInfo-Category").isValid() ||
!pluginInfo.property("X-KDE-PluginInfo-Category").toString().compare(categoryKey, Qt::CaseInsensitive)) &&
- !pluginInfo.service()->noDisplay()) {
+ (pluginInfo.service().isNull() || !pluginInfo.service()->noDisplay())) {
listToAdd << pluginEntry;
if (!pluginSelector_d->showIcons && !pluginInfo.icon().isEmpty()) {
Index: kutils/kcmoduleproxy.cpp
===================================================================
--- kutils/kcmoduleproxy.cpp (revision 857917)
+++ kutils/kcmoduleproxy.cpp (revision 857918)
@@ -228,7 +228,7 @@
Q_Q(KCModuleProxy);
changed = c;
emit q->changed(c);
- emit q->changed(this);
+ emit q->changed(q);
}
void KCModuleProxyPrivate::_k_moduleDestroyed()

7
kdelibs.spec
View File

@ -2,7 +2,7 @@
Summary: K Desktop Environment 4 - Libraries
Version: 4.1.1
Release: 5%{?dist}
Release: 6%{?dist}
%if 0%{?fedora} > 8
Name: kdelibs
@ -84,6 +84,7 @@ Patch19: kdelibs-4.1.0-#455130.patch
Patch100: kdelibs-4.1.1-kde#169447-khtml-regression.patch
Patch101: kdelibs-4.1.1-kde#856379-cookiejar.patch
Patch102: kdelibs-4.1.1-kde#856403-urlnav.patch
Patch103: kdelibs-4.1.1-kutils-fixes.patch
BuildRequires: qt4-devel >= 4.4.0
Requires: qt4 >= %{_qt4_version}
@ -213,6 +214,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
%patch100 -p0 -b .kde#169447-khtml-regression
%patch101 -p0 -b .kde#856379-cookiejar
%patch102 -p0 -b .kde#856403-urlnav
%patch103 -p0 -b .kutils-fixes
%build
@ -373,6 +375,9 @@ rm -rf %{buildroot}
%changelog
* Mon Sep 08 2008 Lukáš Tinkl <ltinkl@redhat.com> 4.1.1-6
- fix crashes in plugin selector
* Wed Sep 03 2008 Lukáš Tinkl <ltinkl@redhat.com> 4.1.1-5
- fixed crash on setting cookies on empty domains (like the file
system), KDE bug #170147