aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-10-26 18:31:57 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-10-26 18:33:43 +0100
commitb86e64e0e82d0d1f1d1b8c0a9472c06a410342d7 (patch)
tree4a6e71da3ef7a9dc059a164a795517ad6001e4f7
parent4ce2ca5ef0247ee38c85aed2f7a50bfaea5668fa (diff)
downloadarctica-greeter-b86e64e0e82d0d1f1d1b8c0a9472c06a410342d7.tar.gz
arctica-greeter-b86e64e0e82d0d1f1d1b8c0a9472c06a410342d7.tar.bz2
arctica-greeter-b86e64e0e82d0d1f1d1b8c0a9472c06a410342d7.zip
Disable code depending on upstart.
FIXME: Should be replaced by systemd-conformant startup for indicator-services-start.
-rw-r--r--debian/control1
-rw-r--r--src/arctica-greeter.vala56
2 files changed, 28 insertions, 29 deletions
diff --git a/debian/control b/debian/control
index 4526ebc..24423b3 100644
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,6 @@ Depends: ${misc:Depends},
fonts-cabin,
lightdm,
network-manager,
- upstart-bin,
Recommends: indicator-application,
indicator-datetime,
indicator-keyboard,
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)
{