← Back to branch summary

~robert-ancell/lightdm/private-mir-connection-merge

« back to all changes in this revision

Viewing changes to src/mir-session.c

  • Committer: Robert Ancell
  • Date: 2013-07-23 02:24:45 UTC
  • mfrom: (1723 trunk)
  • mto: This revision was merged to the branch mainline in revision 1741.
  • Revision ID: robert.ancell@canonical.com-20130723022445-gpaq8vtkp4hods7r
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mir-session.c
26
26
}
27
27
 
28
28
static void
29
 
mir_session_set_display_server (Session *session, DisplayServer *display_server)
30
 
{
31
 
    MirServer *mir_server;
32
 
 
33
 
    mir_server = MIR_SERVER (display_server);
34
 
 
35
 
    SESSION_CLASS (mir_session_parent_class)->set_display_server (session, display_server);
36
 
}
37
 
 
38
 
static void
39
29
mir_session_init (MirSession *session)
40
30
{
41
31
}
43
33
static void
44
34
mir_session_class_init (MirSessionClass *klass)
45
35
{
46
 
    SessionClass *session_class = SESSION_CLASS (klass);
47
 
 
48
 
    session_class->set_display_server = mir_session_set_display_server;
49
36
}