lp:~donadigo/switchboard-plug-parental-controls/merge-cli-daemon
Created by
Adam Bieńkowski
and last modified
Work for loki update.
- Get this branch:
- bzr branch lp:~donadigo/switchboard-plug-parental-controls/merge-cli-daemon
Only
Adam Bieńkowski
can upload to this branch. If you are
Adam Bieńkowski
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- Felipe Escoto (community): Approve
-
Diff: 3420 lines (+1413/-1256)32 files modifiedlib/exec-monitor.c (+6/-6)
lib/exec-monitor.h (+1/-0)
src/CMakeLists.txt (+3/-2)
src/Plug.vala (+0/-1)
src/Widgets/AppsBox.vala (+48/-51)
src/Widgets/ControlPage.vala (+24/-34)
src/Widgets/GeneralBox.vala (+61/-115)
src/Widgets/InternetBox.vala (+14/-14)
src/Widgets/UserItem.vala (+8/-2)
src/Widgets/WeekSpinBox.vala (+7/-13)
src/cli/Application.vala (+0/-191)
src/cli/CMakeLists.txt (+0/-28)
src/cli/PAMWriter.vala (+0/-204)
src/client/AppUnavailableDialog.vala (+3/-3)
src/client/CMakeLists.txt (+3/-1)
src/client/Client.vala (+20/-50)
src/daemon/CMakeLists.txt (+6/-2)
src/daemon/Daemon.vala (+9/-10)
src/daemon/Interfaces.vala (+30/-34)
src/daemon/IptablesHelper.vala (+46/-48)
src/daemon/ProcessWatcher.vala (+49/-74)
src/daemon/Server.vala (+213/-7)
src/daemon/SessionHandler.vala (+47/-163)
src/daemon/SessionManager.vala (+53/-38)
src/daemon/Timer.vala (+116/-0)
src/daemon/UserConfig.vala (+208/-0)
src/shared/PAM/Reader.vala (+66/-0)
src/shared/PAM/Token.vala (+190/-0)
src/shared/PAM/Writer.vala (+110/-0)
src/shared/PAMControl.vala (+0/-128)
src/shared/Utils.vala (+71/-34)
src/shared/Vars.vala (+1/-3)
Branch information
Recent revisions
- 230. By Adam Bieńkowski
-
Fix not existing configuration file for writing; fix day handling in PAM timer; simplify code; fix warnings
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)