brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gnome-shell-jhbuild.in: Kill notification-daemon and notify-osd here

Browse Source 
We need to terminate these processes in a replacing-GNOME-2 scenario.

Reviewed by danw on IRC.
This commit is contained in:
Colin Walters 2011-03-01 12:31:51 -05:00
parent 2337373a17
commit 998ea53b46
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/gnome-shell-jhbuild.in
View File

@ -206,6 +206,21 @@ def start_shell(perf_output=None):
args.append('--sync') args.append('--sync')
return subprocess.Popen(args, env=env) return subprocess.Popen(args, env=env)
def _killall(processname):
subprocess.call(['pkill', '-u', '%d' % (os.getuid(), ),
'-f', r'^([^ ]*/)?' + re.escape(processname) + '($| )'])
def ensure_desktop_infrastructure_state():
# This is a collection of random hacks necessary to make sure
# that we can run in jhbuild scenarios or when dynamically
# replacing GNOME 2.
start_dconf_await_service()
# We need to terminate notification-daemon
_killall('notification-daemon')
_killall('notify-osd')
def run_shell(perf_output=None): def run_shell(perf_output=None):
if options.debug: if options.debug:
# Record initial terminal state so we can reset it to that # Record initial terminal state so we can reset it to that
@ -527,13 +542,11 @@ elif options.debug:
# something else. # something else.
normal_exit = False normal_exit = False
# Make sure dconf daemon is running
start_dconf_await_service()
try: try:
if options.perf: if options.perf:
normal_exit = run_performance_test() normal_exit = run_performance_test()
else: else:
ensure_desktop_infrastructure_state()
normal_exit = run_shell() normal_exit = run_shell()
finally: finally:
if options.replace and (options.perf or not normal_exit): if options.replace and (options.perf or not normal_exit):