← Back to team overview

ayatana-commits team mailing list archive

[Branch ~agateau/plasma-widget-message-indicator/trunk] Rev 138: clean ups

 

------------------------------------------------------------
revno: 138
committer: Aurelien Gateau <aurelien.gateau@xxxxxxxxxxxxx>
branch nick: plasma-widget-message-indicator
timestamp: Mon 2010-10-18 22:13:21 +0200
message:
  clean ups
modified:
  src/message-indicator.cpp


--
lp:plasma-widget-message-indicator
https://code.launchpad.net/~agateau/plasma-widget-message-indicator/trunk

Your team ayatana-commits is subscribed to branch lp:plasma-widget-message-indicator.
To unsubscribe from this branch go to https://code.launchpad.net/~agateau/plasma-widget-message-indicator/trunk/+edit-subscription
=== modified file 'src/message-indicator.cpp'
--- src/message-indicator.cpp	2010-08-28 13:38:13 +0000
+++ src/message-indicator.cpp	2010-10-18 20:13:21 +0000
@@ -67,9 +67,6 @@
 
     mSvg->setImagePath("icons/message-indicator");
     mSvg->setContainsMultipleImages(true);
-
-    setWidget(mStack);
-    updateStatus();
 }
 
 MessageIndicator::~MessageIndicator()
@@ -79,6 +76,9 @@
 
 void MessageIndicator::init()
 {
+    Plasma::Applet::init();
+    setWidget(mStack);
+
     Plasma::ToolTipManager::self()->registerWidget(this);
     connect(mListener,
             SIGNAL(serverAdded(QIndicate::Listener::Server*, const QString&)),
@@ -88,6 +88,8 @@
     initSourceModel();
     initView();
     initIcon();
+
+    updateStatus();
 }
 
 void MessageIndicator::initIcon()
@@ -101,7 +103,7 @@
     updateStatus();
 }
 
-bool MessageIndicator::sceneEventFilter(QGraphicsItem*, QEvent* event)
+bool MessageIndicator::sceneEventFilter(QGraphicsItem* item, QEvent* event)
 {
     if (event->type() == QEvent::GraphicsSceneMousePress) {
         return true;
@@ -118,7 +120,7 @@
         }
         return true;
     }
-    return false;
+    return Plasma::PopupApplet::sceneEventFilter(item, event);
 }
 
 void MessageIndicator::initSourceModel()