[mutter/override-redirect-exclusion: 7/8] Merge branch 'master' into override-redirect-exclusion
- From: Owen Taylor <otaylor src gnome org>
- To: svn-commits-list gnome org
- Subject: [mutter/override-redirect-exclusion: 7/8] Merge branch 'master' into override-redirect-exclusion
- Date: Wed, 17 Jun 2009 14:26:01 -0400 (EDT)
commit 9828007a02a4402ab34c147c30174912425c5580
Merge: 1f89067... 6e4cd65...
Author: Owen W. Taylor <otaylor fishsoup net>
Date: Wed Jun 17 13:40:42 2009 -0400
Merge branch 'master' into override-redirect-exclusion
Conflicts:
src/core/bell.c
README | 84 +--
autogen.sh | 2 +-
configure.in | 136 ++--
doc/Makefile.am | 4 +-
doc/compositor-control.txt | 2 +-
doc/creating_themes/C/creating-metacity-themes.xml | 286 ------
doc/creating_themes/Makefile.am | 24 -
doc/man/Makefile.am | 4 +-
doc/man/{metacity-message.1 => mutter-message.1} | 14 +-
...tacity-theme-viewer.1 => mutter-theme-viewer.1} | 20 +-
...metacity-window-demo.1 => mutter-window-demo.1} | 10 +-
doc/man/{metacity.1 => mutter.1} | 18 +-
doc/metacity-theme.dtd | 273 ------
metacity.doap | 710 --------------
po/POTFILES.in | 11 +-
src/50-metacity-desktop-key.xml.in | 20 -
src/50-metacity-key.xml.in | 269 ------
src/Makefile.am | 94 +--
src/compositor/mutter/mutter-module.c | 7 +-
src/compositor/mutter/plugins/Makefile.am | 4 +-
src/core/bell.c | 6 +-
src/core/bell.h | 4 +-
src/core/constraints.c | 2 +-
src/core/constraints.h | 2 +-
src/core/core.c | 2 +-
src/core/delete.c | 6 +-
src/core/display-private.h | 2 +-
src/core/display.c | 30 +-
src/core/effects.c | 2 +-
src/core/errors.c | 2 +-
src/core/eventqueue.c | 2 +-
src/core/eventqueue.h | 2 +-
src/core/frame-private.h | 2 +-
src/core/frame.c | 2 +-
src/core/group-private.h | 2 +-
src/core/group.c | 2 +-
src/core/iconcache.c | 2 +-
src/core/iconcache.h | 2 +-
src/core/keybindings.c | 4 +-
src/core/main.c | 72 +-
.../{metacity-Xatomtype.h => mutter-Xatomtype.h} | 2 +-
src/core/place.c | 2 +-
src/core/place.h | 2 +-
src/core/prefs.c | 19 +-
src/core/schema-bindings.c | 195 ----
src/core/screen-private.h | 2 +-
src/core/screen.c | 10 +-
src/core/session.c | 52 +-
src/core/testasyncgetprop.c | 2 +-
src/core/testboxes.c | 2 +-
src/core/util.c | 10 +-
src/core/window-private.h | 2 +-
src/core/window.c | 56 +-
src/core/workspace.c | 2 +-
src/core/xprops.c | 4 +-
src/include/all-keybindings.h | 2 +-
src/include/atomnames.h | 14 +-
src/include/common.h | 2 +-
src/include/compositor-mutter.h | 2 +-
src/include/core.h | 2 +-
src/include/display.h | 2 +-
src/include/errors.h | 2 +-
src/include/group.h | 2 +-
src/include/main.h | 2 +-
src/include/mutter-plugin.h | 12 +-
src/include/prefs.h | 2 +-
src/include/resizepopup.h | 2 +-
src/include/tabpopup.h | 2 +-
src/include/ui.h | 2 +-
src/include/util.h | 2 +-
src/include/window.h | 2 +
src/include/xprops.h | 2 +-
...acity-private.pc.in => libmutter-private.pc.in} | 8 +-
src/metacity-plugins.pc.in | 17 -
src/metacity.schemas.in.in | 639 -------------
src/mutter-plugins.pc.in | 17 +
...metacity-wm.desktop.in => mutter-wm.desktop.in} | 8 +-
src/{metacity.desktop.in => mutter.desktop.in} | 8 +-
src/mutter.schemas.in | 56 ++
src/{run-metacity.sh => run-mutter.sh} | 10 +-
src/themes/.cvsignore | 2 -
src/themes/AgingGorilla/README | 7 -
src/themes/AgingGorilla/active-button.png | Bin 844 -> 0 bytes
src/themes/AgingGorilla/active-close-button.png | Bin 896 -> 0 bytes
src/themes/AgingGorilla/active-close-menu-icon.png | Bin 258 -> 0 bytes
src/themes/AgingGorilla/active-maximize-button.png | Bin 886 -> 0 bytes
.../AgingGorilla/active-maximize-menu-icon.png | Bin 284 -> 0 bytes
src/themes/AgingGorilla/active-menu-button.png | Bin 873 -> 0 bytes
src/themes/AgingGorilla/active-minimize-button.png | Bin 914 -> 0 bytes
.../AgingGorilla/active-minimize-menu-icon.png | Bin 332 -> 0 bytes
src/themes/AgingGorilla/gorilla.xcf.bz2 | Bin 11040 -> 0 bytes
src/themes/AgingGorilla/inactive-close-button.png | Bin 919 -> 0 bytes
.../AgingGorilla/inactive-maximize-button.png | Bin 903 -> 0 bytes
src/themes/AgingGorilla/inactive-menu-button.png | Bin 900 -> 0 bytes
.../AgingGorilla/inactive-minimize-button.png | Bin 927 -> 0 bytes
src/themes/AgingGorilla/metacity-theme-1.xml | 291 ------
src/themes/Atlanta/metacity-theme-1.xml | 350 -------
src/themes/Bright/metacity-theme-1.xml | 376 --------
src/themes/Bright/metacity-theme-2.xml | 546 -----------
src/themes/Crux/active-above-button.png | Bin 197 -> 0 bytes
src/themes/Crux/active-border-top-left-border.png | Bin 147 -> 0 bytes
src/themes/Crux/active-border-top-right-border.png | Bin 147 -> 0 bytes
src/themes/Crux/active-bottom-left-border.png | Bin 154 -> 0 bytes
src/themes/Crux/active-bottom-left-corner.png | Bin 166 -> 0 bytes
src/themes/Crux/active-bottom-mid-left-border.png | Bin 171 -> 0 bytes
src/themes/Crux/active-bottom-mid-right-border.png | Bin 276 -> 0 bytes
src/themes/Crux/active-bottom-right-border.png | Bin 154 -> 0 bytes
src/themes/Crux/active-bottom-right-corner.png | Bin 171 -> 0 bytes
src/themes/Crux/active-button-prelight.png | Bin 385 -> 0 bytes
src/themes/Crux/active-button-pressed.png | Bin 391 -> 0 bytes
src/themes/Crux/active-button.png | Bin 396 -> 0 bytes
src/themes/Crux/active-close-button.png | Bin 341 -> 0 bytes
src/themes/Crux/active-left-border.png | Bin 138 -> 0 bytes
src/themes/Crux/active-left-top-border-shaded.png | Bin 160 -> 0 bytes
src/themes/Crux/active-left-top-border.png | Bin 224 -> 0 bytes
src/themes/Crux/active-maximize-button.png | Bin 184 -> 0 bytes
src/themes/Crux/active-menu-button-prelight.png | Bin 455 -> 0 bytes
src/themes/Crux/active-menu-button-pressed.png | Bin 424 -> 0 bytes
src/themes/Crux/active-menu-button.png | Bin 436 -> 0 bytes
src/themes/Crux/active-minimize-button.png | Bin 257 -> 0 bytes
src/themes/Crux/active-restore-button.png | Bin 171 -> 0 bytes
src/themes/Crux/active-right-border.png | Bin 136 -> 0 bytes
src/themes/Crux/active-right-top-border-shaded.png | Bin 274 -> 0 bytes
src/themes/Crux/active-right-top-border.png | Bin 282 -> 0 bytes
src/themes/Crux/active-shade-button.png | Bin 296 -> 0 bytes
src/themes/Crux/active-stick-button.png | Bin 249 -> 0 bytes
src/themes/Crux/active-top-center-left.png | Bin 238 -> 0 bytes
src/themes/Crux/active-top-center-mid-left.png | Bin 902 -> 0 bytes
src/themes/Crux/active-top-center-mid-right.png | Bin 1083 -> 0 bytes
src/themes/Crux/active-top-center-right.png | Bin 312 -> 0 bytes
src/themes/Crux/active-top-left-border.png | Bin 168 -> 0 bytes
src/themes/Crux/active-top-left-corner.png | Bin 162 -> 0 bytes
src/themes/Crux/active-top-mid-left-border.png | Bin 210 -> 0 bytes
src/themes/Crux/active-top-mid-right-border.png | Bin 276 -> 0 bytes
src/themes/Crux/active-top-right-border.png | Bin 170 -> 0 bytes
src/themes/Crux/active-top-right-corner.png | Bin 171 -> 0 bytes
src/themes/Crux/active-unabove-button.png | Bin 205 -> 0 bytes
src/themes/Crux/active-unshade-button.png | Bin 261 -> 0 bytes
src/themes/Crux/active-unstick-button.png | Bin 248 -> 0 bytes
src/themes/Crux/inactive-above-button.png | Bin 205 -> 0 bytes
.../Crux/inactive-border-top-left-border.png | Bin 153 -> 0 bytes
.../Crux/inactive-border-top-right-border.png | Bin 154 -> 0 bytes
src/themes/Crux/inactive-bottom-left-border.png | Bin 158 -> 0 bytes
src/themes/Crux/inactive-bottom-left-corner.png | Bin 176 -> 0 bytes
src/themes/Crux/inactive-bottom-mid-border.png | Bin 254 -> 0 bytes
src/themes/Crux/inactive-bottom-right-border.png | Bin 148 -> 0 bytes
src/themes/Crux/inactive-bottom-right-corner.png | Bin 188 -> 0 bytes
src/themes/Crux/inactive-button-prelight.png | Bin 357 -> 0 bytes
src/themes/Crux/inactive-button-pressed.png | Bin 379 -> 0 bytes
src/themes/Crux/inactive-button.png | Bin 390 -> 0 bytes
src/themes/Crux/inactive-close-button.png | Bin 211 -> 0 bytes
src/themes/Crux/inactive-left-border.png | Bin 137 -> 0 bytes
.../Crux/inactive-left-top-border-shaded.png | Bin 212 -> 0 bytes
src/themes/Crux/inactive-left-top-border.png | Bin 264 -> 0 bytes
src/themes/Crux/inactive-maximize-button.png | Bin 264 -> 0 bytes
src/themes/Crux/inactive-menu-button-prelight.png | Bin 410 -> 0 bytes
src/themes/Crux/inactive-menu-button-pressed.png | Bin 375 -> 0 bytes
src/themes/Crux/inactive-menu-button.png | Bin 374 -> 0 bytes
src/themes/Crux/inactive-minimize-button.png | Bin 255 -> 0 bytes
src/themes/Crux/inactive-restore-button.png | Bin 249 -> 0 bytes
src/themes/Crux/inactive-right-border.png | Bin 140 -> 0 bytes
.../Crux/inactive-right-top-border-shaded.png | Bin 267 -> 0 bytes
src/themes/Crux/inactive-right-top-border.png | Bin 262 -> 0 bytes
src/themes/Crux/inactive-shade-button.png | Bin 213 -> 0 bytes
src/themes/Crux/inactive-stick-button.png | Bin 200 -> 0 bytes
src/themes/Crux/inactive-top-center-left.png | Bin 232 -> 0 bytes
src/themes/Crux/inactive-top-center-mid.png | Bin 981 -> 0 bytes
src/themes/Crux/inactive-top-center-right.png | Bin 238 -> 0 bytes
src/themes/Crux/inactive-top-left-border.png | Bin 157 -> 0 bytes
src/themes/Crux/inactive-top-left-corner.png | Bin 163 -> 0 bytes
src/themes/Crux/inactive-top-mid-border.png | Bin 252 -> 0 bytes
src/themes/Crux/inactive-top-right-border.png | Bin 159 -> 0 bytes
src/themes/Crux/inactive-top-right-corner.png | Bin 176 -> 0 bytes
src/themes/Crux/inactive-unabove-button.png | Bin 212 -> 0 bytes
src/themes/Crux/inactive-unshade-button.png | Bin 204 -> 0 bytes
src/themes/Crux/inactive-unstick-button.png | Bin 190 -> 0 bytes
src/themes/Crux/metacity-theme-1.xml | 579 ------------
src/themes/Crux/metacity-theme-2.xml | 832 ----------------
src/themes/Esco/metacity-theme-1.xml | 990 --------------------
src/themes/Gorilla/README | 7 -
src/themes/Gorilla/active-button.png | Bin 844 -> 0 bytes
src/themes/Gorilla/active-close-button.png | Bin 896 -> 0 bytes
src/themes/Gorilla/active-close-menu-icon.png | Bin 258 -> 0 bytes
src/themes/Gorilla/active-maximize-button.png | Bin 886 -> 0 bytes
src/themes/Gorilla/active-maximize-menu-icon.png | Bin 284 -> 0 bytes
src/themes/Gorilla/active-menu-button.png | Bin 873 -> 0 bytes
src/themes/Gorilla/active-minimize-button.png | Bin 914 -> 0 bytes
src/themes/Gorilla/active-minimize-menu-icon.png | Bin 332 -> 0 bytes
src/themes/Gorilla/gorilla.xcf.bz2 | Bin 11040 -> 0 bytes
src/themes/Gorilla/inactive-close-button.png | Bin 919 -> 0 bytes
src/themes/Gorilla/inactive-maximize-button.png | Bin 903 -> 0 bytes
src/themes/Gorilla/inactive-menu-button.png | Bin 900 -> 0 bytes
src/themes/Gorilla/inactive-minimize-button.png | Bin 927 -> 0 bytes
src/themes/Gorilla/metacity-theme-1.xml | 260 -----
src/themes/Makefile.am | 50 -
src/themes/Metabox/metacity-theme-1.xml | 479 ----------
src/themes/Simple/close.png | Bin 333 -> 0 bytes
src/themes/Simple/maximize.png | Bin 291 -> 0 bytes
src/themes/Simple/maximized.png | Bin 340 -> 0 bytes
src/themes/Simple/metacity-theme-1.xml | 346 -------
src/themes/Simple/minimize.png | Bin 199 -> 0 bytes
src/tools/Makefile.am | 36 +-
.../{metacity-grayscale.c => mutter-grayscale.c} | 0
src/tools/{metacity-mag.c => mutter-mag.c} | 0
src/tools/{metacity-message.c => mutter-message.c} | 14 +-
...metacity-window-demo.c => mutter-window-demo.c} | 4 +-
...city-window-demo.png => mutter-window-demo.png} | Bin 3453 -> 3453 bytes
src/ui/draw-workspace.c | 2 +-
src/ui/fixedtip.c | 2 +-
src/ui/fixedtip.h | 2 +-
src/ui/gradient.h | 2 +-
src/ui/menu.c | 2 +-
src/ui/menu.h | 2 +-
src/ui/tabpopup.c | 2 +-
src/ui/testgradient.c | 2 +-
src/ui/theme-parser.c | 4 +-
src/ui/theme-viewer.c | 4 +-
src/ui/ui.c | 2 +-
src/wm-tester/Makefile.am | 12 +-
test/{metacity-test => mutter-test} | 16 +-
test/tokentest/Makefile | 2 +-
221 files changed, 525 insertions(+), 8023 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
