Fixes: NB#283768 - Media Sharing status menu item should be loaded to…

… status menu. Bug: NB#283768 - Media Sharing status menu item should be loaded to status menu. RevBy: TrustMe
sledges · Oct 4, 2011 · 0aa502e · 0aa502e
1 parent 2ce9590
commit 0aa502e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,6 +1,7 @@
 system-ui (1.2.6~1) unstable; urgency=low
 
   * [UNRELEASED]
+  * Fixes: NB#283768 - Media Sharing status menu item should be loaded to status menu.
 
  -- Vesa Halttunen <[email protected]>  Mon, 03 Oct 2011 16:06:22 +0300
 

diff --git a/src/systemui/statusindicatormenu/statusindicatormenuverticalview.cpp b/src/systemui/statusindicatormenu/statusindicatormenuverticalview.cpp
@@ -40,12 +40,13 @@ StatusIndicatorMenuVerticalView::StatusIndicatorMenuVerticalView(StatusIndicator
     connect(extensionArea, SIGNAL(extensionInstantiated(MApplicationExtensionInterface*)), controller, SLOT(setStatusIndicatorMenuInterface(MApplicationExtensionInterface*)));
     connect(extensionArea, SIGNAL(extensionInstantiated(MApplicationExtensionInterface*)), this, SLOT(setExtensionLayoutPosition(MApplicationExtensionInterface*)));
     extensionArea->setObjectName("StatusIndicatorMenuExtensionArea");
-    extensionArea->setInProcessFilter(QRegExp("/statusindicatormenu-(volume|call|internetconnection|bluetooth|presence|transfer).desktop$"));
+    extensionArea->setInProcessFilter(QRegExp("/statusindicatormenu-(volume|call|internetconnection|bluetooth|dlna|presence|transfer).desktop$"));
     extensionArea->setOutOfProcessFilter(QRegExp("$^"));
     extensionArea->setOrder((QStringList() << "statusindicatormenu-volume.desktop"
                              << "statusindicatormenu-call.desktop"
                              << "statusindicatormenu-internetconnection.desktop"
                              << "statusindicatormenu-bluetooth.desktop"
+                             << "statusindicatormenu-dlna.desktop"
                              << "statusindicatormenu-presence.desktop"
                              << "statusindicatormenu-transfer.desktop"));
     extensionArea->init();

diff --git a/tests/ut_statusindicatormenuverticalview/ut_statusindicatormenuverticalview.cpp b/tests/ut_statusindicatormenuverticalview/ut_statusindicatormenuverticalview.cpp
@@ -212,12 +212,13 @@ void Ut_StatusIndicatorMenuVerticalView::testExtensionAreaInitialization()
 {
     QCOMPARE(mApplicationExtensionAreaInterface, QString("com.meego.core.MStatusIndicatorMenuExtensionInterface/1.0"));
     QCOMPARE(mApplicationExtensionAreaInProcessFilterDuringInit,
-             QRegExp("/statusindicatormenu-(volume|call|internetconnection|bluetooth|presence|transfer).desktop$"));
+             QRegExp("/statusindicatormenu-(volume|call|internetconnection|bluetooth|dlna|presence|transfer).desktop$"));
     QCOMPARE(mApplicationExtensionAreaOutOfProcessFilterDuringInit, QRegExp("$^"));
     QCOMPARE(mApplicationExtensionAreaOrderDuringInit, (QStringList() << "statusindicatormenu-volume.desktop"
                              << "statusindicatormenu-call.desktop"
                              << "statusindicatormenu-internetconnection.desktop"
                              << "statusindicatormenu-bluetooth.desktop"
+                             << "statusindicatormenu-dlna.desktop"
                              << "statusindicatormenu-presence.desktop"
                              << "statusindicatormenu-transfer.desktop"));
 }