diff options
author | Daniel Drake <dsd@laptop.org> | 2012-10-13 21:49:29 (GMT) |
---|---|---|
committer | Daniel Drake <dsd@laptop.org> | 2012-10-13 21:52:45 (GMT) |
commit | 4c8468236551cc027a163f8a420c1ff574899ddc (patch) | |
tree | 993970e29633cc5bf642ad8e93144255e498c8a0 | |
parent | 2644bfdeed730a81261a61e201f18da1200aea35 (diff) |
Remove old SIGCHILD compatibility hack
-rwxr-xr-x | src/view.py | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/src/view.py b/src/view.py index acb3862..32cb580 100755 --- a/src/view.py +++ b/src/view.py @@ -30,29 +30,6 @@ from jarabe.controlpanel.inlinealert import InlineAlert import model from model import _humanize_size, _svg2pixbuf, inhibit_suspend -# COMPATIBILITY HACK: work around trac #8532 by forcibly removing the -# SIGCHLD handler (and the necessity for one) -import sugar3.activity.activityfactory -if hasattr(sugar3.activity.activityfactory, '_sigchild_handler'): - from ctypes import CDLL, Structure, c_voidp, c_int, c_ulong, pointer - import signal - libc = CDLL("libc.so.6") - SA_NOCLDWAIT = 2 # according to /usr/include/bits/sigaction.h - class SIGACTION(Structure): - _fields_ = [('sa_handler', c_voidp), - ('sa_sigaction', c_voidp), - ('sa_mask', c_ulong), # sigset_t - ('sa_flags', c_int), - ('sa_restorer', c_voidp)] - desired = SIGACTION(None, # SIG_DFL, according to /usr/include/asm-generic/signal.h - None, - 0, - SA_NOCLDWAIT, - None) - libc.sigaction(signal.SIGCHLD, pointer(desired), None) -# END COMPATIBILITY HACK - - # configuration constants needed for control panel framework CLASS = 'ActivityUpdater' ICON = 'module-updater' |