Merge lp:~unity-api-team/indicator-network/modem-switch-depends-on-having-modem into lp:indicator-network

[Pete Woods]

Only include the mobile data switch when we have modems

Only include the mobile data switch when we have modems

=== modified file 'src/indicator/sections/wwan-section.cpp'
--- src/indicator/sections/wwan-section.cpp	2016-05-05 14:15:23 +0000
+++ src/indicator/sections/wwan-section.cpp	2016-07-05 10:49:44 +0000
@@ -92,7 +92,6 @@
     m_menuMerger->append(m_linkMenuMerger);
     m_menuMerger->append(m_bottomMenu);
 
-    m_upperMenu->append(m_mobileDataSwitch->menuItem());
     m_actionGroupMerger->add(m_mobileDataSwitch->actionGroup());
 
     // have the modem list in their own section.
@@ -154,9 +153,17 @@
     if (modems.size() == 0)
     {
         m_bottomMenu->clear();
+        m_upperMenu->clear();
     }
     else
     {
+        // Check if the switch is already present
+        if (m_upperMenu->find(m_mobileDataSwitch->menuItem()) == m_upperMenu->end())
+        {
+            // If not, add it
+            m_upperMenu->insert(m_mobileDataSwitch->menuItem(), m_upperMenu->begin());
+        }
+
         // Add the hotspot button if we have configuration stored
         if (m_manager->hotspotStored())
         {