Hello community,

here is the log from the commit of package powerdevil5.3666 for 
openSUSE:13.2:Update checked in at 2015-04-14 11:40:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.2:Update/powerdevil5.3666 (Old)
 and      /work/SRC/openSUSE:13.2:Update/.powerdevil5.3666.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "powerdevil5.3666"

Changes:
--------
New Changes file:

--- /dev/null   2015-03-12 01:14:30.992027505 +0100
+++ /work/SRC/openSUSE:13.2:Update/.powerdevil5.3666.new/powerdevil5.changes    
2015-04-14 11:40:50.000000000 +0200
@@ -0,0 +1,118 @@
+-------------------------------------------------------------------
+Thu Mar 19 17:42:45 UTC 2015 - [email protected]
+
+- Update to 5.2.2:
+  * Bugfix release
+  * For more details please see:
+    https://www.kde.org/announcements/plasma-5.2.2.php
+- Drop patches merged upstream:
+  0005-Fix-default-critical-action.patch,
+  0003-prepare-for-kernel-4.0.patch and
+  0006-Change-default-low-battery-threshold-to-10.patch
+
+-------------------------------------------------------------------
+Thu Mar 19 17:19:57 UTC 2015 - [email protected]
+
+- Add explicit kdbusaddons-devel BuildRequires
+
+-------------------------------------------------------------------
+Fri Mar 13 09:55:49 UTC 2015 - [email protected]
+
+- Added patches from upstream:
+  0003-prepare-for-kernel-4.0.patch,
+  0005-Fix-default-critical-action.patch (kde#344905),
+  0006-Change-default-low-battery-threshold-to-10.patch and
+  activityConfig.patch (restores the ability to configure
+  activity-specific power management settings)
+- Added kactivities5-devel BuildRequires, per activityConfig.patch
+
+-------------------------------------------------------------------
+Fri Feb 20 02:44:05 UTC 2015 - [email protected]
+
+- Update to 5.2.1:
+  * Bugfix release
+  * For more details please see:
+    https://www.kde.org/announcements/plasma-5.2.1.php
+- Drop 0001-Fix-PowerDevil-brightness-calls-breaking-kded-Volume.patch,
+  merged upstream
+
+-------------------------------------------------------------------
+Fri Jan 30 01:47:22 UTC 2015 - [email protected]
+
+- Added 0001-Fix-PowerDevil-brightness-calls-breaking-kded-Volume.patch
+  (kde#337674)
+
+-------------------------------------------------------------------
+Mon Jan 26 19:49:33 UTC 2015 - [email protected]
+
+- Update to 5.2 Final:
+  * For more details please see:
+    https://www.kde.org/announcements/plasma-5.2.0.php
+
+-------------------------------------------------------------------
+Tue Jan 13 16:35:15 UTC 2015 - [email protected]
+
+- Update to 5.2 Beta aka 5.1.95:
+  * Undo changes to Plasma desktop layout
+  * Smarter sorting of results in KRunner
+  * Breeze window decoration theme adds a new look to your
+    desktop and is now used by default
+  * New white mouse cursor theme for Breeze.
+  * New plasma widgets: 15 puzzle, web browser, show desktop
+  * Over 300 bugs fixed throughout Plasma modules.
+  * For more details please see:
+    https://www.kde.org/announcements/plasma-5.1.95.php
+- Require systemd >= 198
+- Harden plasma5-workspace-libs Requires
+- Drop 0001-Fix-battery-remaining-time-update-with-upower-0.99.patch,
+  merged upstream
+
+-------------------------------------------------------------------
+Fri Dec  5 16:11:37 UTC 2014 - [email protected]
+
+- Added 0001-Fix-battery-remaining-time-update-with-upower-0.99.patch,
+  kde#339957
+
+-------------------------------------------------------------------
+Sat Oct 25 18:02:30 UTC 2014 - [email protected]
+
+- Recommend lang subpackage
+
+-------------------------------------------------------------------
+Fri Sep 26 14:58:30 UTC 2014 - [email protected]
+
+- Update to 5.0.2:
+   Fixed kde#335466
+- Install translations
+- Add rpmlintrc file for file-not-in-%lang warnings: we don't use
+  find_lang macro as it doesn't searches in subdirectories
+
+-------------------------------------------------------------------
+Fri Aug  8 18:54:34 UTC 2014 - [email protected]
+
+- Update to 5.0.1
+   * Bugfix release
+
+-------------------------------------------------------------------
+Thu Jul 24 17:51:58 UTC 2014 - [email protected]
+
+- Update to 5.0.1~20140724~48b5011 snapshot
+- Drop kauth_fixups.patch and soversion.diff, merged upstream
+
+-------------------------------------------------------------------
+Fri Jul 11 19:46:25 UTC 2014 - [email protected]
+
+- Update to 5.0.0
+   * Plasma 5.0 Final
+
+-------------------------------------------------------------------
+Thu Jul  3 17:35:40 UTC 2014 - [email protected]
+
+- Update to 4.98.0
+  * Plasma 5 RC release
+
+-------------------------------------------------------------------
+Fri Jun  6 19:14:52 UTC 2014 - [email protected]
+
+- Activate powerdevil5 package
+

New:
----
  activityConfig.patch
  powerdevil-5.2.2.tar.xz
  powerdevil5-rpmlintrc
  powerdevil5.changes
  powerdevil5.spec

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ powerdevil5.spec ++++++
#
# spec file for package powerdevil5
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.

# Please submit bugfixes or comments via http://bugs.opensuse.org/
#


Name:           powerdevil5
Version:        5.2.2
Release:        0
Summary:        KDE Power Management module
License:        GPL-2.0+
Group:          System/GUI/KDE
Url:            http://www.kde.org
Source:         powerdevil-%{version}.tar.xz
Source99:       %{name}-rpmlintrc
# PATCHES 100-1000 and above are from upstream 5.2 branch
# PATCHES 1000 and above are from upstream master/5.3 branch
Patch1000:      activityConfig.patch
BuildRequires:  kactivities5-devel
BuildRequires:  kauth-devel
BuildRequires:  kconfig-devel
BuildRequires:  kdbusaddons-devel
BuildRequires:  kdelibs4support-devel
BuildRequires:  kf5-filesystem
BuildRequires:  kglobalaccel-devel
BuildRequires:  ki18n-devel
BuildRequires:  kidletime-devel
BuildRequires:  kio-devel
BuildRequires:  knotifyconfig-devel
BuildRequires:  libxcb-devel
BuildRequires:  plasma5-workspace-devel >= %{version}
BuildRequires:  solid-devel
BuildRequires:  update-desktop-files
BuildRequires:  xz
BuildRequires:  pkgconfig(Qt5DBus) >= 5.2.0
BuildRequires:  pkgconfig(Qt5Widgets) >= 5.2.0
BuildRequires:  pkgconfig(Qt5X11Extras) >= 5.2.0
BuildRequires:  pkgconfig(libudev)
BuildRequires:  pkgconfig(x11)
BuildRequires:  pkgconfig(xrandr)
#PrepareForSleep is added to systemd 198, and with Plasma 5.2, will be 
unconditionaly called
Requires:       systemd >= 198
%requires_ge plasma5-workspace-libs
Recommends:     %{name}-lang
Conflicts:      kdebase4-workspace
BuildRoot:      %{_tmppath}/%{name}-%{version}-build

%description
KDE Power Management module. Provides kded daemon,
DBus helper and KCM for configuring Power settings.

%lang_package
%prep
%setup -q -n powerdevil-%{version}
%patch1000 -p1

%build
  %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5
  %make_jobs

%install
  %kf5_makeinstall -C build

  rm -rfv 
%{buildroot}%{_kf5_libdir}/libpowerdevil{ui,core,configcommonprivate}.so

%post   -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root)
%doc COPYING*
%config 
%{_kf5_sysconfdir}/dbus-1/system.d/org.kde.powerdevil.backlighthelper.conf
%{_kf5_libdir}/libexec/
%{_kf5_libdir}/libpowerdevilconfigcommonprivate.so.*
%{_kf5_libdir}/libpowerdevilcore.so.*
%{_kf5_libdir}/libpowerdevilui.so.*
%dir %{_kf5_htmldir}/en
%dir %{_kf5_htmldir}
%doc %{_kf5_htmldir}/en/*/
%{_kf5_plugindir}/
%{_kf5_notifydir}/
%{_kf5_servicesdir}/
%{_kf5_servicetypesdir}/
%{_kf5_sharedir}/dbus-1/system-services/org.kde.powerdevil.backlighthelper.service
%{_kf5_sharedir}/polkit-1/actions/org.kde.powerdevil.backlighthelper.policy

%files lang
%defattr(-,root,root)
%{_kf5_localedir}/

%changelog
++++++ activityConfig.patch ++++++
From: Kai Uwe Broulik <[email protected]>
Date: Tue, 27 Jan 2015 21:01:04 +0000
Subject: Merge branch 'broulik/activityConfig'
---
Merge branch 'broulik/activityConfig'

REVIEW: 122236

Conflicts:
CMakeLists.txt
---


--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,7 +15,7 @@ include(KDECMakeSettings)
 include(KDECompilerSettings)
 
 find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets DBus 
X11Extras)
-find_package(KF5 REQUIRED COMPONENTS Auth IdleTime Config Solid I18n 
GlobalAccel KIO NotifyConfig KDELibs4Support)
+find_package(KF5 REQUIRED COMPONENTS Activities Auth IdleTime Config Solid 
I18n GlobalAccel KIO NotifyConfig KDELibs4Support)
 find_package(LibKWorkspace CONFIG REQUIRED)
 find_package(ScreenSaverDBusInterface CONFIG REQUIRED)
 
diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt
index f1e6efb..4c57ecb 100644
--- a/daemon/CMakeLists.txt
+++ b/daemon/CMakeLists.txt
@@ -56,6 +56,7 @@ set_target_properties(powerdevilcore PROPERTIES VERSION 
${POWERDEVIL_CORE_VERSIO
 
 # not exported, so just make the deps public
 target_link_libraries(powerdevilcore
+    KF5::Activities
     KF5::ConfigCore
     KF5::ConfigGui
     KF5::I18n
diff --git a/daemon/powerdevilcore.cpp b/daemon/powerdevilcore.cpp
index d51ab19..ba2d7d8 100644
--- a/daemon/powerdevilcore.cpp
+++ b/daemon/powerdevilcore.cpp
@@ -41,7 +41,7 @@
 #include <KNotification>
 #include <KServiceTypeTrader>
 
-// #include <KActivities/Consumer>
+#include <KActivities/Consumer>
 
 #include <QtCore/QTimer>
 #include <QtDBus/QDBusConnection>
@@ -58,7 +58,7 @@ Core::Core(QObject* parent)
     , m_backend(0)
     , m_notificationsWatcher(nullptr)
     , m_criticalBatteryTimer(new QTimer(this))
-//     , m_activityConsumer(new KActivities::Consumer(this))
+    , m_activityConsumer(new KActivities::Consumer(this))
     , m_pendingWakeupEvent(true)
 {
 }
@@ -127,8 +127,9 @@ void Core::onBackendReady()
             this, SLOT(onKIdleTimeoutReached(int,int)));
     connect(KIdleTime::instance(), SIGNAL(resumingFromIdle()),
             this, SLOT(onResumingFromIdle()));
-//     connect(m_activityConsumer, SIGNAL(currentActivityChanged(QString)),
-//             this, SLOT(loadProfile()));
+    connect(m_activityConsumer, 
&KActivities::Consumer::currentActivityChanged, this, [this]() {
+        loadProfile();
+    });
 
     // Set up the policy agent
     PowerDevil::PolicyAgent::instance()->init();
@@ -249,10 +250,7 @@ void Core::loadProfile(bool force)
     KConfigGroup config;
 
     // Check the activity in which we are in
-    QString activity;/* = m_activityConsumer->currentActivity();*/
-    if (activity.isEmpty()) {
-        activity = "default";
-    }
+    QString activity = m_activityConsumer->currentActivity();
     qCDebug(POWERDEVIL) << "We are now into activity " << activity;
     KConfigGroup activitiesConfig(m_profilesConfig, "Activities");
     qCDebug(POWERDEVIL) << activitiesConfig.groupList() << 
activitiesConfig.keyList();
diff --git a/daemon/powerdevilcore.h b/daemon/powerdevilcore.h
index e255703..7584849 100644
--- a/daemon/powerdevilcore.h
+++ b/daemon/powerdevilcore.h
@@ -120,7 +120,7 @@ private:
 
     QTimer *m_criticalBatteryTimer;
 
-//     KActivities::Consumer *m_activityConsumer;
+    KActivities::Consumer *m_activityConsumer;
 
     // Idle time management
     QHash< Action*, QList< int > > m_registeredActionTimeouts;
diff --git a/kcmodule/CMakeLists.txt b/kcmodule/CMakeLists.txt
index dfd0870..a4ece1c 100644
--- a/kcmodule/CMakeLists.txt
+++ b/kcmodule/CMakeLists.txt
@@ -6,6 +6,6 @@ include_directories (
 
 add_subdirectory(common)
 
-# add_subdirectory(activities)
+add_subdirectory(activities)
 add_subdirectory(global)
 add_subdirectory(profiles)
diff --git a/kcmodule/activities/CMakeLists.txt 
b/kcmodule/activities/CMakeLists.txt
index a5129d6..0e3c979 100644
--- a/kcmodule/activities/CMakeLists.txt
+++ b/kcmodule/activities/CMakeLists.txt
@@ -1,6 +1,7 @@
 add_definitions(-DTRANSLATION_DOMAIN=\"powerdevilactivitiesconfig\")
 
 set( kcm_powerdevil_activities_SRCS
+     ${PowerDevil_SOURCE_DIR}/daemon/powerdevil_debug.cpp
      activitypage.cpp
      activitywidget.cpp
      ../common/ErrorOverlay.cpp
@@ -14,9 +15,9 @@ kconfig_add_kcfg_files(kcm_powerdevil_activities_SRCS 
../../PowerDevilSettings.k
 add_library(kcm_powerdevilactivitiesconfig MODULE 
${kcm_powerdevil_activities_SRCS})
 
 target_link_libraries(kcm_powerdevilactivitiesconfig
-     
      KF5::Solid
      KF5::Activities
+     KF5::KDELibs4Support
      powerdevilconfigcommonprivate
 )
 
diff --git a/kcmodule/activities/activityWidget.ui 
b/kcmodule/activities/activityWidget.ui
index ec22df2..e17aaeb 100644
--- a/kcmodule/activities/activityWidget.ui
+++ b/kcmodule/activities/activityWidget.ui
@@ -33,7 +33,7 @@
         </widget>
        </item>
        <item>
-        <widget class="KComboBox" name="actLikeComboBox">
+        <widget class="QComboBox" name="actLikeComboBox">
          <property name="enabled">
           <bool>false</bool>
          </property>
@@ -93,7 +93,7 @@
           </widget>
          </item>
          <item>
-          <widget class="KComboBox" name="alwaysActionBox"/>
+          <widget class="QComboBox" name="alwaysActionBox"/>
          </item>
          <item>
           <widget class="QLabel" name="alwaysAfterLabel">
@@ -163,13 +163,6 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>KComboBox</class>
-   <extends>QComboBox</extends>
-   <header>kcombobox.h</header>
-  </customwidget>
- </customwidgets>
  <resources/>
  <connections>
   <connection>
diff --git a/kcmodule/activities/activitypage.cpp 
b/kcmodule/activities/activitypage.cpp
index ed0ac45..ec18dee 100644
--- a/kcmodule/activities/activitypage.cpp
+++ b/kcmodule/activities/activitypage.cpp
@@ -1,5 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2011 by Dario Freddi <[email protected]>                      *
+ *   Copyright (C) 2015 by Kai Uwe Broulik <[email protected]>         *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -29,6 +30,8 @@
 #include <QScrollArea>
 #include <QVBoxLayout>
 
+#include <QtWidgets/QTabWidget>
+
 #include <QtDBus/QDBusConnection>
 #include <QtDBus/QDBusConnectionInterface>
 #include <QtDBus/QDBusMessage>
@@ -41,7 +44,6 @@
 #include <KMessageWidget>
 #include <KPluginFactory>
 #include <KSharedConfig>
-#include <KTabWidget>
 #include <KLocalizedString>
 
 K_PLUGIN_FACTORY(PowerDevilActivitiesKCMFactory,
@@ -50,12 +52,12 @@ K_PLUGIN_FACTORY(PowerDevilActivitiesKCMFactory,
 
K_EXPORT_PLUGIN(PowerDevilActivitiesKCMFactory("powerdevilactivitiesconfig","powerdevil"))
 
 ActivityPage::ActivityPage(QWidget *parent, const QVariantList &args)
-    : KCModule(PowerDevilActivitiesKCMFactory::componentData(), parent, args)
+    : KCModule(0, parent, args)
     , m_activityConsumer(new KActivities::Consumer(this))
 {
     setButtons(Apply | Help);
 
-    KAboutData *about =
+    /*KAboutData *about =
         new KAboutData("powerdevilactivitiesconfig", 
"powerdevilactivitiesconfig", ki18n("Activities Power Management 
Configuration"),
                        "", ki18n("A per-activity configurator of KDE Power 
Management System"),
                        KAboutData::License_GPL, ki18n("(c), 2010 Dario 
Freddi"),
@@ -64,35 +66,12 @@ ActivityPage::ActivityPage(QWidget *parent, const 
QVariantList &args)
     about->addAuthor(ki18n("Dario Freddi"), ki18n("Maintainer") , 
"[email protected]",
                      "http://drfav.wordpress.com";);
 
-    setAboutData(about);
+    setAboutData(about);*/
 
     // Build the UI
-    KTabWidget *tabWidget = new KTabWidget();
+    m_tabWidget = new QTabWidget();
     QVBoxLayout *lay = new QVBoxLayout();
 
-    foreach (const QString &activity, m_activityConsumer->listActivities()) {
-        KActivities::Info *info = new KActivities::Info(activity, this);
-        QString icon = info->icon();
-        QString name = info->name();
-        qCDebug(POWERDEVIL) << activity << info->isValid() << 
info->availability();
-
-        QScrollArea *scrollArea = new QScrollArea();
-        scrollArea->setFrameShape(QFrame::NoFrame);
-        scrollArea->setFrameShadow(QFrame::Plain);
-        scrollArea->setLineWidth(0);
-        scrollArea->setWidgetResizable(true);
-
-        ActivityWidget *activityWidget = new ActivityWidget(activity);
-        scrollArea->setWidget(activityWidget);
-
-        activityWidget->load();
-        m_activityWidgets.append(activityWidget);
-
-        connect(activityWidget, SIGNAL(changed(bool)), this, 
SIGNAL(changed(bool)));
-
-        tabWidget->addTab(scrollArea, QIcon::fromTheme(icon), name);
-    }
-
     // Message widget
     m_messageWidget = new KMessageWidget(i18n("The activity service is running 
with bare functionalities.\n"
                                                           "Names and icons of 
the activities might not be available."));
@@ -100,12 +79,11 @@ ActivityPage::ActivityPage(QWidget *parent, const 
QVariantList &args)
     m_messageWidget.data()->hide();
 
     lay->addWidget(m_messageWidget.data());
-    lay->addWidget(tabWidget);
+    lay->addWidget(m_tabWidget);
     setLayout(lay);
 
-    connect(m_activityConsumer, 
SIGNAL(serviceStatusChanged(KActivities::Consumer::ServiceStatus)),
-            this, 
SLOT(onActivityServiceStatusChanged(KActivities::Consumer::ServiceStatus)));
     onActivityServiceStatusChanged(m_activityConsumer->serviceStatus());
+    connect(m_activityConsumer, &KActivities::Consumer::serviceStatusChanged, 
this, &ActivityPage::onActivityServiceStatusChanged);
 
     QDBusServiceWatcher *watcher = new 
QDBusServiceWatcher("org.kde.Solid.PowerManagement",
                                                            
QDBusConnection::sessionBus(),
@@ -161,6 +139,7 @@ void ActivityPage::fillUi()
 void 
ActivityPage::onActivityServiceStatusChanged(KActivities::Consumer::ServiceStatus
 status)
 {
     switch (status) {
+        case KActivities::Consumer::Unknown: // fall through
         case KActivities::Consumer::NotRunning:
             // Create error overlay, if not present
             if (m_errorOverlay.isNull()) {
@@ -170,25 +149,69 @@ void 
ActivityPage::onActivityServiceStatusChanged(KActivities::Consumer::Service
                                                   this);
             }
             break;
-        case KActivities::Consumer::BareFunctionality:
-            // Show message widget
-            m_messageWidget.data()->show();
-            break;
-        case KActivities::Consumer::FullFunctionality:
-            if (m_previousServiceStatus != 
KActivities::Consumer::FullFunctionality &&
-                !m_errorOverlay.isNull()) {
-                m_errorOverlay.data()->deleteLater();
-                if 
(QDBusConnection::sessionBus().interface()->isServiceRegistered("org.kde.Solid.PowerManagement"))
 {
-                    onServiceRegistered("org.kde.Solid.PowerManagement");
-                } else {
-                    onServiceUnregistered("org.kde.Solid.PowerManagement");
+        case KActivities::Consumer::Running:
+            if (m_previousServiceStatus != KActivities::Consumer::Running) {
+
+                if (!m_errorOverlay.isNull()) {
+                    m_errorOverlay.data()->deleteLater();
+                    if 
(QDBusConnection::sessionBus().interface()->isServiceRegistered("org.kde.Solid.PowerManagement"))
 {
+                        onServiceRegistered("org.kde.Solid.PowerManagement");
+                    } else {
+                        onServiceUnregistered("org.kde.Solid.PowerManagement");
+                    }
                 }
+
+                populateTabs();
             }
+
             if (m_messageWidget.data()->isVisible()) {
                 m_messageWidget.data()->hide();
             }
+
             break;
     }
+
+    m_previousServiceStatus = status;
+}
+
+void ActivityPage::populateTabs()
+{
+    if (m_activityConsumer->serviceStatus() != KActivities::Consumer::Running) 
{
+        return;
+    }
+
+    int index = 0;
+    foreach (const QString &activity, m_activityConsumer->activities()) {
+        KActivities::Info *info = new KActivities::Info(activity, this);
+        const QString icon = info->icon();
+        const QString name = info->name();
+        qCDebug(POWERDEVIL) << activity << info->isValid() << 
info->availability();
+
+        QScrollArea *scrollArea = new QScrollArea();
+        scrollArea->setFrameShape(QFrame::NoFrame);
+        scrollArea->setFrameShadow(QFrame::Plain);
+        scrollArea->setLineWidth(0);
+        scrollArea->setWidgetResizable(true);
+
+        ActivityWidget *activityWidget = new ActivityWidget(activity);
+        scrollArea->setWidget(activityWidget);
+
+        activityWidget->load();
+        m_activityWidgets.append(activityWidget);
+
+        connect(activityWidget, SIGNAL(changed(bool)), this, 
SIGNAL(changed(bool)));
+        if (!icon.isEmpty()) {
+            m_tabWidget->addTab(scrollArea, QIcon::fromTheme(icon), name);
+        } else {
+            m_tabWidget->addTab(scrollArea, name);
+        }
+
+        if (m_activityConsumer->currentActivity() == activity) {
+            m_tabWidget->setCurrentIndex(index);
+        }
+
+        ++index;
+    }
 }
 
 void ActivityPage::defaults()
@@ -203,8 +226,6 @@ void ActivityPage::onServiceRegistered(const QString& 
service)
     if (!m_errorOverlay.isNull()) {
         m_errorOverlay.data()->deleteLater();
     }
-
-    onActivityServiceStatusChanged(m_activityConsumer->serviceStatus());
 }
 
 void ActivityPage::onServiceUnregistered(const QString& service)
diff --git a/kcmodule/activities/activitypage.h 
b/kcmodule/activities/activitypage.h
index 230f835..cc4e3cd 100644
--- a/kcmodule/activities/activitypage.h
+++ b/kcmodule/activities/activitypage.h
@@ -25,9 +25,13 @@
 
 #include <KActivities/Consumer>
 
+class QTabWidget;
+
+class KMessageWidget;
+
 class ErrorOverlay;
 class ActivityWidget;
-class KMessageWidget;
+
 class ActivityPage : public KCModule
 {
     Q_OBJECT
@@ -47,6 +51,10 @@ private Q_SLOTS:
     void onServiceUnregistered(const QString &service);
 
 private:
+    void populateTabs();
+
+    QTabWidget *m_tabWidget;
+
     KActivities::Consumer *m_activityConsumer;
     QList< ActivityWidget* > m_activityWidgets;
     QWeakPointer< ErrorOverlay > m_errorOverlay;
diff --git a/kcmodule/activities/activitywidget.cpp 
b/kcmodule/activities/activitywidget.cpp
index bfd0e1f..c3e9ce1 100644
--- a/kcmodule/activities/activitywidget.cpp
+++ b/kcmodule/activities/activitywidget.cpp
@@ -22,8 +22,9 @@
 
 #include "ui_activityWidget.h"
 
-#include "daemon/actions/bundled/suspendsession.h"
+#include "../daemon/actions/bundled/suspendsession.h"
 
+#include <KConfigGroup>
 #include <KActivities/Consumer>
 #include <Solid/PowerManagement>
 #include <actioneditwidget.h>
@@ -106,7 +107,7 @@ void ActivityWidget::load()
     m_ui->actLikeComboBox->addItem(QIcon::fromTheme("battery-060"), i18n("PC 
running on battery power"), "Battery");
     m_ui->actLikeComboBox->addItem(QIcon::fromTheme("battery-low"), i18n("PC 
running on low battery"), "LowBattery");
 
-    foreach (const QString &activity, m_activityConsumer->listActivities()) {
+    foreach (const QString &activity, m_activityConsumer->activities()) {
         if (activity == m_activity) {
             continue;
         }
++++++ powerdevil5-rpmlintrc ++++++
# we don't use find_lang macro as it doesn't searches in subdirectories
addFilter("file-not-in-%lang .*")

Reply via email to