← Back to branch summary

~mir-team/mir/development-branch

« back to all changes in this revision

Viewing changes to src/server/shell/frontend_shell.cpp

  • Committer: Tarmac
  • Author(s): Brandon Schaefer, Cemil Azizoglu
  • Date: 2017-01-11 23:07:26 UTC
  • mfrom: (3914.2.33 mir-dev)
  • Revision ID: tarmac-20170111230726-u1njfahgffiigoqv
Accumulation of the chain of MPs for surface renaming...
.

Approved by Brandon Schaefer, mir-ci-bot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/server/shell/frontend_shell.cpp
83
83
    //       in the surface spec requirements (eg: regular surface has no parent,
84
84
    //       dialog may have a parent, gloss must have a parent).
85
85
    if (populated_params.parent.lock() &&
86
 
        populated_params.type.value() != mir_surface_type_inputmethod)
 
86
        populated_params.type.value() != mir_window_type_inputmethod)
87
87
    {
88
 
        BOOST_THROW_EXCEPTION(std::invalid_argument("Foreign parents may only be set on surfaces of type mir_surface_type_inputmethod"));
 
88
        BOOST_THROW_EXCEPTION(std::invalid_argument("Foreign parents may only be set on surfaces of type mir_window_type_inputmethod"));
89
89
    }
90
90
 
91
91
    if (populated_params.parent_id.is_set())
130
130
int msh::FrontendShell::set_surface_attribute(
131
131
    std::shared_ptr<mf::Session> const& session,
132
132
    mf::SurfaceId surface_id,
133
 
    MirSurfaceAttrib attrib,
 
133
    MirWindowAttrib attrib,
134
134
    int value)
135
135
{
136
136
    auto const scene_session = std::dynamic_pointer_cast<ms::Session>(session);
141
141
int msh::FrontendShell::get_surface_attribute(
142
142
    std::shared_ptr<mf::Session> const& session,
143
143
    mf::SurfaceId surface_id,
144
 
    MirSurfaceAttrib attrib)
 
144
    MirWindowAttrib attrib)
145
145
{
146
146
    auto const scene_session = std::dynamic_pointer_cast<ms::Session>(session);
147
147
    auto const surface = scene_session->surface(surface_id);