~ci-train-bot/lightdm/lightdm-ubuntu-zesty-1679

« back to all changes in this revision

Viewing changes to src/seat-xlocal.c

  • Committer: Robert Ancell
  • Date: 2016-05-19 02:01:57 UTC
  • mto: This revision was merged to the branch mainline in revision 2312.
  • Revision ID: robert.ancell@canonical.com-20160519020157-1ihm9jmknpgc66k2
Refactor GreeterSession and Greeter into separate modules. This is to allow in-session greeters in the future.

Show diffs side-by-side

added added

removed removed

Lines of Context:
290
290
    }
291
291
}
292
292
 
293
 
static Greeter *
 
293
static GreeterSession *
294
294
seat_xlocal_create_greeter_session (Seat *seat)
295
295
{
296
 
    Greeter *greeter_session;
 
296
    GreeterSession *greeter_session;
297
297
 
298
298
    greeter_session = SEAT_CLASS (seat_xlocal_parent_class)->create_greeter_session (seat);
299
299
    session_set_env (SESSION (greeter_session), "XDG_SEAT", seat_get_name (seat));
324
324
        vt_set_active (vt);
325
325
 
326
326
    if (IS_UNITY_SYSTEM_COMPOSITOR (display_server))
327
 
        unity_system_compositor_set_active_session (UNITY_SYSTEM_COMPOSITOR (display_server), IS_GREETER (session) ? "greeter-0" : "session-0");
 
327
        unity_system_compositor_set_active_session (UNITY_SYSTEM_COMPOSITOR (display_server), IS_GREETER_SESSION (session) ? "greeter-0" : "session-0");
328
328
 
329
329
    SEAT_CLASS (seat_xlocal_parent_class)->set_active_session (seat, session);
330
330
}