[gentoo-commits] gentoo-x86 commit in kde-base/kdebase-kioslaves/files: 4.3.5-fix-slow-folderview.patch

[Tomas Chvatal (scarabeus)]

scarabeus    10/01/27 10:40:52

  Added:                4.3.5-fix-slow-folderview.patch
  Log:
  Revision bump. Apply upstream patch fixing cpu hogs.
  (Portage version: 2.2_rc61/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  kde-base/kdebase-kioslaves/files/4.3.5-fix-slow-folderview.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase-kioslaves/files/4.3.5-fix-slow-folderview.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase-kioslaves/files/4.3.5-fix-slow-folderview.patch?rev=1.1&content-type=text/plain

Index: 4.3.5-fix-slow-folderview.patch
===================================================================
Index: branches/KDE/4.3/kdebase/runtime/kioslave/desktop/desktopnotifier.h
===================================================================
--- a/kioslave/desktop/desktopnotifier.h	(revision 1080099)
+++ b/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@×××.org>
+   Copyright (C) 2008, 2009 Fredrik Höglund <fredrik@×××.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: branches/KDE/4.3/kdebase/runtime/kioslave/desktop/kio_desktop.h
===================================================================
--- a/kioslave/desktop/kio_desktop.h	(revision 1080099)
+++ b/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@×××.org>
+   Copyright (C) 2008, 2009 Fredrik Höglund <fredrik@×××.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: branches/KDE/4.3/kdebase/runtime/kioslave/desktop/desktopnotifier.cpp
===================================================================
--- a/kioslave/desktop/desktopnotifier.cpp	(revision 1080099)
+++ b/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@×××.org>
+   Copyright (C) 2008, 2009 Fredrik Höglund <fredrik@×××.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: branches/KDE/4.3/kdebase/runtime/kioslave/desktop/kio_desktop.cpp
===================================================================
--- a/kioslave/desktop/kio_desktop.cpp	(revision 1080099)
+++ b/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@×××.org>
+   Copyright (C) 2008, 2009 Fredrik Höglund <fredrik@×××.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);