Merge with trunk

[sojka/lightdm.git] / src / mir-session.c

diff --git a/src/mir-session.c b/src/mir-session.c
index b0b2f279fb0a8ebff750452a1d1c5255d5b85a91..79d87345bc8af7fb6621516f43abb9acaf56095a 100644 (file)
--- a/src/mir-session.c
+++ b/src/mir-session.c
@@ -25,16 +25,6 @@ mir_session_new (void)
     return session;
 }
 
-static void
-mir_session_set_display_server (Session *session, DisplayServer *display_server)
-{
-    MirServer *mir_server;
-
-    mir_server = MIR_SERVER (display_server);
-
-    SESSION_CLASS (mir_session_parent_class)->set_display_server (session, display_server);
-}
-
 static void
 mir_session_init (MirSession *session)
 {
@@ -43,7 +33,4 @@ mir_session_init (MirSession *session)
 static void
 mir_session_class_init (MirSessionClass *klass)
 {
-    SessionClass *session_class = SESSION_CLASS (klass);
-
-    session_class->set_display_server = mir_session_set_display_server;
 }