* Fri Jan 30 2009 Rex Dieter <rdieter@fedoraproject.org> 4.2.0-7
- kded/kdirwatch patch (kde#182472)
This commit is contained in:
parent
2534344e15
commit
e04898b9ce
|
@ -0,0 +1,88 @@
|
||||||
|
--- branches/KDE/4.2/kdelibs/kded/kded.cpp 2009/01/12 21:32:29 910250
|
||||||
|
+++ branches/KDE/4.2/kdelibs/kded/kded.cpp 2009/01/30 20:28:25 918838
|
||||||
|
@@ -115,9 +115,8 @@
|
||||||
|
KToolInvocation::kdeinitExecWait( "kdontchangethehostname", args );
|
||||||
|
}
|
||||||
|
|
||||||
|
-Kded::Kded(bool checkUpdates)
|
||||||
|
- : b_checkUpdates(checkUpdates),
|
||||||
|
- m_needDelayedCheck(false)
|
||||||
|
+Kded::Kded()
|
||||||
|
+ : m_needDelayedCheck(false)
|
||||||
|
{
|
||||||
|
_self = this;
|
||||||
|
|
||||||
|
@@ -280,7 +279,7 @@
|
||||||
|
KSharedConfig::Ptr config = KGlobal::config();
|
||||||
|
// Ensure the service exists.
|
||||||
|
KService::Ptr service = KService::serviceByDesktopPath("kded/"+obj+".desktop");
|
||||||
|
- if (!service)
|
||||||
|
+ if (!service)
|
||||||
|
return;
|
||||||
|
KConfigGroup cg(config, QString("Module-%1").arg(service->desktopEntryName()));
|
||||||
|
cg.writeEntry("autoload", autoload);
|
||||||
|
@@ -290,7 +289,7 @@
|
||||||
|
bool Kded::isModuleAutoloaded(const QString &obj) const
|
||||||
|
{
|
||||||
|
KService::Ptr s = KService::serviceByDesktopPath("kded/"+obj+".desktop");
|
||||||
|
- if (!s)
|
||||||
|
+ if (!s)
|
||||||
|
return false;
|
||||||
|
return isModuleAutoloaded(s);
|
||||||
|
}
|
||||||
|
@@ -307,7 +306,7 @@
|
||||||
|
bool Kded::isModuleLoadedOnDemand(const QString &obj) const
|
||||||
|
{
|
||||||
|
KService::Ptr s = KService::serviceByDesktopPath("kded/"+obj+".desktop");
|
||||||
|
- if (!s)
|
||||||
|
+ if (!s)
|
||||||
|
return false;
|
||||||
|
return isModuleLoadedOnDemand(s);
|
||||||
|
}
|
||||||
|
@@ -446,7 +445,7 @@
|
||||||
|
|
||||||
|
void Kded::updateDirWatch()
|
||||||
|
{
|
||||||
|
- if (!b_checkUpdates) return;
|
||||||
|
+ if (!bCheckUpdates) return;
|
||||||
|
|
||||||
|
delete m_pDirWatch;
|
||||||
|
m_pDirWatch = new KDirWatch;
|
||||||
|
@@ -471,7 +470,7 @@
|
||||||
|
{
|
||||||
|
delete KSycoca::self();
|
||||||
|
|
||||||
|
- if (!b_checkUpdates) return;
|
||||||
|
+ if (!bCheckUpdates) return;
|
||||||
|
|
||||||
|
if (delayedCheck) return;
|
||||||
|
|
||||||
|
@@ -921,7 +920,7 @@
|
||||||
|
checkStamps = cg.readEntry("CheckFileStamps", true);
|
||||||
|
delayedCheck = cg.readEntry("DelayedCheck", false);
|
||||||
|
|
||||||
|
- Kded *kded = new Kded(false); // Build data base
|
||||||
|
+ Kded *kded = new Kded(); // Build data base
|
||||||
|
|
||||||
|
KDE_signal(SIGTERM, sighandler);
|
||||||
|
KDE_signal(SIGHUP, sighandler);
|
||||||
|
--- branches/KDE/4.2/kdelibs/kded/kded.h 2009/01/06 17:13:38 906699
|
||||||
|
+++ branches/KDE/4.2/kdelibs/kded/kded.h 2009/01/30 20:28:25 918838
|
||||||
|
@@ -41,7 +41,7 @@
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
public:
|
||||||
|
- Kded(bool checkUpdates);
|
||||||
|
+ Kded();
|
||||||
|
virtual ~Kded();
|
||||||
|
|
||||||
|
static Kded *self() { return _self;}
|
||||||
|
@@ -186,8 +186,6 @@
|
||||||
|
*/
|
||||||
|
KDirWatch* m_pDirWatch;
|
||||||
|
|
||||||
|
- bool b_checkUpdates;
|
||||||
|
-
|
||||||
|
/**
|
||||||
|
* When a desktop file is updated, a timer is started (5 sec)
|
||||||
|
* before rebuilding the binary - so that multiple updates result
|
|
@ -1,6 +1,6 @@
|
||||||
Summary: K Desktop Environment 4 - Libraries
|
Summary: K Desktop Environment 4 - Libraries
|
||||||
Version: 4.2.0
|
Version: 4.2.0
|
||||||
Release: 6%{?dist}
|
Release: 7%{?dist}
|
||||||
|
|
||||||
%if 0%{?fedora} > 8
|
%if 0%{?fedora} > 8
|
||||||
Name: kdelibs
|
Name: kdelibs
|
||||||
|
@ -86,6 +86,7 @@ Patch101: kdelibs-4.1.96-AllowExternalPaths.patch
|
||||||
Patch110: kdelibs-4.2.1-kde#917170.patch
|
Patch110: kdelibs-4.2.1-kde#917170.patch
|
||||||
Patch111: kdelibs-4.2.1-kde#918403.patch
|
Patch111: kdelibs-4.2.1-kde#918403.patch
|
||||||
Patch112: kdelibs-4.2.1-kde#918654.patch
|
Patch112: kdelibs-4.2.1-kde#918654.patch
|
||||||
|
Patch113: kdelibs-4.2.0-kded-kdirwatch.patch
|
||||||
|
|
||||||
BuildRequires: qt4-devel >= 4.4.0
|
BuildRequires: qt4-devel >= 4.4.0
|
||||||
# qt4%{_?_isa} isn't provided yet -- Rex
|
# qt4%{_?_isa} isn't provided yet -- Rex
|
||||||
|
@ -218,6 +219,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
|
||||||
%patch110 -p0 -b .kde#917170
|
%patch110 -p0 -b .kde#917170
|
||||||
%patch111 -p0 -b .kde#918403
|
%patch111 -p0 -b .kde#918403
|
||||||
%patch112 -p0 -b .kde#918654
|
%patch112 -p0 -b .kde#918654
|
||||||
|
%patch113 -p4 -b .kde#182472
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
@ -228,7 +230,7 @@ pushd %{_target_platform}
|
||||||
popd
|
popd
|
||||||
|
|
||||||
%if 0%{?rest}
|
%if 0%{?rest}
|
||||||
make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
|
make %{?_smp_mflags} -C %{_target_platform}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# build apidocs
|
# build apidocs
|
||||||
|
@ -380,6 +382,9 @@ rm -rf %{buildroot}
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jan 30 2009 Rex Dieter <rdieter@fedoraproject.org> 4.2.0-7
|
||||||
|
- kded/kdirwatch patch (kde#182472)
|
||||||
|
|
||||||
* Fri Jan 30 2009 Lukáš Tinkl <ltinkl@redhat.com> 4.2.0-6
|
* Fri Jan 30 2009 Lukáš Tinkl <ltinkl@redhat.com> 4.2.0-6
|
||||||
- Emit the correct FilesRemoved signal if the job was aborted in the middle of its operation,
|
- Emit the correct FilesRemoved signal if the job was aborted in the middle of its operation,
|
||||||
otherwise it can result in confusion and data loss (overwriting files with files
|
otherwise it can result in confusion and data loss (overwriting files with files
|
||||||
|
|
Loading…
Reference in New Issue