Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Narvaez <dwnarvaez@gmail.com>2013-05-06 17:10:29 (GMT)
committer Daniel Narvaez <dwnarvaez@gmail.com>2013-05-06 17:10:29 (GMT)
commit8db63cdcf46744584bcc9473079813d6df03ddb4 (patch)
treef708eb2a23e752c31022e7234a1757deeb5be4c0
parentf5d42041fdf9eb9538f83618d1bdc8d0d452d112 (diff)
Kill gnome-keyring on exit
-rw-r--r--scripts/xinitrc4
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/xinitrc b/scripts/xinitrc
index 83d4d39..bf99b90 100644
--- a/scripts/xinitrc
+++ b/scripts/xinitrc
@@ -5,7 +5,6 @@ import subprocess
import signal
import sys
import shlex
-import signal
from gi.repository import SugarRunner
@@ -85,6 +84,7 @@ def _run_sugar_and_test(test_command):
def _setup_xdg_user_dirs():
subprocess.check_call("xdg-user-dirs-update")
+
_setup_outputs()
_setup_xdg_user_dirs()
_load_xkb_config()
@@ -97,3 +97,5 @@ if test_command:
os.kill(int(os.environ["SUGAR_RUNNER_PID"]), signal.SIGUSR1)
else:
_run_sugar()
+
+os.kill(int(os.environ["GNOME_KEYRING_PID"]), signal.SIGTERM)