Merge lp:~debfx/kdebase-workspace/ubuntu into lp:~kubuntu-packagers/kubuntu-packaging/kde-workspace

[Felix Geyer]

Update the brightness OSD patch to make it work even if the
HAL property brightness_in_hardware is set to true and use
an adapted version of the KMix 4.4 OSD.

=== modified file 'debian/patches/kubuntu_101_brightness_fn_keys_and_osd.diff'
--- debian/patches/kubuntu_101_brightness_fn_keys_and_osd.diff	2010-01-07 04:59:54 +0000
+++ debian/patches/kubuntu_101_brightness_fn_keys_and_osd.diff	2010-03-20 22:50:31 +0000
@@ -1,7 +1,6 @@
-Index: kdebase-workspace-4.3.90/libs/solid/control/powermanager.cpp
-===================================================================
---- kdebase-workspace-4.3.90.orig/libs/solid/control/powermanager.cpp	2010-01-06 20:08:48.026004564 -0500
-+++ kdebase-workspace-4.3.90/libs/solid/control/powermanager.cpp	2010-01-06 20:08:55.678005855 -0500
+diff -Nur kdebase-workspace-4.4.1.orig/libs/solid/control/powermanager.cpp kdebase-workspace-4.4.1/libs/solid/control/powermanager.cpp
+--- kdebase-workspace-4.4.1.orig/libs/solid/control/powermanager.cpp	2010-01-06 18:00:01.000000000 +0100
++++ kdebase-workspace-4.4.1/libs/solid/control/powermanager.cpp	2010-03-20 14:26:05.000000000 +0100
 @@ -25,6 +25,8 @@
  #include "ifaces/powermanager.h"
  #include <kdebug.h>
@@ -35,43 +34,43 @@
      }
      else
      {
-Index: kdebase-workspace-4.3.90/plasma/generic/applets/battery/battery.cpp
-===================================================================
---- kdebase-workspace-4.3.90.orig/plasma/generic/applets/battery/battery.cpp	2010-01-06 20:08:47.858007162 -0500
-+++ kdebase-workspace-4.3.90/plasma/generic/applets/battery/battery.cpp	2010-01-06 20:08:55.678005855 -0500
-@@ -31,9 +31,13 @@
- #include <QGraphicsGridLayout>
- #include <QGraphicsLinearLayout>
- #include <QDBusPendingCall>
+diff -Nur kdebase-workspace-4.4.1.orig/plasma/generic/applets/battery/battery.cpp kdebase-workspace-4.4.1/plasma/generic/applets/battery/battery.cpp
+--- kdebase-workspace-4.4.1.orig/plasma/generic/applets/battery/battery.cpp	2010-02-04 10:28:44.000000000 +0100
++++ kdebase-workspace-4.4.1/plasma/generic/applets/battery/battery.cpp	2010-03-20 20:51:36.000000000 +0100
+@@ -24,6 +24,7 @@
+ #include <QApplication>
+ #include <QDBusConnection>
+ #include <QDBusInterface>
 +#include <QDesktopWidget>
+ #include <QPainter>
+ #include <QStyleOptionGraphicsItem>
+ #include <QFont>
+@@ -34,6 +35,7 @@
  #include <QLabel>
-+#include <QProgressBar>
  #include <QPropertyAnimation>
-+#include <QTimer>
  
 +#include <KApplication>
  #include <KDebug>
  #include <KIcon>
  #include <KSharedConfig>
-@@ -86,7 +90,8 @@
-       m_labelAlpha(0),
-       m_labelAnimation(0),
-       m_acAlpha(0),
--      m_acAnimation(0)
-+      m_acAnimation(0),
-+      m_brightnessDisplay(0)
- {
-     //kDebug() << "Loading applet battery";
-     setAcceptsHoverEvents(true);
-@@ -313,6 +318,7 @@
+@@ -62,6 +64,8 @@
+ #include <Plasma/ComboBox>
+ #include <Plasma/IconWidget>
+ 
++#include "brightnessosdwidget.h"
++
+ 
+ Battery::Battery(QObject *parent, const QVariantList &args)
+     : Plasma::PopupApplet(parent, args),
+@@ -315,6 +319,7 @@
  
  Battery::~Battery()
  {
-+    delete m_brightnessDisplay;
++    delete m_brightnessOSD;
  }
  
  void Battery::suspend()
-@@ -333,13 +339,17 @@
+@@ -335,13 +340,17 @@
  
  void Battery::brightnessChanged(const int brightness)
  {
@@ -93,17 +92,17 @@
      }
  }
  
-@@ -362,6 +372,7 @@
+@@ -364,6 +373,7 @@
      // as the battery applet is also embedded into the battery's extender.
      if (!m_isEmbedded && item->name() == "powermanagement") {
          int row = 0;
 +        m_ignoreBrightnessChange = false;
  
-         QGraphicsWidget *controls = new QGraphicsWidget(item);
-         controls->setMinimumWidth(360);
-@@ -426,16 +437,12 @@
+         m_controls = new QGraphicsWidget(item);
+         m_controls->setMinimumWidth(360);
+@@ -428,16 +438,12 @@
  
-         m_brightnessSlider = new Plasma::Slider(controls);
+         m_brightnessSlider = new Plasma::Slider(m_controls);
          m_brightnessSlider->setRange(0, 100);
 -        m_brightnessSlider->setValue(Solid::Control::PowerManager::brightness());
 +        updateSlider(Solid::Control::PowerManager::brightness());
@@ -119,29 +118,18 @@
          m_controlsLayout->addItem(m_brightnessSlider, row, 1);
          row++;
  
-@@ -526,6 +533,21 @@
+@@ -528,6 +534,10 @@
          item->setTitle(i18n("Power Management"));
  
          setupFonts();
 +
-+        m_brightnessDisplay = new QProgressBar();
-+        m_brightnessDisplay->setWindowFlags(Qt::X11BypassWindowManagerHint);
-+        QDesktopWidget* desktop = KApplication::kApplication()->desktop();
-+        //Getting QRect of the screen where cursor is positioned
-+        QRect rect = desktop->screenGeometry(QCursor::pos());
-+        int width = (rect.width()/2) - (m_brightnessDisplay->width()/2);
-+        int height = (rect.height()/2) - (m_brightnessDisplay->height()/2);
-+        width += rect.x();
-+        height += rect.y();
-+        m_brightnessDisplay->move(width, height);
-+        m_brightnessDisplayTimer = new QTimer(this);
-+        connect(m_brightnessDisplayTimer, SIGNAL(timeout()), this, SLOT(hideOSD()));
++        m_brightnessOSD = new BrightnessOSDWidget();
 +        QDBusConnection::sessionBus().connect("org.kde.kded", "/modules/powerdevil", "org.kde.PowerDevil",
 +                                              "brightnessChanged", this, SLOT(showBrightnessOSD(int,bool)));
      }
  }
  
-@@ -648,7 +670,7 @@
+@@ -652,7 +662,7 @@
      }
  
      if (m_brightnessSlider) {
@@ -150,28 +138,23 @@
      }
  }
  
-@@ -990,4 +1012,34 @@
+@@ -990,4 +1000,24 @@
      return m_acAlpha;
  }
  
 +void Battery::showBrightnessOSD(int brightness, bool byFnKey)
 +{
 +    if (byFnKey) {
-+        m_brightnessDisplay->setValue(brightness);
-+        m_brightnessDisplay->show();
-+
-+        //FIXME, how to get this to work before it is displayed for the first time?
-+        QDesktopWidget* desktop = KApplication::kApplication()->desktop();
-+        //Getting QRect of the screen where cursor is positioned
-+        QRect rect = desktop->screenGeometry(QCursor::pos());
-+        int width = (rect.width()/2) - (m_brightnessDisplay->width()/2);
-+        int height = (rect.height()/2) - (m_brightnessDisplay->height()/2);
-+        width += rect.x();
-+        height += rect.y();
-+        m_brightnessDisplay->move(width, height);
-+
-+        m_brightnessDisplayTimer->setInterval(2000);
-+        m_brightnessDisplayTimer->start();
++        m_brightnessOSD->setCurrentBrightness(brightness);
++        m_brightnessOSD->show();
++        m_brightnessOSD->activateOSD(); //Enable the hide timer
++
++        //Center the OSD
++        QRect rect = KApplication::kApplication()->desktop()->screenGeometry(QCursor::pos());
++        QSize size = m_brightnessOSD->sizeHint();
++        int posX = rect.x() + (rect.width() - size.width()) / 2;
++        int posY = rect.y() + 4 * rect.height() / 5;
++        m_brightnessOSD->setGeometry(posX, posY, size.width(), size.height());
 +
 +        if (m_extenderVisible && m_brightnessSlider) {
 +            updateSlider(brightness);
@@ -179,21 +162,15 @@
 +    }
 +}
 +
-+void Battery::hideOSD()
-+{
-+    m_brightnessDisplay->hide();
-+}
-+
  #include "battery.moc"
-Index: kdebase-workspace-4.3.90/plasma/generic/applets/battery/battery.h
-===================================================================
---- kdebase-workspace-4.3.90.orig/plasma/generic/applets/battery/battery.h	2010-01-06 20:08:47.702007091 -0500
-+++ kdebase-workspace-4.3.90/plasma/generic/applets/battery/battery.h	2010-01-06 20:08:55.682004688 -0500
+diff -Nur kdebase-workspace-4.4.1.orig/plasma/generic/applets/battery/battery.h kdebase-workspace-4.4.1/plasma/generic/applets/battery/battery.h
+--- kdebase-workspace-4.4.1.orig/plasma/generic/applets/battery/battery.h	2010-01-20 00:19:14.000000000 +0100
++++ kdebase-workspace-4.4.1/plasma/generic/applets/battery/battery.h	2010-03-20 20:24:29.000000000 +0100
 @@ -39,6 +39,8 @@
      class Slider;
  }
  
-+class QProgressBar;
++class BrightnessOSDWidget;
 +
  class Battery : public Plasma::PopupApplet
  {
@@ -207,30 +184,258 @@
          void setFullBrightness();
          void openConfig();
          void setProfile(const QString &profile);
-@@ -91,6 +93,8 @@
+@@ -91,6 +93,7 @@
          void hibernate();
          void updateBattery();
          void setupFonts();
 +        void showBrightnessOSD(int brightness, bool byFnKey);
-+        void hideOSD();
  
      private:
          void connectSources();
-@@ -171,6 +175,10 @@
+@@ -172,6 +175,9 @@
          QPropertyAnimation *m_labelAnimation;
          qreal m_acAlpha;
          QPropertyAnimation *m_acAnimation;
 +
 +        bool m_ignoreBrightnessChange;
-+        QProgressBar* m_brightnessDisplay;
-+        QTimer* m_brightnessDisplayTimer;
++        BrightnessOSDWidget* m_brightnessOSD;
  };
  
  K_EXPORT_PLASMA_APPLET(battery, Battery)
-Index: kdebase-workspace-4.3.90/powerdevil/daemon/org.kde.PowerDevil.xml
-===================================================================
---- kdebase-workspace-4.3.90.orig/powerdevil/daemon/org.kde.PowerDevil.xml	2010-01-06 20:08:47.314008970 -0500
-+++ kdebase-workspace-4.3.90/powerdevil/daemon/org.kde.PowerDevil.xml	2010-01-06 20:08:55.682004688 -0500
+diff -Nur kdebase-workspace-4.4.1.orig/plasma/generic/applets/battery/brightnessosdwidget.cpp kdebase-workspace-4.4.1/plasma/generic/applets/battery/brightnessosdwidget.cpp
+--- kdebase-workspace-4.4.1.orig/plasma/generic/applets/battery/brightnessosdwidget.cpp	1970-01-01 01:00:00.000000000 +0100
++++ kdebase-workspace-4.4.1/plasma/generic/applets/battery/brightnessosdwidget.cpp	2010-03-20 22:03:21.000000000 +0100
+@@ -0,0 +1,141 @@
++/*******************************************************************
++* osdwidget.cpp
++* Copyright  2009    Aurélien Gâteau <[e-mail]>
++* Copyright  2009    Dario Andres Rodriguez <[e-mail]>
++* Copyright  2009    Christian Esken <[e-mail]>   
++*
++* 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 the Free Software Foundation; either version 2 of
++* the License, or (at your option) any later version.
++*
++* This program is distributed in the hope that it will be useful,
++* but WITHOUT ANY WARRANTY; without even the implied warranty of
++* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++* GNU General Public License for more details.
++*
++* You should have received a copy of the GNU General Public License
++* along with this program.  If not, see <http://www.gnu.org/licenses/>.
++*
++******************************************************************/
++
++#include "brightnessosdwidget.h"
++
++// Qt
++#include <QGraphicsLinearLayout>
++#include <QPainter>
++#include <QTimer>
++#include <QLabel>
++
++// KDE
++#include <KIcon>
++#include <KDialog>
++#include <Plasma/FrameSvg>
++#include <Plasma/Label>
++#include <Plasma/Meter>
++
++BrightnessOSDWidget::BrightnessOSDWidget(QWidget * parent)
++    : QGraphicsView(parent),
++    m_background(new Plasma::FrameSvg(this)),
++    m_scene(new QGraphicsScene(this)),
++    m_container(new QGraphicsWidget),
++    m_iconLabel(new Plasma::Label),
++    m_volumeLabel(new Plasma::Label),
++    m_meter(new Plasma::Meter),
++    m_hideTimer(new QTimer(this))
++{
++    //Setup the window properties
++    setWindowFlags(Qt::X11BypassWindowManagerHint);
++    setFrameStyle(QFrame::NoFrame);
++    viewport()->setAutoFillBackground(false);
++    setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
++    setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
++    setAttribute(Qt::WA_TranslucentBackground);
++
++    //Cache the icon pixmaps
++    QSize iconSize = QSize(KIconLoader::SizeSmallMedium, KIconLoader::SizeSmallMedium);
++    m_brightnessPixmap = KIcon("video-display").pixmap(iconSize);
++    /*m_volumeHighPixmap = KIcon("audio-volume-high").pixmap(iconSize);
++    m_volumeMediumPixmap = KIcon("audio-volume-medium").pixmap(iconSize);
++    m_volumeLowPixmap = KIcon("audio-volume-low").pixmap(iconSize);*/
++
++    //Setup the widgets
++    m_background->setImagePath("widgets/tooltip");
++
++    m_iconLabel->nativeWidget()->setPixmap(m_brightnessPixmap);
++    m_iconLabel->nativeWidget()->setFixedSize(iconSize);
++    m_iconLabel->setMinimumSize(iconSize);
++    m_iconLabel->setMaximumSize(iconSize);
++
++    m_meter->setMeterType(Plasma::Meter::BarMeterHorizontal);
++    m_meter->setMaximum(100);
++    m_meter->setMaximumHeight(iconSize.height());
++
++    m_volumeLabel->setAlignment(Qt::AlignCenter);
++
++    //Setup the auto-hide timer
++    m_hideTimer->setInterval(2000);
++    m_hideTimer->setSingleShot(true);
++    connect(m_hideTimer, SIGNAL(timeout()), this, SLOT(hide()));
++
++    //Setup the OSD layout
++    QGraphicsLinearLayout *layout = new QGraphicsLinearLayout(m_container);
++    layout->addItem(m_iconLabel);
++    layout->addItem(m_meter);
++
++    m_scene->addItem(m_container);
++    setScene(m_scene);
++}
++
++void BrightnessOSDWidget::activateOSD()
++{
++    m_hideTimer->start();
++}
++
++void BrightnessOSDWidget::setCurrentBrightness(int brightnessLevel)
++{
++    m_meter->setValue(brightnessLevel);
++
++    /*if (volumeLevel < 25) {
++        m_iconLabel->nativeWidget()->setPixmap(m_volumeLowPixmap);
++    } else if (volumeLevel < 75) {
++        m_iconLabel->nativeWidget()->setPixmap(m_volumeMediumPixmap);
++    } else {
++        m_iconLabel->nativeWidget()->setPixmap(m_volumeHighPixmap);
++    }*/
++
++    //Show the volume %
++    //m_meter->setLabel(0, QString::number(volumeLevel) + " %");
++}
++
++void BrightnessOSDWidget::drawBackground(QPainter *painter, const QRectF &/*rectF*/)
++{
++    painter->save();
++    painter->setCompositionMode(QPainter::CompositionMode_Source);
++    m_background->paintFrame(painter);
++    painter->restore();
++}
++
++QSize BrightnessOSDWidget::sizeHint() const
++{
++    int iconSize = m_iconLabel->nativeWidget()->pixmap()->height();
++    int meterHeight = iconSize;
++    int meterWidth = iconSize * 12;
++    qreal left, top, right, bottom;
++    m_background->getMargins(left, top, right, bottom);
++    return QSize(meterWidth + iconSize + left + right, meterHeight + top + bottom);
++}
++
++void BrightnessOSDWidget::resizeEvent(QResizeEvent*)
++{
++    m_background->resizeFrame(size());
++    m_container->setGeometry(0, 0, width(), height());
++    qreal left, top, right, bottom;
++    m_background->getMargins(left, top, right, bottom);
++    m_container->layout()->setContentsMargins(left, top, right, bottom);
++
++    m_scene->setSceneRect(0, 0, width(), height());
++    setMask(m_background->mask());
++}
++
++#include "brightnessosdwidget.moc"
+diff -Nur kdebase-workspace-4.4.1.orig/plasma/generic/applets/battery/brightnessosdwidget.h kdebase-workspace-4.4.1/plasma/generic/applets/battery/brightnessosdwidget.h
+--- kdebase-workspace-4.4.1.orig/plasma/generic/applets/battery/brightnessosdwidget.h	1970-01-01 01:00:00.000000000 +0100
++++ kdebase-workspace-4.4.1/plasma/generic/applets/battery/brightnessosdwidget.h	2010-03-20 19:24:37.000000000 +0100
+@@ -0,0 +1,69 @@
++/*******************************************************************
++* osdwidget.h
++* Copyright  2009    Aurélien Gâteau <[e-mail]>
++* Copyright  2009    Dario Andres Rodriguez <[e-mail]>
++* Copyright  2009    Christian Esken <[e-mail]>
++*
++* 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 the Free Software Foundation; either version 2 of
++* the License, or (at your option) any later version.
++*
++* This program is distributed in the hope that it will be useful,
++* but WITHOUT ANY WARRANTY; without even the implied warranty of
++* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++* GNU General Public License for more details.
++*
++* You should have received a copy of the GNU General Public License
++* along with this program.  If not, see <http://www.gnu.org/licenses/>.
++*
++******************************************************************/
++
++#ifndef BRIGHTNESSOSDWIDGET__H
++#define BRIGHTNESSOSDWIDGET__H
++
++#include <QGraphicsView>
++
++#include <QPixmap>
++
++class QTimer;
++class QGraphicsWidget;
++
++namespace Plasma
++{
++class FrameSvg;
++class Label;
++class Meter;
++}
++
++class BrightnessOSDWidget : public QGraphicsView
++{
++Q_OBJECT
++public:
++    BrightnessOSDWidget(QWidget * parent = 0);
++
++    void setCurrentBrightness(int brightnessLevel);
++    void activateOSD();
++
++    virtual QSize sizeHint() const;
++
++protected:
++    virtual void drawBackground(QPainter *painter, const QRectF &rectF);
++    virtual void resizeEvent(QResizeEvent *);
++
++private:
++    Plasma::FrameSvg *m_background;
++    QGraphicsScene *m_scene;
++    QGraphicsWidget *m_container;
++    Plasma::Label *m_iconLabel;
++    Plasma::Label *m_volumeLabel;
++    Plasma::Meter *m_meter;
++    QTimer *m_hideTimer;
++
++    QPixmap m_brightnessPixmap;
++    /*QPixmap m_volumeHighPixmap;
++    QPixmap m_volumeMediumPixmap;
++    QPixmap m_volumeLowPixmap;*/
++};
++
++#endif
+diff -Nur kdebase-workspace-4.4.1.orig/plasma/generic/applets/battery/CMakeLists.txt kdebase-workspace-4.4.1/plasma/generic/applets/battery/CMakeLists.txt
+--- kdebase-workspace-4.4.1.orig/plasma/generic/applets/battery/CMakeLists.txt	2009-09-16 13:40:55.000000000 +0200
++++ kdebase-workspace-4.4.1/plasma/generic/applets/battery/CMakeLists.txt	2010-03-20 19:27:09.000000000 +0100
+@@ -1,7 +1,8 @@
+ project(plasma-battery)
+ 
+ set(battery_SRCS
+-    battery.cpp)
++    battery.cpp
++    brightnessosdwidget.cpp)
+ 
+ kde4_add_ui_files(battery_SRCS batteryConfig.ui )
+ kde4_add_plugin(plasma_applet_battery ${battery_SRCS})
+diff -Nur kdebase-workspace-4.4.1.orig/powerdevil/daemon/org.kde.PowerDevil.xml kdebase-workspace-4.4.1/powerdevil/daemon/org.kde.PowerDevil.xml
+--- kdebase-workspace-4.4.1.orig/powerdevil/daemon/org.kde.PowerDevil.xml	2009-09-04 13:30:55.000000000 +0200
++++ kdebase-workspace-4.4.1/powerdevil/daemon/org.kde.PowerDevil.xml	2010-03-20 14:26:05.000000000 +0100
 @@ -42,6 +42,10 @@
        <arg type="as" direction="out" />
      </method>
@@ -252,10 +457,9 @@
 +    </signal>
    </interface>
  </node>
-Index: kdebase-workspace-4.3.90/powerdevil/daemon/PowerDevilDaemon.cpp
-===================================================================
---- kdebase-workspace-4.3.90.orig/powerdevil/daemon/PowerDevilDaemon.cpp	2010-01-06 20:08:47.586005621 -0500
-+++ kdebase-workspace-4.3.90/powerdevil/daemon/PowerDevilDaemon.cpp	2010-01-06 20:08:55.682004688 -0500
+diff -Nur kdebase-workspace-4.4.1.orig/powerdevil/daemon/PowerDevilDaemon.cpp kdebase-workspace-4.4.1/powerdevil/daemon/PowerDevilDaemon.cpp
+--- kdebase-workspace-4.4.1.orig/powerdevil/daemon/PowerDevilDaemon.cpp	2009-12-11 00:14:04.000000000 +0100
++++ kdebase-workspace-4.4.1/powerdevil/daemon/PowerDevilDaemon.cpp	2010-03-20 19:43:18.000000000 +0100
 @@ -26,6 +26,8 @@
  
  #include <kdemacros.h>
@@ -319,7 +523,7 @@
  }
  
  PowerDevilDaemon::~PowerDevilDaemon()
-@@ -661,24 +689,40 @@
+@@ -661,24 +689,43 @@
      }
  }
  
@@ -331,6 +535,13 @@
      }
 + 
 +    int currentBrightness = (int) Solid::Control::PowerManager::brightness();
++
++    if (currentBrightness == -1) {
++        return; // we are not able to determine the brightness level
++    }
+ 
+-    int currentBrightness = qMax(0, (int)(Solid::Control::PowerManager::brightness() - 10));
+-    Solid::Control::PowerManager::setBrightness(currentBrightness);
 +    if ((currentBrightness == d->cachedBrightness) && !d->brightnessInHardware)
 +    {
 +        int newBrightness;
@@ -340,16 +551,12 @@
 +        else {
 +            newBrightness = qMax(0, currentBrightness - 10);
 +        }
- 
--    int currentBrightness = qMax(0, (int)(Solid::Control::PowerManager::brightness() - 10));
--    Solid::Control::PowerManager::setBrightness(currentBrightness);
++
 +        Solid::Control::PowerManager::setBrightness(newBrightness);
 +        currentBrightness = (int) Solid::Control::PowerManager::brightness();
 +    }
 +
-+    if (!d->brightnessInHardware) {
-+        emitBrightnessChanged(currentBrightness, true);
-+    }
++    emitBrightnessChanged(currentBrightness, true);
  }
  
 -void PowerDevilDaemon::increaseBrightness()
@@ -369,7 +576,7 @@
  }
  
  void PowerDevilDaemon::shutdownNotification(bool automated)
-@@ -1463,4 +1507,17 @@
+@@ -1463,4 +1510,17 @@
                                           SLOT(refreshStatus()));
  }
  
@@ -387,10 +594,9 @@
 +}
 +
  #include "PowerDevilDaemon.moc"
-Index: kdebase-workspace-4.3.90/powerdevil/daemon/PowerDevilDaemon.h
-===================================================================
---- kdebase-workspace-4.3.90.orig/powerdevil/daemon/PowerDevilDaemon.h	2010-01-06 20:08:47.426005056 -0500
-+++ kdebase-workspace-4.3.90/powerdevil/daemon/PowerDevilDaemon.h	2010-01-06 20:08:55.682004688 -0500
+diff -Nur kdebase-workspace-4.4.1.orig/powerdevil/daemon/PowerDevilDaemon.h kdebase-workspace-4.4.1/powerdevil/daemon/PowerDevilDaemon.h
+--- kdebase-workspace-4.4.1.orig/powerdevil/daemon/PowerDevilDaemon.h	2009-12-01 01:30:27.000000000 +0100
++++ kdebase-workspace-4.4.1/powerdevil/daemon/PowerDevilDaemon.h	2010-03-20 14:26:05.000000000 +0100
 @@ -61,10 +61,13 @@
  
      SuspensionLockHandler *lockHandler();