Merge lp://staging/~a-j-buxton/libindicator/remove-timeout into lp://staging/libindicator/14.04
| Status: | Needs review | ||||
|---|---|---|---|---|---|
| Proposed branch: | lp://staging/~a-j-buxton/libindicator/remove-timeout | ||||
| Merge into: | lp://staging/libindicator/14.04 | ||||
| Diff against target: |
175 lines (+4/-81) 1 file modified
libindicator/indicator-service.c (+4/-81) |
||||
| To merge this branch: | bzr merge lp://staging/~a-j-buxton/libindicator/remove-timeout | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ted Gould | Pending | ||
|
Review via email:
|
|||
Description of the change
This removes the timeout shutdown code from indicator-service.
This code was intended to allow the services to shut down automatically when using dbus activation and nothing was using the service any more. Indicators are now started by upstart or xdg-autostart, and this code becomes a problem. If the indicator is started by upstart and it exits, upstart will just keep running it again and again until it kills the job "respawning too fast". If the service was started by xdg-autostart and it decides to exit, nothing will start it again. This leads to indicators mysteriously disappearing from the panel, or never loading up in the first place due to race conditions.
If you haven't, please also see:
https:/
This is another MR on libindicator dealing with the upstart changes, but as far as I can tell it does not deal with this specific issue.
Unmerged revisions
- 519. By Alistair Buxton
-
Remove the shutdown timeout.
Since indicators are now started by upstart, and not on demand, this
code is not needed.
