~debfx/kdebase-workspace/ubuntu : contents of debian/patches/kubuntu_101_brightness_fn_keys_and

~debfx/kdebase-workspace/ubuntu : (revision 299)
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>
 #include <kglobal.h>
+#include <QDBusInterface>
+#include <QDBusPendingCall>
 #include <QX11Info>
 
 K_GLOBAL_STATIC(Solid::Control::PowerManagerPrivate, globalPowerManager)
@@ -160,7 +162,8 @@
 #ifdef Q_WS_WIN
             return false;
 #else
-            return ( xrandr_brightlight( QX11Info::display(), brightness ) >= 0 );
+            if ( xrandr_brightlight( QX11Info::display(), brightness ) < 0 )
+                return false;
 #endif
         }
         else
@@ -170,8 +173,12 @@
                 SOLID_CALL(Ifaces::PowerManager *, globalPowerManager->managerBackend(), setBrightness(brightness, device));
             }
             //TODO - This should be done better, it will return true even if one of the calls returns false. SOLID_CALL does not allow us to get the return value.
-            return true;
         }
+
+        QDBusInterface iface("org.kde.kded", "/modules/powerdevil", "org.kde.PowerDevil", QDBusConnection::sessionBus());
+        if (iface.isValid())
+            iface.asyncCall("notifyOfBrightnessChange", (int) Solid::Control::PowerManager::brightness());
+        return true;
     }
     else
     {
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 <QPropertyAnimation>
 
+#include <KApplication>
 #include <KDebug>
 #include <KIcon>
 #include <KSharedConfig>
@@ -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_brightnessOSD;
 }
 
 void Battery::suspend()
@@ -335,13 +340,17 @@
 
 void Battery::brightnessChanged(const int brightness)
 {
-    Solid::Control::PowerManager::setBrightness(brightness);
+    if (!m_ignoreBrightnessChange) {
+        Solid::Control::PowerManager::setBrightness(brightness);
+    }
 }
 
-void Battery::updateSlider(const float brightness)
+void Battery::updateSlider(int brightness)
 {
-    if (m_brightnessSlider->value() != (int)brightness) {
-        m_brightnessSlider->setValue((int) brightness);
+    if (m_brightnessSlider->value() != brightness) {
+        m_ignoreBrightnessChange = true;
+        m_brightnessSlider->setValue(brightness);
+        m_ignoreBrightnessChange = false;
     }
 }
 
@@ -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;
 
         m_controls = new QGraphicsWidget(item);
         m_controls->setMinimumWidth(360);
@@ -428,16 +438,12 @@
 
         m_brightnessSlider = new Plasma::Slider(m_controls);
         m_brightnessSlider->setRange(0, 100);
-        m_brightnessSlider->setValue(Solid::Control::PowerManager::brightness());
+        updateSlider(Solid::Control::PowerManager::brightness());
         m_brightnessSlider->nativeWidget()->setTickInterval(10);
         m_brightnessSlider->setOrientation(Qt::Horizontal);
         connect(m_brightnessSlider, SIGNAL(valueChanged(int)),
                 this, SLOT(brightnessChanged(int)));
 
-        Solid::Control::PowerManager::Notifier *notifier = Solid::Control::PowerManager::notifier();
-
-        connect(notifier, SIGNAL(brightnessChanged(float)),
-                this, SLOT(updateSlider(float)));
         m_controlsLayout->addItem(m_brightnessSlider, row, 1);
         row++;
 
@@ -528,6 +534,10 @@
         item->setTitle(i18n("Power Management"));
 
         setupFonts();
+
+        m_brightnessOSD = new BrightnessOSDWidget();
+        QDBusConnection::sessionBus().connect("org.kde.kded", "/modules/powerdevil", "org.kde.PowerDevil",
+                                              "brightnessChanged", this, SLOT(showBrightnessOSD(int,bool)));
     }
 }
 
@@ -652,7 +662,7 @@
     }
 
     if (m_brightnessSlider) {
-        m_brightnessSlider->setValue(Solid::Control::PowerManager::brightness());
+        updateSlider(Solid::Control::PowerManager::brightness());
     }
 }
 
@@ -990,4 +1000,24 @@
     return m_acAlpha;
 }
 
+void Battery::showBrightnessOSD(int brightness, bool byFnKey)
+{
+    if (byFnKey) {
+        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);
+        }
+    }
+}
+
 #include "battery.moc"
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 BrightnessOSDWidget;
+
 class Battery : public Plasma::PopupApplet
 {
     Q_OBJECT
@@ -83,7 +85,7 @@
         void sourceAdded(const QString &source);
         void sourceRemoved(const QString &source);
         void brightnessChanged(const int brightness);
-        void updateSlider(const float brightness);
+        void updateSlider(int brightness);
         void setFullBrightness();
         void openConfig();
         void setProfile(const QString &profile);
@@ -91,6 +93,7 @@
         void hibernate();
         void updateBattery();
         void setupFonts();
+        void showBrightnessOSD(int brightness, bool byFnKey);
 
     private:
         void connectSources();
@@ -172,6 +175,9 @@
         QPropertyAnimation *m_labelAnimation;
         qreal m_acAlpha;
         QPropertyAnimation *m_acAnimation;
+
+        bool m_ignoreBrightnessChange;
+        BrightnessOSDWidget* m_brightnessOSD;
 };
 
 K_EXPORT_PLASMA_APPLET(battery, Battery)
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 <agateau@kde.org>
+* Copyright  2009    Dario Andres Rodriguez <andresbajotierra@gmail.com>
+* Copyright  2009    Christian Esken <christian.esken@arcor.de>   
+*
+* 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 <agateau@kde.org>
+* Copyright  2009    Dario Andres Rodriguez <andresbajotierra@gmail.com>
+* Copyright  2009    Christian Esken <christian.esken@arcor.de>
+*
+* 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>
     
+    <method name="notifyOfBrightnessChange">
+      <arg type="i" direction="in" />
+    </method>
+    
     <signal name="lidClosed">
       <arg type="i" direction="out" />
       <arg type="s" direction="out" />
@@ -56,5 +60,9 @@
     </signal>
      <signal name="DPMSconfigUpdated">
     </signal>
+    <signal name="brightnessChanged">
+      <arg type="i" direction="out" />
+      <arg type="b" direction="out" />
+    </signal>
   </interface>
 </node>
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>
 #include <KAboutData>
+#include <KAction>
+#include <KActionCollection>
 #include <KPluginFactory>
 #include <KNotification>
 #include <KIcon>
@@ -93,6 +95,7 @@
             : notifier(Solid::Control::PowerManager::notifier())
             , currentConfig(0)
             , status(PowerDevilDaemon::NoAction)
+            , brightnessInHardware(false)
             , ckSessionInterface(0) {}
 
     Solid::Control::PowerManager::Notifier *notifier;
@@ -119,6 +122,8 @@
 
     int batteryPercent;
     int brightness;
+    int cachedBrightness;
+    bool brightnessInHardware;
     bool isPlugged;
 
     // ConsoleKit stuff
@@ -174,6 +179,18 @@
     d->ksmServerIface = new OrgKdeKSMServerInterfaceInterface("org.kde.ksmserver", "/KSMServer",
                                                               QDBusConnection::sessionBus(), this);
 
+    QDBusInterface halManager("org.freedesktop.Hal",
+            "/org/freedesktop/Hal/Manager", "org.freedesktop.Hal.Manager",
+            QDBusConnection::systemBus());
+    QStringList panelDevices = halManager.call("FindDeviceByCapability",
+             "laptop_panel").arguments().at(0).toStringList();
+    if (!panelDevices.empty()) {
+        QDBusInterface deviceInterface("org.freedesktop.Hal", panelDevices.at(0), "org.freedesktop.Hal.Device",
+                QDBusConnection::systemBus());
+        d->brightnessInHardware = deviceInterface.call("GetPropertyBoolean",
+                "laptop_panel.brightness_in_hardware").arguments().at(0).toBool();
+    }
+
     /*  Not needed anymore; I am not sure if we will need that in a future, so I leave it here
      *  just in case.
      *
@@ -198,6 +215,17 @@
     QDBusConnection::sessionBus().registerService("org.kde.powerdevil");
     // All systems up Houston, let's go!
     refreshStatus();
+
+    d->cachedBrightness = (int) Solid::Control::PowerManager::brightness();
+    KActionCollection* actionCollection = new KActionCollection( this );
+
+    KAction* globalAction = static_cast< KAction* >( actionCollection->addAction( "Increase Screen Brightness" ));
+    globalAction->setGlobalShortcut(KShortcut(Qt::Key_MonBrightnessUp));
+    connect(globalAction, SIGNAL(triggered(bool)), SLOT(increaseBrightness()));
+
+    globalAction = static_cast< KAction* >( actionCollection->addAction( "Decrease Screen Brightness" ));
+    globalAction->setGlobalShortcut(KShortcut(Qt::Key_MonBrightnessDown));
+    connect(globalAction, SIGNAL(triggered(bool)), SLOT(decreaseBrightness()));
 }
 
 PowerDevilDaemon::~PowerDevilDaemon()
@@ -661,24 +689,43 @@
     }
 }
 
-void PowerDevilDaemon::decreaseBrightness()
+void PowerDevilDaemon::incDecBrightness(bool increase)
 {
     if (!checkIfCurrentSessionActive()) {
         return;
     }
+ 
+    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;
+        if (increase) {
+            newBrightness = qMin(100, currentBrightness + 10);
+        }
+        else {
+            newBrightness = qMax(0, currentBrightness - 10);
+        }
+
+        Solid::Control::PowerManager::setBrightness(newBrightness);
+        currentBrightness = (int) Solid::Control::PowerManager::brightness();
+    }
+
+    emitBrightnessChanged(currentBrightness, true);
 }
 
-void PowerDevilDaemon::increaseBrightness()
+void PowerDevilDaemon::decreaseBrightness()
 {
-    if (!checkIfCurrentSessionActive()) {
-        return;
-    }
+    incDecBrightness(false);
+}
 
-    int currentBrightness = qMin(100, (int)(Solid::Control::PowerManager::brightness() + 10));
-    Solid::Control::PowerManager::setBrightness(currentBrightness);
+void PowerDevilDaemon::increaseBrightness()
+{
+    incDecBrightness(true);
 }
 
 void PowerDevilDaemon::shutdownNotification(bool automated)
@@ -1463,4 +1510,17 @@
                                          SLOT(refreshStatus()));
 }
 
+void PowerDevilDaemon::notifyOfBrightnessChange(int brightness)
+{
+    emitBrightnessChanged(brightness, false);
+}
+
+void PowerDevilDaemon::emitBrightnessChanged(int brightness, bool byFnKey)
+{
+    if ((d->cachedBrightness != brightness) || byFnKey) {
+        d->cachedBrightness = brightness;
+        emit brightnessChanged(brightness, byFnKey);
+    }
+}
+
 #include "PowerDevilDaemon.moc"
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();
 
+    void notifyOfBrightnessChange(int brightness);
+
 private Q_SLOTS:
     void acAdapterStateChanged(int state, bool forced = false);
     void batteryChargePercentChanged(int percent, const QString &udi);
 
+    void incDecBrightness(bool increase);
     void decreaseBrightness();
     void increaseBrightness();
 
@@ -106,6 +109,7 @@
     void stateChanged(int, bool);
     void profileChanged(const QString &, const QStringList &);
     void DPMSconfigUpdated();
+    void brightnessChanged(int brightness, bool byFnKey);
 
 private:
     void lockScreen();
@@ -127,6 +131,8 @@
 
     bool checkIfCurrentSessionActive();
 
+    void emitBrightnessChanged(int brightness, bool byFnKey);
+
 public:
     enum IdleAction {
         None = 0,