Merge lp://staging/~pas-anddev/terminator/terminator-fixes into lp://staging/terminator/trunk
Proposed by
Pavel Khlebovich
| Status: | Merged |
|---|---|
| Merged at revision: | 1343 |
| Proposed branch: | lp://staging/~pas-anddev/terminator/terminator-fixes |
| Merge into: | lp://staging/terminator/trunk |
| Diff against target: |
96 lines (+19/-3) 3 files modified
terminatorlib/config.py (+7/-2) terminatorlib/optionparse.py (+6/-1) terminatorlib/window.py (+6/-0) |
| To merge this branch: | bzr merge lp://staging/~pas-anddev/terminator/terminator-fixes |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Terminator | Pending | ||
|
Review via email:
|
|||
Description of the change
= Bug 805870 =
modified: window.py
This is the workaround for focus stealing prevention found in Guake and deskbar-applet.
= Bug 806424 =
modified: config.py, optionparser.py
Introduces commandline option --config (with -c as the alias) which makes it possible to use alternative configuration file.
While the issue is better solved by making Config instance a singleton, the fix is a bit dirty, but very noninvasive. It introduces global variable "options" in optionparser, but IMO it's not an issue since commandline arguments are never changed in runtime and variable's visibility is limited to the module.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
