* Wed Aug 05 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.0-2
- microblog crashes plasma on show friends toggle (kdebug#202550)
This commit is contained in:
parent
d7c211b5ea
commit
a5e81cafd2
|
@ -0,0 +1,75 @@
|
||||||
|
--- branches/KDE/4.3/kdelibs/plasma/private/service_p.h 2009/08/02 18:26:50 1005966
|
||||||
|
+++ branches/KDE/4.3/kdelibs/plasma/private/service_p.h 2009/08/02 18:27:44 1005967
|
||||||
|
@@ -73,6 +73,7 @@
|
||||||
|
ServicePrivate(Service *service)
|
||||||
|
: q(service),
|
||||||
|
config(0),
|
||||||
|
+ dummyConfig(0),
|
||||||
|
tempFile(0)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
@@ -80,6 +81,7 @@
|
||||||
|
~ServicePrivate()
|
||||||
|
{
|
||||||
|
delete config;
|
||||||
|
+ delete dummyConfig;
|
||||||
|
delete tempFile;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -98,10 +100,25 @@
|
||||||
|
associatedGraphicsWidgets.remove(static_cast<QGraphicsWidget*>(obj));
|
||||||
|
}
|
||||||
|
|
||||||
|
+ KConfigGroup dummyGroup()
|
||||||
|
+ {
|
||||||
|
+ if (!dummyConfig) {
|
||||||
|
+ if (!tempFile) {
|
||||||
|
+ tempFile = new KTemporaryFile;
|
||||||
|
+ tempFile->open();
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ dummyConfig = new KConfig(tempFile->fileName());
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return KConfigGroup(dummyConfig, "DummyGroup");
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
Service *q;
|
||||||
|
QString destination;
|
||||||
|
QString name;
|
||||||
|
ConfigLoader *config;
|
||||||
|
+ KConfig *dummyConfig;
|
||||||
|
KTemporaryFile *tempFile;
|
||||||
|
QMultiHash<QWidget *, QString> associatedWidgets;
|
||||||
|
QMultiHash<QGraphicsWidget *, QString> associatedGraphicsWidgets;
|
||||||
|
--- branches/KDE/4.3/kdelibs/plasma/service.cpp 2009/08/02 18:26:50 1005966
|
||||||
|
+++ branches/KDE/4.3/kdelibs/plasma/service.cpp 2009/08/02 18:27:44 1005967
|
||||||
|
@@ -116,7 +116,7 @@
|
||||||
|
{
|
||||||
|
if (!d->config) {
|
||||||
|
kDebug() << "No valid operations scheme has been registered";
|
||||||
|
- return KConfigGroup();
|
||||||
|
+ return d->dummyGroup();
|
||||||
|
}
|
||||||
|
|
||||||
|
d->config->writeConfig();
|
||||||
|
@@ -212,6 +212,9 @@
|
||||||
|
delete d->tempFile;
|
||||||
|
d->tempFile = 0;
|
||||||
|
|
||||||
|
+ delete d->dummyConfig;
|
||||||
|
+ d->dummyConfig = 0;
|
||||||
|
+
|
||||||
|
registerOperationsScheme();
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -258,6 +261,9 @@
|
||||||
|
delete d->config;
|
||||||
|
delete d->tempFile;
|
||||||
|
|
||||||
|
+ delete d->dummyConfig;
|
||||||
|
+ d->dummyConfig = 0;
|
||||||
|
+
|
||||||
|
//FIXME: make KSharedConfig and KConfigSkeleton not braindamaged in 4.2 and then get rid of the
|
||||||
|
// temp file object here
|
||||||
|
d->tempFile = new KTemporaryFile;
|
10
kdelibs.spec
10
kdelibs.spec
|
@ -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: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
|
|
||||||
%if 0%{?fedora} > 8
|
%if 0%{?fedora} > 8
|
||||||
Name: kdelibs
|
Name: kdelibs
|
||||||
|
@ -83,8 +83,10 @@ Patch20: kdelibs-4.1.70-cmake.patch
|
||||||
|
|
||||||
# upstream
|
# upstream
|
||||||
# 4.3 branch
|
# 4.3 branch
|
||||||
|
# http://bugs.kde.org/202550
|
||||||
|
Patch100: kdelibs-4.3.1-kdebug#202550.patch
|
||||||
|
|
||||||
BuildRequires: qt4-devel >= 4.4.0
|
BuildRequires: qt4-devel >= 4.5.0
|
||||||
# qt4%{_?_isa} isn't provided yet -- Rex
|
# qt4%{_?_isa} isn't provided yet -- Rex
|
||||||
#Requires: qt4%{?_isa} >= %{_qt4_version}
|
#Requires: qt4%{?_isa} >= %{_qt4_version}
|
||||||
Requires: qt4 >= %{_qt4_version}
|
Requires: qt4 >= %{_qt4_version}
|
||||||
|
@ -217,6 +219,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
|
||||||
|
|
||||||
# upstream patches
|
# upstream patches
|
||||||
# 4.3
|
# 4.3
|
||||||
|
%patch100 -p4 -b .kdebug#202550
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
@ -399,6 +402,9 @@ rm -rf %{buildroot}
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Aug 05 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.0-2
|
||||||
|
- microblog crashes plasma on show friends toggle (kdebug#202550)
|
||||||
|
|
||||||
* Thu Jul 30 2009 Than Ngo <than@redhat.com> - 4.3.0-1
|
* Thu Jul 30 2009 Than Ngo <than@redhat.com> - 4.3.0-1
|
||||||
- 4.3.0
|
- 4.3.0
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue