Merge lp:~mterry/indicator-network/greeter-profiles into lp:indicator-network/14.10

[Michael Terry]

Add back support for phone_greeter and desktop_greeter.

Add back support for phone_greeter and desktop_greeter.

During the c++ rewrite, these two profiles were made empty. Before the rewrite, desktop_greeter didn't actually exist and phone_greeter was just a copy of phone.

So I've added phone_greeter back as a copy of phone. And added desktop_greeter as a copy of desktop.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:334
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/136/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-armhf-ci/10
        deb: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-armhf-ci/10/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-network-ci/136/rebuild

review: Approve (continuous-integration)

[Ted Gould (ted)]

On Fri, 2014-05-16 at 19:42 +0000, Michael Terry wrote:

> So I've added phone_greeter back as a copy of phone. And added
> desktop_greeter as a copy of desktop.

If they're copies it would probably be better to just make the config
file point to the same dbus path rather than duplicate them in the C++
code.

[Antti Kaijanmäki (kaijanmaki)]

Thanks, Michael!

We can now just add them as "duplicated" in the code, but there will be profile customization coming real soon.

Just make sure that in the greeter code you actually read the proper paths from

/usr/share/unity/indicators/com.canonical.indicator.network

review: Approve

=== modified file 'network/service.h'
--- network/service.h	2014-05-12 11:36:59 +0000
+++ network/service.h	2014-05-16 19:41:50 +0000
@@ -108,15 +108,21 @@
 
         m_quickAccessSection = std::make_shared<QuickAccessSection>(m_manager);;
         m_desktopMenu->addSection(m_quickAccessSection);
+        m_desktopGreeterMenu->addSection(m_quickAccessSection);
         m_phoneMenu->addSection(m_quickAccessSection);
+        m_phoneGreeterMenu->addSection(m_quickAccessSection);
 
         m_wifiSection = std::make_shared<WifiSection>(m_manager);
         m_desktopMenu->addSection(m_wifiSection);
+        m_desktopGreeterMenu->addSection(m_wifiSection);
         m_phoneMenu->addSection(m_wifiSection);
+        m_phoneGreeterMenu->addSection(m_wifiSection);
 
         m_wwanSection = std::make_shared<WwanSection>(m_modemManager);
         m_desktopMenu->addSection(m_wwanSection);
+        m_desktopGreeterMenu->addSection(m_wwanSection);
         m_phoneMenu->addSection(m_wwanSection);
+        m_phoneGreeterMenu->addSection(m_wwanSection);
 
         m_desktopMenuExporter.reset(new MenuExporter(m_sessionBus, "/com/canonical/indicator/network/desktop", m_desktopMenu->menu()));
         m_desktopGreeterMenuExporter.reset(new MenuExporter(m_sessionBus, "/com/canonical/indicator/network/desktop_greeter", m_desktopGreeterMenu->menu()));
@@ -135,7 +141,9 @@
         // we have a single actiongroup for all the menus.
         m_actionGroupMerger.reset(new ActionGroupMerger());
         m_actionGroupMerger->add(m_desktopMenu->actionGroup());
+        m_actionGroupMerger->add(m_desktopGreeterMenu->actionGroup());
         m_actionGroupMerger->add(m_phoneMenu->actionGroup());
+        m_actionGroupMerger->add(m_phoneGreeterMenu->actionGroup());
         m_actionGroupExporter.reset(new ActionGroupExporter(m_sessionBus, m_actionGroupMerger->actionGroup(),
                                                             "/com/canonical/indicator/network",
                                                             "indicator"));