From b86e64e0e82d0d1f1d1b8c0a9472c06a410342d7 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Mon, 26 Oct 2015 18:31:57 +0100
Subject: Disable code depending on upstart.

 FIXME: Should be replaced by systemd-conformant
 startup for indicator-services-start.
---
 src/arctica-greeter.vala | 56 ++++++++++++++++++++++++------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

(limited to 'src/arctica-greeter.vala')

diff --git a/src/arctica-greeter.vala b/src/arctica-greeter.vala
index 09b3f74..7c0c07e 100644
--- a/src/arctica-greeter.vala
+++ b/src/arctica-greeter.vala
@@ -569,23 +569,23 @@ public class ArcticaGreeter
 
         if (!do_test_mode)
         {
-            /* Start the indicator services */
-            try
-            {
-                string[] argv;
-
-                Shell.parse_argv ("init --user --startup-event indicator-services-start", out argv);
-                Process.spawn_async (null,
-                                     argv,
-                                     null,
-                                     SpawnFlags.SEARCH_PATH,
-                                     null,
-                                     out upstart_pid);
-            }
-            catch (Error e)
-            {
-                warning ("Error starting Upstart for indicators: %s", e.message);
-            }
+//          /* Start the indicator services */
+//          try
+//          {
+//              string[] argv;
+//
+//              Shell.parse_argv ("init --user --startup-event indicator-services-start", out argv);
+//              Process.spawn_async (null,
+//                                   argv,
+//                                   null,
+//                                   SpawnFlags.SEARCH_PATH,
+//                                   null,
+//                                   out upstart_pid);
+//          }
+//          catch (Error e)
+//          {
+//              warning ("Error starting Upstart for indicators: %s", e.message);
+//          }
 
             /* Make nm-applet hide items the user does not have permissions to interact with */
             Environment.set_variable ("NM_APPLET_HIDE_POLICY_ITEMS", "1", true);
@@ -612,17 +612,17 @@ public class ArcticaGreeter
 
         debug ("Cleaning up");
 
-        if (upstart_pid != 0)
-        {
-            Posix.kill (upstart_pid, Posix.SIGTERM);
-            int status;
-            Posix.waitpid (upstart_pid, out status, 0);
-            if (Process.if_exited (status))
-                debug ("Upstart exited with return value %d", Process.exit_status (status));
-            else
-                debug ("Upstart terminated with signal %d", Process.term_sig (status));
-            upstart_pid = 0;
-        }
+//      if (upstart_pid != 0)
+//      {
+//          Posix.kill (upstart_pid, Posix.SIGTERM);
+//          int status;
+//          Posix.waitpid (upstart_pid, out status, 0);
+//          if (Process.if_exited (status))
+//              debug ("Upstart exited with return value %d", Process.exit_status (status));
+//          else
+//              debug ("Upstart terminated with signal %d", Process.term_sig (status));
+//          upstart_pid = 0;
+//      }
 
         if (atspi_pid != 0)
         {
-- 
cgit v1.2.3