rpms/kdebase-runtime/F-12 kdebase-runtime-4.3.4-kde#210463.patch, NONE, 1.1 kdebase-runtime.spec, 1.159, 1.160
Than Ngo
than at fedoraproject.org
Tue Jan 26 14:51:33 UTC 2010
Author: than
Update of /cvs/extras/rpms/kdebase-runtime/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25778
Modified Files:
kdebase-runtime.spec
Added Files:
kdebase-runtime-4.3.4-kde#210463.patch
Log Message:
fix kde#210463, Don't watch subdirs for changes unless they've been listed
kdebase-runtime-4.3.4-kde#210463.patch:
desktopnotifier.cpp | 11 ++++++++---
desktopnotifier.h | 13 ++++++++++++-
kio_desktop.cpp | 13 ++++++++++++-
kio_desktop.h | 3 ++-
4 files changed, 34 insertions(+), 6 deletions(-)
--- NEW FILE kdebase-runtime-4.3.4-kde#210463.patch ---
Index: runtime/kioslave/desktop/desktopnotifier.h
===================================================================
--- runtime/kioslave/desktop/desktopnotifier.h (Revision 1080099)
+++ runtime/kioslave/desktop/desktopnotifier.h (Revision 1080100)
@@ -1,5 +1,5 @@
/* This file is part of the KDE Project
- Copyright (C) 2008 Fredrik Höglund <fredrik at kde.org>
+ Copyright (C) 2008, 2009 Fredrik Höglund <fredrik at kde.org>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -20,15 +20,26 @@
#define DESKTOPNOTIFIER_H
#include <kdedmodule.h>
+#include <QtDBus/QtDBus>
+class KDirWatch;
+
class DesktopNotifier : public KDEDModule
{
Q_OBJECT
+ Q_CLASSINFO("D-Bus Interface", "org.kde.DesktopNotifier")
+
public:
DesktopNotifier(QObject* parent, const QList<QVariant>&);
+public slots:
+ Q_SCRIPTABLE Q_NOREPLY void watchDir(const QString &path);
+
private slots:
void dirty(const QString &path);
+
+private:
+ KDirWatch *dirWatch;
};
#endif
Index: runtime/kioslave/desktop/kio_desktop.h
===================================================================
--- runtime/kioslave/desktop/kio_desktop.h (Revision 1080099)
+++ runtime/kioslave/desktop/kio_desktop.h (Revision 1080100)
@@ -1,5 +1,5 @@
/* This file is part of the KDE project
- Copyright (C) 2008 Fredrik Höglund <fredrik at kde.org>
+ Copyright (C) 2008, 2009 Fredrik Höglund <fredrik at kde.org>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -33,6 +33,7 @@
void checkLocalInstall();
QString desktopFile(KIO::UDSEntry&) const;
virtual bool rewriteUrl(const KUrl &url, KUrl &newUrl);
+ virtual void listDir(const KUrl &url);
virtual void prepareUDSEntry(KIO::UDSEntry &entry, bool listing=false) const;
virtual void rename(const KUrl &, const KUrl &, KIO::JobFlags flags);
};
Index: runtime/kioslave/desktop/desktopnotifier.cpp
===================================================================
--- runtime/kioslave/desktop/desktopnotifier.cpp (Revision 1080099)
+++ runtime/kioslave/desktop/desktopnotifier.cpp (Revision 1080100)
@@ -1,5 +1,5 @@
/* This file is part of the KDE Project
- Copyright (C) 2008 Fredrik Höglund <fredrik at kde.org>
+ Copyright (C) 2008, 2009 Fredrik Höglund <fredrik at kde.org>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -36,13 +36,18 @@
DesktopNotifier::DesktopNotifier(QObject *parent, const QList<QVariant> &)
: KDEDModule(parent)
{
- KDirWatch *dirWatch = new KDirWatch(this);
- dirWatch->addDir(KGlobalSettings::desktopPath(), KDirWatch::WatchSubDirs);
+ dirWatch = new KDirWatch(this);
+ dirWatch->addDir(KGlobalSettings::desktopPath());
dirWatch->addDir(KGlobal::dirs()->localxdgdatadir() + "Trash/files");
connect(dirWatch, SIGNAL(dirty(QString)), SLOT(dirty(QString)));
}
+void DesktopNotifier::watchDir(const QString &path)
+{
+ dirWatch->addDir(path);
+}
+
void DesktopNotifier::dirty(const QString &path)
{
Q_UNUSED(path)
Index: runtime/kioslave/desktop/kio_desktop.cpp
===================================================================
--- runtime/kioslave/desktop/kio_desktop.cpp (Revision 1080099)
+++ runtime/kioslave/desktop/kio_desktop.cpp (Revision 1080100)
@@ -1,5 +1,5 @@
/* This file is part of the KDE project
- Copyright (C) 2008 Fredrik Höglund <fredrik at kde.org>
+ Copyright (C) 2008, 2009 Fredrik Höglund <fredrik at kde.org>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -157,6 +157,17 @@
return true;
}
+void DesktopProtocol::listDir(const KUrl &url)
+{
+ KIO::ForwardingSlaveBase::listDir(url);
+
+ KUrl actual;
+ rewriteUrl(url, actual);
+
+ QDBusInterface kded("org.kde.kded", "/modules/desktopnotifier", "org.kde.DesktopNotifier");
+ kded.call("watchDir", actual.path());
+}
+
QString DesktopProtocol::desktopFile(KIO::UDSEntry &entry) const
{
const QString name = entry.stringValue(KIO::UDSEntry::UDS_NAME);
Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-12/kdebase-runtime.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -p -r1.159 -r1.160
--- kdebase-runtime.spec 22 Jan 2010 19:19:46 -0000 1.159
+++ kdebase-runtime.spec 26 Jan 2010 14:51:33 -0000 1.160
@@ -9,7 +9,7 @@
Name: kdebase-runtime
Summary: K Desktop Environment - Runtime
Version: 4.3.5
-Release: 1%{?dist}
+Release: 2%{?dist}
# http://techbase.kde.org/Policies/Licensing_Policy
License: LGPLv2+
@@ -31,7 +31,9 @@ Patch6: kdebase-runtime-4.3.3-hom
# http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/kdebase4-runtime/current/SOURCES/kdebase-runtime-4.3.1-backend-globalconfig.patch
Patch7: kdebase-runtime-4.3.1-backend-globalconfig.patch
-## Upstream patches
+# 4.3 Upstream patches
+# https://bugs.kde.org/show_bug.cgi?id=210463
+Patch100: kdebase-runtime-4.3.4-kde#210463.patch
# when kdesu was removed, this is/should-be only temporary
%if 0%{?fedora} && 0%{?fedora} < 11
@@ -127,6 +129,7 @@ BuildArch: noarch
#patch5 -p1 -b .manpath
%patch6 -p1 -b .home_onlyshowin_kde
+%patch100 -p1 -b .kde#210463
%build
mkdir -p %{_target_platform}
@@ -243,6 +246,9 @@ fi
%changelog
+* Tue Jan 26 2010 Than Ngo <than at redhat.com> - 4.3.5-2
+- fix kde#210463, Don't watch subdirs for changes unless they've been listed
+
* Fri Jan 22 2010 Rex Dieter <rdieter at fedoraprojedct.org> - 4.3.5-1
- 4.3.5
More information about the scm-commits
mailing list