Sophie

Sophie

distrib > Fedora > 16 > i386 > by-pkgid > 75624462519d2dee21813e9401ac8229 > files > 31

kdebase-workspace-4.7.4-9.fc16.src.rpm

diff --git a/plasma/generic/applets/systemtray/core/task.cpp b/plasma/generic/applets/systemtray/core/task.cpp
index 1df51c9..1a02c24 100644
--- a/plasma/generic/applets/systemtray/core/task.cpp
+++ b/plasma/generic/applets/systemtray/core/task.cpp
@@ -22,7 +22,7 @@
 #include "task.h"
 
 #include <QtGui/QGraphicsWidget>
-#include "../ui/applet.h"
+
 
 namespace SystemTray
 {
@@ -85,13 +85,13 @@ QGraphicsWidget *Task::widget(Plasma::Applet *host, bool createIfNecessary)
     return widget;
 }
 
-bool Task::isEmbeddable(SystemTray::Applet *host)
+bool Task::isEmbeddable(Plasma::Applet *host)
 {
     if (!host) {
         return false;
     }
 
-    return (d->widgetsByHost.value(host) || isEmbeddable()) && host->shownCategories().contains(category());
+    return d->widgetsByHost.value(host) || isEmbeddable();
 }
 
 QHash<Plasma::Applet *, QGraphicsWidget *> Task::widgetsByHost() const
diff --git a/plasma/generic/applets/systemtray/core/task.h b/plasma/generic/applets/systemtray/core/task.h
index ae4324d..cdf2ba9 100644
--- a/plasma/generic/applets/systemtray/core/task.h
+++ b/plasma/generic/applets/systemtray/core/task.h
@@ -36,8 +36,6 @@ namespace Plasma
 namespace SystemTray
 {
 
-    class Applet;
-
 /**
  * @short System tray task base class
  *
@@ -89,7 +87,7 @@ public:
      * @return whether this task is embeddable; true if there is already a widget
      * for this host.
      */
-    bool isEmbeddable(SystemTray::Applet *host);
+    bool isEmbeddable(Plasma::Applet *host);
 
     /**
      * Returns whether this task can be embeddable