← Back to branch summary

~khurshid-alam/unity-greeter/use-usd-schemas

« back to all changes in this revision

Viewing changes to src/unity-greeter.vala

Remove at-spi load/kill code
          
With recent versions of lightdm, at-spi is unable to properly clean up after
itself, thus breaking accessibility for the logged in session. However it
seems that if systemd handles the activation and cleanup of at-spi, things
work properly. (LP: #1670933)

Approved by: Robert Ancell

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/unity-greeter.vala
553
553
        /* Set up the accessibility stack, in case the user needs it for screen reading etc. */
554
554
        Environment.set_variable ("GTK_MODULES", "atk-bridge", false);
555
555
 
556
 
        Pid atspi_pid = 0;
557
 
 
558
 
        try
559
 
        {
560
 
            string[] argv;
561
 
 
562
 
            Shell.parse_argv ("/usr/lib/at-spi2-core/at-spi-bus-launcher --launch-immediately", out argv);
563
 
            Process.spawn_async (null,
564
 
                                 argv,
565
 
                                 null,
566
 
                                 SpawnFlags.SEARCH_PATH,
567
 
                                 null,
568
 
                                 out atspi_pid);
569
 
        }
570
 
        catch (Error e)
571
 
        {
572
 
            warning ("Error starting the at-spi registry: %s", e.message);
573
 
        }
574
 
 
575
556
        Gtk.init (ref args);
576
557
        Ido.init ();
577
558
 
701
682
 
702
683
        debug ("Cleaning up");
703
684
 
704
 
        if (atspi_pid != 0)
705
 
        {
706
 
            Posix.kill (atspi_pid, Posix.SIGKILL);
707
 
            int status;
708
 
            Posix.waitpid (atspi_pid, out status, 0);
709
 
            if (Process.if_exited (status))
710
 
                debug ("AT-SPI exited with return value %d", Process.exit_status (status));
711
 
            else
712
 
                debug ("AT-SPI terminated with signal %d", Process.term_sig (status));
713
 
            atspi_pid = 0;
714
 
        }
715
 
 
716
685
        debug ("Exiting");
717
686
 
718
687
        return Posix.EXIT_SUCCESS;