← Back to branch summary

~ci-train-bot/ubuntu-app-launch/ubuntu-app-launch-ubuntu-zesty-2264

« back to all changes in this revision

Viewing changes to libubuntu-app-launch/application-impl-legacy.cpp

  • Committer: Ted Gould
  • Date: 2017-04-04 05:29:16 UTC
  • mfrom: (307.1.20 registry-cleanup)
  • mto: This revision was merged to the branch mainline in revision 314.
  • Revision ID: ted@gould.cx-20170404052916-sy1fq5qzfrau6o53
Merge registry cleanup changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
libubuntu-app-launch/application-impl-legacy.cpp
135
135
 
136
136
std::vector<std::shared_ptr<Application::Instance>> Legacy::instances()
137
137
{
138
 
    auto vbase = registry_->jobs->instances(appId(), "application-legacy");
 
138
    auto vbase = registry_->jobs()->instances(appId(), "application-legacy");
139
139
    return std::vector<std::shared_ptr<Application::Instance>>(vbase.begin(), vbase.end());
140
140
}
141
141
 
222
222
    std::function<std::list<std::pair<std::string, std::string>>(void)> envfunc = [this, instance]() {
223
223
        return launchEnv(instance);
224
224
    };
225
 
    return registry_->jobs->launch(appId(), "application-legacy", instance, urls, jobs::manager::launchMode::STANDARD,
226
 
                                   envfunc);
 
225
    return registry_->jobs()->launch(appId(), "application-legacy", instance, urls, jobs::manager::launchMode::STANDARD,
 
226
                                     envfunc);
227
227
}
228
228
 
229
229
/** Create an UpstartInstance for this AppID using the UpstartInstance launch
237
237
    std::function<std::list<std::pair<std::string, std::string>>(void)> envfunc = [this, instance]() {
238
238
        return launchEnv(instance);
239
239
    };
240
 
    return registry_->jobs->launch(appId(), "application-legacy", instance, urls, jobs::manager::launchMode::TEST,
241
 
                                   envfunc);
 
240
    return registry_->jobs()->launch(appId(), "application-legacy", instance, urls, jobs::manager::launchMode::TEST,
 
241
                                     envfunc);
242
242
}
243
243
 
244
244
std::shared_ptr<Application::Instance> Legacy::findInstance(const std::string& instanceid)
245
245
{
246
 
    return registry_->jobs->existing(appId(), "application-legacy", instanceid, std::vector<Application::URL>{});
 
246
    return registry_->jobs()->existing(appId(), "application-legacy", instanceid, std::vector<Application::URL>{});
247
247
}
248
248
 
249
249
}  // namespace app_impls