From 6d3be02cc7b69fb651848ce0ccf08a8f8143f352 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C3=A9cureuil?= <nlecureuil@mandriva.com> Date: Fri, 17 Dec 2010 20:57:39 +0100 Subject: [PATCH 2/2] kdebase-runtime-nepomuk-strigi-smartfile --- nepomuk/server/nepomukserver.cpp | 5 +++++ nepomuk/services/strigi/eventmonitor.cpp | 6 ------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/nepomuk/server/nepomukserver.cpp b/nepomuk/server/nepomukserver.cpp index 0625244..ed80f4b 100644 --- a/nepomuk/server/nepomukserver.cpp +++ b/nepomuk/server/nepomukserver.cpp @@ -85,6 +85,9 @@ void Nepomuk::Server::enableNepomuk( bool enabled ) // register the service manager interface QDBusConnection::sessionBus().registerObject( "/servicemanager", m_serviceManager ); + KConfig cnf( "kdeglobals" ); + cnf.group( "KFileDialog Settings" ).writeEntry( "file module", "smartfilemodule" ); + } else { // stop all running services @@ -92,6 +95,8 @@ void Nepomuk::Server::enableNepomuk( bool enabled ) // unregister the service manager interface QDBusConnection::sessionBus().unregisterObject( "/servicemanager" ); + KConfig cnf( "kdeglobals" ); + cnf.group( "KFileDialog Settings" ).writeEntry( "file module", "kfilemodule" ); } } } diff --git a/nepomuk/services/strigi/eventmonitor.cpp b/nepomuk/services/strigi/eventmonitor.cpp index bc8da0a..0b35234 100644 --- a/nepomuk/services/strigi/eventmonitor.cpp +++ b/nepomuk/services/strigi/eventmonitor.cpp @@ -46,10 +46,6 @@ Nepomuk::EventMonitor::EventMonitor( IndexScheduler* scheduler, QObject* parent m_pauseState( NotPaused ), m_totalIndexingSeconds( 0 ) { - // monitor the powermanagement to not drain the battery - connect( Solid::PowerManagement::notifier(), SIGNAL( appShouldConserveResourcesChanged( bool ) ), - this, SLOT( slotPowerManagementStatusChanged( bool ) ) ); - // setup the avail disk usage monitor connect( &m_availSpaceTimer, SIGNAL( timeout() ), this, SLOT( slotCheckAvailableSpace() ) ); @@ -75,8 +71,6 @@ Nepomuk::EventMonitor::EventMonitor( IndexScheduler* scheduler, QObject* parent connect( m_indexScheduler, SIGNAL( indexingSuspended(bool) ), this, SLOT( slotIndexingSuspended(bool) ) ); } - - slotPowerManagementStatusChanged( Solid::PowerManagement::appShouldConserveResources() ); } -- 1.7.3.4