← Back to team overview

ubuntu-multiseat team mailing list archive

[Merge] lp:~ubuntu-multiseat/lightdm/seatunity-call-parent into lp:lightdm

 

a7x has proposed merging lp:~ubuntu-multiseat/lightdm/seatunity-call-parent into lp:lightdm.

Requested reviews:
  Robert Ancell (robert-ancell)

For more details, see:
https://code.launchpad.net/~ubuntu-multiseat/lightdm/seatunity-call-parent/+merge/180235

This change fixes SeatUnity to extend its parent class's create_session() and create_greeter_session() functions rather than override them.

This merge proposal is the same as the last proposal except:
  * commits have been rebased onto latest lp:lightdm
  * unwrapped long line based on review feedback
  * new branch location
    (lp:~ubuntu-multiseat/lightdm/seatunity-call-parent instead of
    lp:~a7x/lightdm/seatunity-call-parent)

-- 
https://code.launchpad.net/~ubuntu-multiseat/lightdm/seatunity-call-parent/+merge/180235
Your team Ubuntu Multiseat is subscribed to branch lp:~ubuntu-multiseat/lightdm/seatunity-call-parent.
=== modified file 'src/seat-unity.c'
--- src/seat-unity.c	2013-07-30 13:28:38 +0000
+++ src/seat-unity.c	2013-08-14 20:30:21 +0000
@@ -508,7 +508,7 @@
 {
     Greeter *greeter_session;
 
-    greeter_session = greeter_new ();
+    greeter_session = SEAT_CLASS (seat_unity_parent_class)->create_greeter_session (seat);
     session_set_env (SESSION (greeter_session), "XDG_SEAT", "seat0");
     if (!SEAT_UNITY (seat)->priv->use_vt_switching)
     {
@@ -525,7 +525,7 @@
 {
     Session *session;
 
-    session = session_new ();
+    session = SEAT_CLASS (seat_unity_parent_class)->create_session (seat);
     session_set_env (session, "XDG_SEAT", "seat0");
     if (!SEAT_UNITY (seat)->priv->use_vt_switching)
     {


Follow ups