Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(16)

Unified Diff: ibus.conf

Issue 3398002: Add "task" to ibus.conf since the file no longer launches ibus-daemon. (Closed) Base URL: ssh://git@chromiumos-git//init.git
Patch Set: Created 10 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ibus.conf
diff --git a/ibus.conf b/ibus.conf
index 2af29123c4d7d5c183d6cb04f8c66a2944f0dd91..53212be376ea5f630c7475ef236ece00151f50e5 100644
--- a/ibus.conf
+++ b/ibus.conf
@@ -2,27 +2,28 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-description "Run ibus-daemon and ibus-memconf"
+description "Kill input method daemons when X stopped"
author "chromium-os-dev@googlegroups.com"
-stop on stopping ui
+start on stopping ui
+task
# ibus-daemon creates a temporary file in /home/chronos,
# not in /home/chronos/user.
env HOME=/home/chronos
-post-stop script
+script
set +e
. /sbin/killers
-# Ensure ibus-daemon and sub-processes are terminated. Note that these
-# processes are not mananged by Upstart.
-term_process "(candidate_w.*|ibus-[dem].*)"
+# Ensure candidate_window for input methods, ibus-daemon, and sub processes
+# of ibus-daemon are terminated. Note that candidate_window and IBus processes
+# are not mananged by Upstart. They are launched from Chrome. ".*" is used
+# since the process name used for matching is limited to 15 characters.
+term_process "(candidate_w.*|ibus-.*)"
-# Since Chrome OS regenerates /var/lib/dbus/machine-id every time when the OS
-# starts, ibus-daemon creates a new file in ${HOME}/.config/ibus/bus/ every time
-# when it starts. It's better to remove them when ibus-daemon is terminated.
+# Remove ibus-daemon's PID file.
rm -f ${HOME}/.config/ibus/bus/*
end script
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698