Merge lp://staging/~mardy/metacity/command-line-conf into lp://staging/~vcs-imports/metacity/master
Status: | Superseded |
---|---|
Proposed branch: | lp://staging/~mardy/metacity/command-line-conf |
Merge into: | lp://staging/~vcs-imports/metacity/master |
Diff against target: |
198 lines (+84/-12) 3 files modified
src/core/main.c (+9/-1) src/core/prefs.c (+74/-10) src/include/prefs.h (+1/-1) |
To merge this branch: | bzr merge lp://staging/~mardy/metacity/command-line-conf |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Didier Roche-Tolomelli | Pending | ||
Review via email: mp+72842@code.staging.launchpad.net |
This proposal has been superseded by a proposal from 2011-08-25.
Description of the change
Allow overriding GConf settings from command line
Accept a new --conf-file <conf-file> command line option, which loads a
GKeyFile containing overrides for keys stored in GConf.
Unmerged revisions
- 120. By Alberto Mardegan
-
Allow overriding GConf settings from command line
Accept a new --conf-file <conf-file> command line option, which loads a
GKeyFile containing overrides for keys stored in GConf.For a full rationale, please see
https://bugs.launchpad .net/unity- 2d/+bug/ 791205 - 119. By Rodrigo Moya
-
releasing version 1:2.34.1-1ubuntu1
- 118. By Didier Roche-Tolomelli
-
releasing version 1:2.34.0-0ubuntu2
- 117. By Didier Roche-Tolomelli
-
debian/
patches/ 16-capture- before- unmap.patch:
only retrieve scaling down of all the windows' pixmaps when compositor
is in effect (LP: #794080). Thanks Kaleo - 116. By Martin Pitt
-
add bug number
- 115. By Martin Pitt
-
* New upstream release
* debian/patches:
- 02_restart_hint.patch, 19_initialise_ all_workspace_ names.patch
dropped, are upstream - 114. By Oliver Grawert
-
releasing version 1:2.30.3-0ubuntu9
- 113. By Oliver Grawert
-
merge fixes from the unity-2d team
- 112. By Oliver Grawert
-
releasing version 1:2.30.3-0ubuntu8
- 111. By Oliver Grawert
-
merge lp:~uriboni/unity-2d/metacity-capture-before-unmap-not-default to set the proper default
Note: these are the same patches sent to upstream ( https:/ /bugzilla. gnome.org/ show_bug. cgi?id= 657308 ).