← Back to branch summary

~indicator-applet-developers/indicator-network/trunk.14.10

« back to all changes in this revision

Viewing changes to src/menumodel-cpp/action-group-exporter.h

  • Committer: CI bot
  • Author(s): Antti Kaijanmäki
  • Date: 2014-10-07 17:33:46 UTC
  • mfrom: (428.1.5 wifi-krillin)
  • Revision ID: ps-jenkins@lists.canonical.com-20141007173346-zmvkhvbx62y3ebfh
Fix wifi toggle on krillin. Fixes: 1368523, 1371313, 1371320
Approved by: Charles Kerr, PS Jenkins bot

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/menumodel-cpp/action-group-exporter.h
63
63
            return;
64
64
        }
65
65
 
 
66
 
 
67
        auto group = m_gSimpleActionGroup;
66
68
        GMainLoopDispatch([=](){
67
69
            for (auto action : actionGroup->actions()) {
68
 
                g_action_map_add_action(G_ACTION_MAP(m_gSimpleActionGroup.get()), action->gaction().get());
 
70
                g_action_map_add_action(G_ACTION_MAP(group.get()), action->gaction().get());
69
71
            }
70
72
        });
71
 
        actionGroup->actionAdded().connect([this](Action::Ptr action){
 
73
        actionGroup->actionAdded().connect([=](Action::Ptr action){
72
74
            GMainLoopDispatch([=](){
73
 
                g_action_map_add_action(G_ACTION_MAP(m_gSimpleActionGroup.get()), action->gaction().get());
 
75
                g_action_map_add_action(G_ACTION_MAP(group.get()), action->gaction().get());
74
76
            });
75
77
        });
76
 
        actionGroup->actionRemoved().connect([this](Action::Ptr action){
 
78
        actionGroup->actionRemoved().connect([=](Action::Ptr action){
77
79
            GMainLoopDispatch([=](){
78
 
                g_action_map_remove_action(G_ACTION_MAP(m_gSimpleActionGroup.get()),
 
80
                g_action_map_remove_action(G_ACTION_MAP(group.get()),
79
81
                                           action->name().c_str());
80
82
            });
81
83
        });