Bump version to 2.27.2

Fix use of uninitialized memory in edge-resistance.c
g_new bad, g_new0 good.
2009-08-10 12:24:03 -04:00 · 2009-08-09 23:40:22 -04:00 · 2009-08-09 23:36:08 -04:00 · 2009-08-09 15:48:46 +02:00 · 2009-08-08 17:59:01 +01:00 · 2009-08-08 13:47:31 +01:00
375 changed files with 173385 additions and 158367 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,60 @@
+Makefile
+Makefile.in
+Makefile.in.in
+aclocal.m4
+autom4te.cache
+compile
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+depcomp
+install-sh
+libtool
+ltmain.sh
+missing
+.deps
+src/metacity-wm.desktop
+*.o
+*.a
+*.lo
+*.la
+.libs
+*.swp
+tidy-enum-types.[ch]
+tidy-marshal.[ch]
+stamp-tidy-enum-types.h
+stamp-tidy-marshal.h
+stamp-h1
+*.gmo
+*.make
+*~
+stamp-it
+.intltool-merge-cache
+POTFILES
+50-metacity-desktop-key.xml
+50-metacity-key.xml
+inlinepixbufs.h
+libmetacity-private.pc
+metacity
+metacity-dialog
+metacity-theme-viewer
+metacity.desktop
+metacity.schemas
+testasyncgetprop
+testboxes
+testgradient
+metacity-grayscale
+metacity-mag
+metacity-message
+metacity-window-demo
+focus-window
+test-gravity
+test-resizing
+test-size-hints
+wm-tester
+INSTALL
+mkinstalldirs
--- a/1632
+++ b/1632
--- a/4
+++ b/4
@@ -195,7 +195,7 @@ ALIASES                =
 # For instance, some of the names that are used will be different. The list 
 # of all members will be omitted, etc.

-OPTIMIZE_OUTPUT_FOR_C  = NO
+OPTIMIZE_OUTPUT_FOR_C  = YES

 # Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java 
 # sources only. Doxygen will then generate output that is more tailored for Java. 
@@ -427,7 +427,7 @@ FILE_VERSION_FILTER    =
 # The QUIET tag can be used to turn on/off the messages that are generated 
 # by doxygen. Possible values are YES and NO. If left blank NO is used.

-QUIET                  = NO
+QUIET                  = YES

 # The WARNINGS tag can be used to turn on/off the warning messages that are 
 # generated by doxygen. Possible values are YES and NO. If left blank 
--- a/45
+++ b/45
@@ -1,41 +1,8 @@
-Currently active maintainers
--------------------------------
+Tomas Frydrych
+Email: tf linux intel com
+Userid: tomasf

-Elijah Newren
-Email: newren gmail com
-Userid: newren
+Owen Taylor
+Email: otaylor redhat com
+Userid: otaylor

-  - Usually won't touch the theme bugs (isn't interested) or the
-    compositor (until open source nvidia drivers are up to snuff).
-    Tends to be most interested in libwnck/gtk interactions, focus
-    issues, constraints problems, and raising/stacking, but works on
-    just about anything other than themes and the compositor.
-
-Thomas Thurman
-Email: thomas thurman org uk
-Userid: tthurman
-
-  - Responsible for all theme bugs and the compositor (thank goodness
-    Thomas got involved, eh?).  I'm sure he'll replace this sentence
-    with his interests when he reads it.  ;-)
-
-
-Semi-active maintainers
--------------------------------
-Havoc Pennington
-Email: hp  redhat com
-Userid: hp
-  - Original author.  Doesn't patch metacity anymore, but is active in
-    answering questions, responding to bugs, providing very helpful
-    suggestions and insight, and even assisting with debugging.
-
-
-Important historical figureheads
--------------------------------
-Rob Adams (readams  readams net)
-  - Was the main maintainer of metacity for a while; particular areas
-    of focus included xinerama, placement, and an older version of the
-    constraints code.  Still responds to bugs every once in a while.
-
-Søren Sandmann (sandmann  redhat com)
-  - Wrote most of the current compositing manager code + libcm
--- a/43
+++ b/43
@@ -0,0 +1,43 @@
+Currently active maintainers
+--------------------------------
+
+Elijah Newren
+Email: newren gmail com
+Userid: newren
+
+  - Usually won't touch the theme bugs (isn't interested) or the
+    compositor (until open source nvidia drivers are up to snuff).
+    Tends to be most interested in libwnck/gtk interactions, focus
+    issues, constraints problems, and raising/stacking, but works on
+    just about anything other than themes and the compositor.
+
+Thomas Thurman
+Email: thomas thurman org uk
+Userid: tthurman
+
+  - Responsible for all theme bugs and the compositor (thank goodness
+    Thomas got involved, eh?).  I'm sure he'll replace this sentence
+    with his interests when he reads it.  ;-)
+
+
+Semi-active maintainers
+--------------------------------
+
+Havoc Pennington
+Email: hp  redhat com
+Userid: hp
+  - Original author.  Doesn't patch metacity anymore, but is active in
+    answering questions, responding to bugs, providing very helpful
+    suggestions and insight, and even assisting with debugging.
+
+
+Important historical figureheads
+--------------------------------
+
+Rob Adams (readams  readams net)
+  - Was the main maintainer of metacity for a while; particular areas
+    of focus included xinerama, placement, and an older version of the
+    constraints code.  Still responds to bugs every once in a while.
+
+Søren Sandmann (sandmann  redhat com)
+  - Wrote most of the current compositing manager code + libcm
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,6 @@

 SUBDIRS=src po doc

-EXTRA_DIST = HACKING MAINTAINERS rationales.txt \
-	intltool-extract.in intltool-merge.in intltool-update.in
+EXTRA_DIST = HACKING MAINTAINERS rationales.txt

 DISTCLEANFILES = intltool-extract intltool-merge intltool-update po/stamp-it po/.intltool-merge-cache
--- a/455
+++ b/455
@@ -1,3 +1,458 @@
+2.26.0
+======
+
+Thanks to Luca Ferretti, Matt Kraai, and Neil Jagdish Patel for
+improvements in this version.
+
+  - queue frame resize on window undecorate (Neil)
+  - fix description of desktop background (Luca) (#569649)
+  - wrap g_error calls in braces (Matt)
+
+Translations
+  Amitakhya Phukan (as), Mikel González (ast), Ihar Hrachyshka (be@latin), Runa
+  Bhattacharjee (bn_IN), David Planella (ca), Petr Kovar (cs), Ask Hjorth
+  Larsen (da), Christian Kirbach (de), Jennie Petoumenou (el), David Lodge (en_GB),
+  Jorge González (es), Mattias Põldaru (et), Iñaki Larrañaga Murgoitio (eu),
+  Ilkka Tuohela (fi), Claude Paroz (fr), Ankit Patel (gu), Mark Krapivner (he),
+  Rajesh Ranjan (hi), Gabor Kelemen (hu), Luca Ferretti (it), Takeshi AIHANA (ja),
+  Changwoo Ryu (ko), Gintautas Miliauskas (lt), Sangeeta Kumari (mai), Sandeep
+  Shedmake (mr), Wouter Bolsterlee (nl), Manoj Kumar Giri (or), Duarte Loreto (pt),
+  Leonardo Ferreira Fontenelle (pt_BR), Adi Roiban (ro), Yuriy Penkin (ru), Daniel
+  Nylander (sv), I. Felix (ta), Krishna Babu K (te), Theppitak Karoonboonyanan (th),
+  Clytie Siddall (vi), Chao-Hsiung Liao (zh_HK), Chao-Hsiung Liao (zh_TW)
+
+2.25.144
+========
+
+Thanks to Matthias Claesen, Matt Kraai, Elijah Newren, Owen Taylor, and Thomas
+Thurman for improvements in this version.
+
+  - Optimise window property lookup (Thomas) (#549886)
+  - Fix slip in the above (Matt)
+  - Several memory leaks fixed (Matthias) (#552303, #552973, #552307)
+  - Fix longstanding crasher about colourmaps (Owen) (#568365)
+  - Alt+middle/right buttons can be switched (Thomas) (#437910)
+  - Support _NET_WM_MOVERESIZE_CANCEL (Elijah)
+  - minor fix paving the way for a theme editor (Thomas)
+
+Translations
+  David Planella (ca), Jorge González (es), Mattias Põldaru (et), saudat
+  mohammed (ha), Yuval Tanny\n (he), Gabor Kelemen (hu), Onye, Sylvester (ig),
+  Changwoo Ryu (ko), Raivis Dejus (lv), Kjartan Maraas (nb), Daniel Nylander (sv),
+  Fajuyitan, Sunday Ayo (yo), 甘露 (Gan Lu) (zh_CN)
+
+2.25.89
+=======
+
+Thanks to Yanko Kaneti, Frederic Peters, Thomas Thurman, and Colin Walters for
+improvements in this version.
+
+  - The maximisation key is a toggle. (Thomas) (#343824)
+  - "Unmaximise" is now called "restore". (Thomas) (#343824)
+  - New thread handling call for gconf (Frederic) (#565517)
+  - Add screenshot commands back which had been removed (Yanko) (#565343)
+  - move_to_corner_se keybinding fixed (Thomas)
+  - Windows on other workspaces which attempt to present themselves
+    are marked as needing attention (Colin) (#482354)
+  - End the grab op when the user clicks the titlebar (Thomas) (#401028)
+
+Translations
+  Jorge González (es)
+
+2.25.55
+=======
+
+Thanks to Erwann Chenede for improvements in this version.
+
+  - Fix build on Solaris (Erwann) (#564123)
+
+Translations
+  Mattias Põldaru (et), Luca Ferretti (it)
+
+2.25.34
+=======
+
+Thanks to Matt Kraai for improvements in this version.
+
+  - Fixes to Thomas's earlier fixes (Matt) (#562939)
+
+Translations
+  None
+
+2.25.21
+=======
+
+Thanks to Thomas Thurman for improvements in this version.
+
+  - Fixes to allow building without compositor again (Thomas)
+  - Fixes for -Wall problems (Thomas)
+  - Various tool updates (Thomas)
+
+Translations: none
+
+
+2.25.13
+=======
+
+Thanks to Thomas Thurman for improvements in this version.
+
+  - Add casts to fix failure to build from source on 64bit hosts (Thomas) (#562106)
+  - Added script to produce annoucements (Thomas)
+
+Translations
+  Jorge González (es)
+
+2.25.8
+======
+
+Thanks to Brian Cameron, Maxim Ermilov, Daniel Macks, Elijah Newren, Frederic
+Peters, Thomas Thurman, David Trowbridge, and Olav Vitters for improvements in
+this version.
+
+  - Reorder compiler flags (Daniel) (#562033)
+  - Fix compositor switch (Daniel) (#560990)
+  - Remove spurious warnings about operations on window "none" (Thomas)
+  - Fix _POSIX_C_SOURCE which was breaking OS X builds (Thomas) (#561962)
+  - -Werror -Wall and -ansi are now standard compile flags (Thomas)
+  - Merge screen and window keybindings files; fix minor alt-tab bug
+    in the process (Thomas) (#528337)
+  - Support _NET_WM_FULLSCREEN_MONITORS (David)
+  - Remove some deprecated calls (Thomas) (#560445)
+  - Clean up #includes (Maxim) (#560449)
+  - Update description of raise_on_click (Elijah)
+  - First dialogue delegated to zenity (Thomas)
+  - fix theme-parser typo (Olav)
+  - double-quote variable names in messages (Thomas) (#558309)
+  - fix accidental renaming of run_command_terminal (Thomas) (#557943)
+  - some null checks; problems exposed by new GDM (Brian) (#558058)
+  - ignore mouse button modifier if it's missing (Thomas) (Launchpad 258054, Launchpad 266929)
+  - fix docbook markup (Frederic)
+
+Translations
+  Astur (ast), Jorge González (es), Thomas Thurman (la), Leonardo Ferreira
+  Fontenelle (pt_BR), Daniel Nylander (sv)
+
+2.25.5
+======
+
+Thanks to Thomas Thurman for improvements in this version.
+
+  - Allow third-party apps to decide whether a window appears
+    on all workspaces (Thomas) (#557536)
+  - Fixed keybindings script (again) (Thomas)
+
+Translations
+  David Planella (ca), Robert Millan (ca@valencia)
+
+2.25.3
+======
+
+Brown paper bag release which fixes numerous build problems from last night's
+release of 2.25.2.  Apologies.
+
+Thanks to Murray Cumming, Thomas Thurman, and Götz Waschk for improvements
+in this version.
+
+  - Fix distcheck (Thomas) (#557356)
+  - add libm reference (Götz) (#557357)
+  - fix docbook tags (Murray) (#557337)
+
+Translations
+  Yavor Doganov (bg), David Planella (ca), Robert Millan (ca@valencia), Kenneth
+  Nielsen (da), Hendrik Richter (de), Ivar Smolin (et), Claude Paroz (fr), Seán de
+  Búrca (ga), Launchpad Translations Administrators (hr), Gabor Kelemen (hu),
+  Thomas Thurman (la), Žygimantas Beručka (lt), Kjartan Maraas (nb), Duarte
+  Loreto (pt), Djavan Fagundes (pt_BR), Mugurel Tudor (ro), Pavol Šimo (sk),
+  Laurent Dhima (sq), Горан Ракић (sr), Theppitak Karoonboonyanan (th),
+  Funda Wang (zh_CN)
+
+2.25.2
+======
+
+Thanks to Joe Marcus Clarke, Murray Cumming, Tomas Frydrych, William Lachance,
+Matthew Martin, Christian Persch, Thomas Thurman, and Vincent Untz for
+improvements in this version.
+
+  - Add handler for SIGTERM (Joe) (#553980)
+  - Minimised windows are necessarily obscured (Matthew) (#528927)
+  - Build fixes with the above (Christian, Tomas, Thomas) (#557335)
+    (#557201) (#469361)
+  - Changed keybindings to be in a single place (Thomas) (#469361)
+  - Add new document about themes (Murray)
+  - Remove obsolete support for fallback icons (Thomas)
+  - Pass modified mouse events to panels (William) (#554428)
+  - Change where desktop files should go (Vincent) (#549479)
+
+Translations
+  Yavor Doganov (bg), David Planella (ca), Kenneth Nielsen (da), Hendrik
+  Richter (de), Ivar Smolin (et), Claude Paroz (fr), Seán de Búrca (ga), Launchpad
+  Translations Administrators (hr), Gabor Kelemen (hu), Thomas Thurman (la),
+  Žygimantas Beručka (lt), Kjartan Maraas (nb), Duarte Loreto (pt), Djavan
+  Fagundes (pt_BR), Mugurel Tudor (ro), Pavol Šimo (sk), Laurent Dhima (sq),
+  Горан Ракић (sr), Theppitak Karoonboonyanan (th), Funda Wang (zh_CN)
+2.25.1
+======
+
+Thanks to Thomas Thurman for improvements in this version.
+
+  - Fix small memory leak, found by Matthias Clasen (Thomas) (#549952)
+  - Added move_to_center keybinding suggested by
+    Khanh-Dang Nguyen Thu Lam (Thomas) (#549979)
+  - Compositor can be turned on and off from the command line
+    (#545323) (Thomas)
+
+Translations
+  Khaled Hosny (ar), Petr Kovar (cs), Iñaki Larrañaga Murgoitio (eu), Ilkka
+  Tuohela (fi), Žygimantas Beručka (lt), Duarte Loreto (pt), Djavan
+  Fagundes (pt_BR), Laurent Dhima (sq)
+
+2.25.0
+======
+
+Thanks to Patrick Niklaus, Ted Percival, Eric Piel, Akira TAGOH, and Thomas
+Thurman for improvements in this version.
+
+  - Fix memory allocation problem in struts (Eric) (probably #468075)
+  - Ensure windows which start maximised know where to jump back
+    to, so they don't warp to other screens (Ted) (#504692)
+  - Added header comments to some files (Thomas)
+  - Icons for windows which are uncooperative enough not to provide
+    an icon are taken from the theme, not built in (Patrick) (#524343)
+  - Added manual page for metacity-message (Akira, from Debian downstream)
+
+Translations
+  Khaled Hosny (ar), Petr Kovar (cs), Ilkka Tuohela (fi), Duarte Loreto (pt), Djavan
+  Fagundes (pt_BR)
+
+2.23.89
+=======
+
+Thanks to Thomas Thurman for improvements in this version.
+
+  - Added DOAP file. (Thomas)
+
+Translations
+  Khaled Hosny (ar), Luca Ferretti (it), Takeshi AIHANA (ja), Wouter
+  Bolsterlee (nl), Vladimir Melo (pt_BR), Daniel Nylander (sv)
+
+2.23.55
+=======
+
+Thanks to Elijah Newren and Thomas Thurman for improvements in this version.
+
+Contrary to rumour, this release does not add tabbing to everything.
+
+  - Display theme name in title bar of theme viewer (Thomas) (#430198)
+  - Allow toggling of non-compositor effects (Thomas) (#92867)
+  - Add some extra null checks (Thomas) (#422242)
+  - Check for double-freeing at the time of workspace freeing (Elijah) (#361804)
+  - Don't generate log messages unless we're logging (Thomas)
+  - Two windows which don't belong to any application can't be considered to
+    belong to the same application (Thomas)
+  - Various tidyings (Thomas)
+
+Translations
+  Yavor Doganov (bg), Gabor Kelemen (hu), Kjartan Maraas (nb), Matej
+  Urbančič (sl), Daniel Nylander (sv), Theppitak Karoonboonyanan (th)
+
+
+2.23.34
+=======
+
+Thanks to Thomas Thurman for improvements in this version.
+
+  - Commenting and tidying (Thomas)
+  - Fix possible compositor crash (Thomas) (#530702)
+
+Translations
+  Khaled Hosny (ar), Yavor Doganov (bg), Jorge González (es), Kjartan Maraas (nb),
+  Yannig Marchegay (Kokoyaya) (oc), Theppitak Karoonboonyanan (th), Clytie
+  Siddall (vi)
+
+2.23.34
+=======
+
+Thanks to Thomas Thurman for improvements in this version.
+
+  - Commenting and tidying (Thomas)
+  - Fix possible compositor crash (Thomas) (#530702)
+
+Translations
+  Khaled Hosny (ar), Yavor Doganov (bg), Jorge González (es), Kjartan Maraas (nb),
+  Yannig Marchegay (Kokoyaya) (oc), Theppitak Karoonboonyanan (th), Clytie
+  Siddall (vi)
+
+2.23.34
+=======
+
+Thanks to Thomas Thurman for improvements in this version.
+
+  - Various commenting (Thomas)
+  - Ensure you can turn off compositor with "configure" (Thomas)
+  - Ensure you can turn off gconf with "configure" (Thomas) (#530870)
+
+Translations
+  Clytie Siddall (vi)
+
+2.23.21
+=======
+
+Thanks to Robert Escriva, Iain Holmes, Matt Krai, Thomas Thurman,
+and Chris Wang for improvements in this version.
+
+  - Add shadow ability for menus and tooltips (Iain) (#517442) (#517524)
+  - Fix possible crashes in compositor (Iain) (#534569) (#528787)
+  - Major reorganisation of compositor code (Iain)
+  - Initial version of XRender backend for the compositor (Iain)
+  - New basic public API for compositor (Iain)
+  - Window decoration updates colour when GTK theme changes (Robert) (#511826)
+  - Minor code cleanup for pedantic compilers (Thomas)
+  - Further code cleanup for pedantic compilers (Matt) (#526049)
+  - The atom list appears only once in the code (Thomas) (#530843)
+  - Don't attempt to read attributes of invalid windows (Chris) (#530485)
+
+Translations
+  Khaled Hosny (ar), Gabor Kelemen (hu), Kjartan Maraas (nb), Tino Meinen (nl),
+  Theppitak Karoonboonyanan (th)
+2.23.13
+=======
+
+Thanks to Erwann Chenede and Carlos Garnacho for improvements
+in this version.
+
+  - Re-enable cascading (Erwann) (#529925)
+  - Propagate opacity to frame windows (spec compliance!) (Carlos)
+
+Translations
+  - None this time!
+
+2.23.8
+======
+
+Thanks to Lucas Rocha, Iain Holmes, and Jens Granseuer for improvements
+in this version.
+
+        * No need to symlink to .desktop files (Lucas)
+        * Fixes to compositor's dealings with overlay windows (Iain)
+        * C89 fixes (Jens)
+
+Translators:
+Khaled Hosny (ar), Amitakhya Phukan (as), Ihar Hrachyshka (be@latin),
+Petr Kovar (cs), Rhys Jones (cy), Kenneth Nielsen (da), Andre Klapper (de),
+Jorge González (es), Iñaki Larrañaga Murgoitio (eu), Ilkka Tuohela (fi),
+Claude Paroz (fr), Seán de Búrca (ga), Ignacio Casal Quinteiro (gl),
+Yuval Tanny (he), Gabor Kelemen (hu), Luca Ferretti (it), Takeshi AIHANA (ja),
+Shankar Prasad (kn), Changwoo Ryu (ko), Arangel Angov (mk), sandeep shedmake (mr),
+Kjartan Maraas (nb), Nabin Gautam (ne), Wouter Bolsterlee (nl),
+Eskild Hustvedt (nn), Yannig Marchegay (Kokoyaya) (oc), Tomasz Dominikowski (pl),
+Duarte Loreto (pt), Vasiliy Faronov (ru), Daniel Nylander (sv),
+Theppitak Karoonboonyanan (th), Baris Cicek (tr), Maxim Dziumanenko (uk),
+Clytie Siddall (vi), Woodman Tuen (zh_HK), Woodman Tuen (zh_TW)
+2.23.5
+======
+
+Thanks to Lucas Rocha, Owen Taylor, and Thomas Thurman for improvements in this
+version.
+
+  - Updates of useless preferences don't crash (Thomas) (#526016)
+  - Compliance with new gnome-session (Lucas) (#525051)
+  - Preview widget doesn't crash on broken themes (Thomas) (Launchpad 199402)
+  - Initially iconic windows don't unminimise (Owen) (#491090)
+  - Move ~/.metacity to ~/.config/metacity (Thomas) (#518596)
+  - Metacity doesn't stay around when replaced (Thomas)
+  - Extra check for null return in a function (Thomas)
+  - Displays are singletons, simplifying code (Thomas) (#499301)
+
+Translations
+  Jorge González (es), Eskild Hustvedt (nn), Baris Cicek (tr), Clytie Siddall (vi)
+
+2.23.3
+======
+
+Thanks to Marco Pesenti Gritti, Iain Holmes, Josh Lee, Thomas Thurman, and
+Matthew Wilson for improvements in this version.
+
+  - Workspaces whose name is the same as the standard name, plus some string,
+    are not cut off. (Thomas) (#453678)
+  - Improve compositor performance (Iain) (#522166)
+  - Draw wallpaper correctly when we start up with compositor
+    (Iain) (#522599)
+  - Several other smaller compositor fixes (Iain)
+  - Don't draw shadows on shaped windows unless they have frames
+    (Iain) (#505333)
+  - Newly-created keep-above windows get focus (Marco) (#519188)
+  - Allow moving workspace when dragging with modifier key (Matthew)
+    (#474195)
+
+Translations
+  Kenneth Nielsen (da), Gabor Kelemen (hu), Vasiliy Faronov (ru), Daniel
+  Nylander (sv), Maxim Dziumanenko (uk), Woodman Tuen (zh_HK)
+
+2.23.2
+======
+
+Removed some debug statements introduced in 2.23.1.  Brown paper bag release.
+
+
+2.23.1
+======
+
+Thanks to Cosimo Cecchi, Jens Granseuer, Jim Huang, Andrea Del Signore, and
+Thomas Thurman for improvements in this version.
+
+(Cosimo's patch was very similar to another received from Jason Ribero.)
+
+  - Allow horizontal and vertical maximisation using the mouse (Cosimo/Jason)
+    (#358674)
+  - Allow "spacer" as a value for buttons, for blank space (Andrea) (#509165)
+  - Remove unused code (Jim)
+  - refactor preferences handling (Thomas)
+  - make sure we're valid C89 (Jens) (#518917)
+  - some messing with tool scripts (Thomas)
+
+Translations
+  Jorge González (es), Claude Paroz (fr), Woodman Tuen (zh_HK), Woodman
+  Tuen (zh_TW)
+
+2.23.0
+======
+
+Thanks to Matthias Clasen, Mikkel Kamstrup Erlandsen, Jim Huang, Thomas Thurman,
+and Thomas Wood for improvements in this version.
+
+  - the preview widget can draw shaped windows properly! (Thomas W, #460018)
+  - refactored handling of boolean and enumerated gconf preferences;
+    refactoring of string and integer preferences will follow shortly (Thomas T)
+  - Applications asking to move and resize windows at the same time have
+    both their requests granted (Mikkel) (#448183)
+  - Windows marked "skip taskbar" don't appear in the ctrl-alt-tab list
+    (Matthias) (#106249)
+  - fix session management detection (Thomas T) (#328210)
+  - when resizing with the keyboard, the cursor stays on a window edge if
+    you escape, whichever direction you were going (Thomas T) (#436257)
+  - fix major breakage when gconf was turned off in configure (Jim) (#515019)
+  - fix major breakage when verbose was turned off in configure (Jim) (#515152)
+  - fix name of verbose option in help (Thomas T)
+  - various bits of messing around with release scripts (Thomas T)
+
+Translations
+  Ihar Hrachyshka (be@latin), Ilkka Tuohela (fi), Ignacio Casal Quinteiro (gl),
+  Shankar Prasad (kn), Changwoo Ryu (ko), Nabin Gautam (ne), Wouter Bolsterlee (nl)
+
+2.21.13
+=======
+
+Thanks to Michael Meeks and Thomas Thurman for improvements in this version.
+
+  - Only use compositor version if we have a compositor (Thomas) (#514453)
+  - Remove workaround for a problem in an ancient GTK version (Thomas) (#513737)
+  - Compositor efficiency fixes (Michael)
+  - Various tools added (Thomas)
+
+Translations
+  Amitakhya Phukan (as), Rhys Jones (cy), Andre Klapper (de), Takeshi AIHANA (ja),
+  Arangel Angov (mk), Tomasz Dominikowski (pl), Duarte Loreto (pt)
+
 2.21.8
 ======

--- a/84
+++ b/84
@@ -12,7 +12,7 @@ The stable releases so far are 2.4.x, 2.6.x, 2.8.[01], 2.8.1.x, 2.8.5-,
 Unstable branches are 2.3.x, 2.5.x, 2.8.2-4, 2.9.x, 2.11.x, 2.13.x,
 2.15.x, 2.17.x.

-COMPILING METACITY
+COMPILING MUTTER
 ===

 You need GTK+ 2.2.  For startup notification to work you need
@@ -20,6 +20,7 @@ libstartup-notification at
 http://www.freedesktop.org/software/startup-notification/ or on the
 GNOME ftp site. You also need GConf 1.2 (unless building a funky
 extra-small embedded metacity with --disable-gconf, see below).
+You need Clutter 1.0. You need gobject-introspection 0.6.3.

 REPORTING BUGS AND SUBMITTING PATCHES
 ===
@@ -36,47 +37,11 @@ Feel free to send patches too; Metacity is relatively small and
 simple, so if you find a bug or want to add a feature it should be
 pretty easy.  Send me mail, or put the patch in bugzilla.

-See the HACKING file for some notes on hacking Metacity.
+See the HACKING file for some notes on hacking Mutter.

-SHRINKING METACITY
+MUTTER FEATURES
 ===

-Not that metacity is huge, but a substantial amount of code is in
-preferences handling, in static strings that aren't essential, and in
-the theme engine.
-
-You can strip about 70K from the metacity binary by compiling with 
-options such as:
-
- --disable-gconf
- --disable-sm
- --disable-verbose 
- --disable-startup-notification
-
-However the result is no good for desktop use, all prefs have to be
-hardcoded in the binary, for example. If you wanted to make a really
-small metacity, here's some additional stuff you might consider
-implementing:
- 
- - add --disable-themes, which would replace theme.c and theme-parser.c 
-   with a hardcoded implementation of the interface in theme.h, 
-   should save about 80K. This should be fairly easy.
-
- - add --disable-gtk, which would implement the interface in ui.h
-   without using GTK. This one is easier than you think because the
-   main part of the window manager doesn't use GTK directly, but is
-   still fairly hard to do.  You would probably have to give up some
-   of the features, such as window menus, as menus are pretty complex
-   to implement well.  So time may be better spent adding a GTK
-   configure script feature to build GTK with only a small core set of
-   functionality.
-
-METACITY FEATURES
-===
-
- - Boring window manager for the adult in you. Many window managers
-   are like Marshmallow Froot Loops; Metacity is like Cheerios.
-
 - Uses GTK+ 2.0 for drawing window frames. This means colors, fonts, 
   etc. come from GTK+ theme.

@@ -132,8 +97,6 @@ METACITY FEATURES
   Also try the GNOME keyboard shortcuts control panel, or
   gconf-editor.

-   See metacity.schemas for all available bindings.
-
 - Window keybindings:

    Alt-space         window menu
@@ -185,13 +148,13 @@ METACITY FEATURES

 - Session management:

-    Metacity connects to the session manager and will set itself up to
+    Mutter connects to the session manager and will set itself up to
     be respawned. It theoretically restores sizes/positions/workspace
     for session-aware applications.

- - Metacity implements much of the EWMH window manager specification
+ - Mutter implements much of the EWMH window manager specification
   from freedesktop.org, as well as the older ICCCM.  Please refer to
-   the COMPLIANCE file for information on metacity compliance with
+   the COMPLIANCE file for information on mutter compliance with
   these standards.

 - Uses Pango to render text, so has cool i18n capabilities. 
@@ -210,7 +173,7 @@ METACITY FEATURES
 - handles the window manager selection from the ICCCM. Will exit if
   another WM claims it, and can claim it from another WM if you pass
   the --replace argument. So if you're running another
-   ICCCM-compliant WM, you can run "metacity --replace" to replace it
+   ICCCM-compliant WM, you can run "mutter --replace" to replace it
   with Metacity.

 - does basic colormap handling
@@ -220,7 +183,7 @@ METACITY FEATURES
 HOW TO ADD EXTERNAL FEATURES
 ===

-You can write a metacity "plugin" such as a pager, window list, icon
+You can write a mutter "plugin" such as a pager, window list, icon
 box, task menu, or even things like "window matching" using the
 Extended Window Manager Hints. See http://www.freedesktop.org for the
 EWMH specification. An easy-to-use library called "libwnck" is
@@ -228,10 +191,10 @@ available that uses the EWMH and is specifically designed for writing
 WM accessories.

 You might be interested in existing accessories such as "Devil's Pie"
-by Ross Burton, which add features to Metacity (or other
+by Ross Burton, which add features to Mutter (or other
 EWMH-compliant WMs).

-METACITY BUGS, NON-FEATURES, AND CAVEATS
+MUTTER BUGS, NON-FEATURES, AND CAVEATS
 ===

 See bugzilla: http://bugzilla.gnome.org/query.cgi
@@ -270,26 +233,15 @@ A: If it makes sense to turn on unconditionally, or is genuinely a
   http://pobox.com/~hp/free-software-ui.html
   http://pobox.com/~hp/features.html   

-Q: Will Metacity be part of GNOME?
+Q: Will Mutter be part of GNOME?

-A: It is officially part of GNOME as of GNOME 2.2. Prior to that, 
-   it was unofficially shipped as the default GNOME WM by several 
-   OS vendors.
+A: It is not officially part of GNOME as of GNOME 2.27. We are
+   hoping to have mutter officially included as of GNOME 2.28. 

-Q: Is Metacity a Red Hat project?
-
-A: Metacity's original creation was in no way funded, endorsed, or
-   encouraged by Red Hat, Inc. - I'm guessing Red Hat would not
-   consider "insufficient number of window managers for Linux" an
-   urgent problem. Just a wild guess though.
-
-   Now that metacity is the default WM however, Red Hat supports some
-   bugfixing and other work.
- 
-Q: Why does Metacity remember the workspace/position of some apps 
+Q: Why does Mutter remember the workspace/position of some apps 
   but not others across logout/login?

-A: Metacity only stores sizes/positions for apps that are session
+A: Mutter only stores sizes/positions for apps that are session
   managed. As far as I can determine, there is no way to attempt to
   remember workspace/position for non-session-aware apps without
   causing a lot of weird effects.
@@ -304,7 +256,7 @@ A: Metacity only stores sizes/positions for apps that are session
   place. And in fact I see a lot of bugs like this in window managers
   that try to handle non-session-aware apps.

-   However, for session-aware apps, Metacity can tell that the
+   However, for session-aware apps, Mutter can tell that the
   application instance is from the session and thus restore it
   reliably, assuming the app properly restores the windows it had 
   open on session save.
@@ -456,7 +408,7 @@ A: There are quite a few, though many opportunities remain.  Sometimes

   - and much more.

-Q: I think metacity sucks.
+Q: I think mutter sucks.

 A: Feel free to use any WM you like. The reason metacity follows the
   ICCCM and EWMH specifications is that it makes metacity a modular,
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,10 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 # Run this to generate all the initial makefiles, etc.

 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.

-PKG_NAME="metacity"
+PKG_NAME="mutter"
 REQUIRED_AUTOMAKE_VERSION=1.10

 (test -f $srcdir/configure.in \
@@ -15,7 +15,8 @@ REQUIRED_AUTOMAKE_VERSION=1.10
 }

 which gnome-autogen.sh || {
-    echo "You need to install gnome-common from the GNOME CVS"
+    echo "You need to install gnome-common from GNOME Subversion (or from"
+    echo "your distribution's package manager)."
    exit 1
 }
 USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
--- a/configure.in
+++ b/configure.in
@@ -1,26 +1,42 @@
 AC_PREREQ(2.50)

-m4_define([metacity_major_version], [2])
-m4_define([metacity_minor_version], [21])
+m4_define([mutter_major_version], [2])
+m4_define([mutter_minor_version], [27])
 # Fibonacci sequence for micro version numbering:
 # 0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610, 987
-m4_define([metacity_micro_version], [8])
+m4_define([mutter_micro_version], [2])

-m4_define([metacity_version],
-          [metacity_major_version.metacity_minor_version.metacity_micro_version])
-AC_INIT([metacity], [metacity_version],
-        [http://bugzilla.gnome.org/enter_bug.cgi?product=metacity])
+m4_define([mutter_version],
+          [mutter_major_version.mutter_minor_version.mutter_micro_version])
+
+m4_define([mutter_plugin_api_version], [2])
+
+AC_INIT([mutter], [mutter_version],
+        [http://bugzilla.gnome.org/enter_bug.cgi?product=mutter])

 AC_CONFIG_SRCDIR(src/core/display.c)
 AC_CONFIG_HEADERS(config.h)

-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip])
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([no])],)
 AM_MAINTAINER_MODE

+MUTTER_MAJOR_VERSION=mutter_major_version
+MUTTER_MINOR_VERSION=mutter_minor_version
+MUTTER_MICRO_VERSION=mutter_micro_version
+MUTTER_PLUGIN_API_VERSION=mutter_plugin_api_version
+AC_SUBST(MUTTER_MAJOR_VERSION)
+AC_SUBST(MUTTER_MINOR_VERSION)
+AC_SUBST(MUTTER_MICRO_VERSION)
+AC_SUBST(MUTTER_PLUGIN_API_VERSION)
+
+MUTTER_PLUGIN_DIR="$libdir/$PACKAGE/plugins"
+AC_SUBST(MUTTER_PLUGIN_DIR)
+
 # Honor aclocal flags
 AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}")

-GETTEXT_PACKAGE=metacity
+GETTEXT_PACKAGE=mutter
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Name of default gettext domain])

@@ -31,7 +47,10 @@ AC_HEADER_STDC
 AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL

-#### Integer sizes 
+# Sets GLIB_GENMARSHAL and GLIB_MKENUMS
+AM_PATH_GLIB_2_0()
+
+#### Integer sizes

 AC_CHECK_SIZEOF(char)
 AC_CHECK_SIZEOF(short)
@@ -107,7 +126,7 @@ if test "x$GCC" = "xyes"; then
 fi
 changequote([,])dnl

-METACITY_PC_MODULES='gtk+-2.0 >= 2.10.0 pango >= 1.2.0'
+MUTTER_PC_MODULES='gtk+-2.0 >= 2.10.0 pango >= 1.2.0'

 AC_ARG_ENABLE(gconf,
  AC_HELP_STRING([--disable-gconf],
@@ -116,12 +135,12 @@ AC_ARG_ENABLE(gconf,

 if test x$enable_gconf = xyes; then
    AC_DEFINE(HAVE_GCONF,1,[Build with gconf support])
-    METACITY_PC_MODULES="$METACITY_PC_MODULES gconf-2.0 >= 1.2.0"
+    MUTTER_PC_MODULES="$MUTTER_PC_MODULES gconf-2.0 >= 1.2.0"
 fi

 AC_ARG_ENABLE(verbose-mode,
-  AC_HELP_STRING([--disable-verbose],
-                 [disable metacity's ability to do verbose logging, for embedded/size-sensitive custom builds]),,
+  AC_HELP_STRING([--disable-verbose-mode],
+                 [disable mutter's ability to do verbose logging, for embedded/size-sensitive custom builds]),,
  enable_verbose_mode=yes)

 if test x$enable_verbose_mode = xyes; then
@@ -130,32 +149,27 @@ fi

 AC_ARG_ENABLE(sm,
  AC_HELP_STRING([--disable-sm],
-                 [disable metacity's session management support, for embedded/size-sensitive custom non-GNOME builds]),,
+                 [disable mutter's session management support, for embedded/size-sensitive custom non-GNOME builds]),,
  enable_sm=auto)

 AC_ARG_ENABLE(startup-notification,
  AC_HELP_STRING([--disable-startup-notification],
-                 [disable metacity's startup notification support, for embedded/size-sensitive custom non-GNOME builds]),,
+                 [disable mutter's startup notification support, for embedded/size-sensitive custom non-GNOME builds]),,
  enable_startup_notification=auto)

-AC_ARG_ENABLE(compositor,
-  AC_HELP_STRING([--disable-compositor],
-                 [disable metacity's compositing manager]),,
-  enable_compositor=auto)
+AC_ARG_WITH(introspection,
+  AC_HELP_STRING([--without-introspection],
+                 [disable the use of GObject introspection]),,
+  with_introspection=auto)

 AC_ARG_ENABLE(xsync,
  AC_HELP_STRING([--disable-xsync],
-                 [disable metacity's use of the XSync extension]),,
+                 [disable mutter's use of the XSync extension]),,
  enable_xsync=auto)

-AC_ARG_ENABLE(render,
-  AC_HELP_STRING([--disable-render],
-                 [disable metacity's use of the RENDER extension]),,
-  enable_render=auto)
-
 AC_ARG_ENABLE(shape,
  AC_HELP_STRING([--disable-shape],
-                 [disable metacity's use of the shaped window extension]),,
+                 [disable mutter's use of the shaped window extension]),,
  enable_shape=auto)

 ## try definining HAVE_BACKTRACE
@@ -164,17 +178,11 @@ AC_CHECK_HEADERS(execinfo.h, [AC_CHECK_FUNCS(backtrace)])
 AM_GLIB_GNU_GETTEXT

 ## here we get the flags we'll actually use
-# GOptionEntry requires	glib-2.6.0    
+# GOptionEntry requires	glib-2.6.0
 PKG_CHECK_MODULES(ALL, glib-2.0 >= 2.6.0)
-# gtk_window_set_icon_name requires gtk2+-2.60
-PKG_CHECK_MODULES(METACITY_MESSAGE, gtk+-2.0 >= 2.6.0)
-PKG_CHECK_MODULES(METACITY_WINDOW_DEMO, gtk+-2.0 >= 2.6.0)
-
-if $PKG_CONFIG --atleast-version 1.2.0 pangoxft; then
-   echo "pangoxft found"
-else
-   AC_MSG_ERROR("Pango 1.2.0 or greater based on Xft2 is required")
-fi
+# gtk_window_set_icon_name requires gtk2+-2.6.0
+PKG_CHECK_MODULES(MUTTER_MESSAGE, gtk+-2.0 >= 2.6.0)
+PKG_CHECK_MODULES(MUTTER_WINDOW_DEMO, gtk+-2.0 >= 2.6.0)

 # Unconditionally use this dir to avoid a circular dep with gnomecc
 GNOME_KEYBINDINGS_KEYSDIR="${datadir}/gnome-control-center/keybindings"
@@ -200,76 +208,69 @@ fi

 if test x$have_startup_notification = xyes; then
  echo "Building with libstartup-notification"
-  METACITY_PC_MODULES="$METACITY_PC_MODULES libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION"
+  MUTTER_PC_MODULES="$MUTTER_PC_MODULES libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION"
  AC_DEFINE(HAVE_STARTUP_NOTIFICATION, , [Building with startup notification support])
 else
  echo "Building without libstartup-notification"
 fi

-## init this, it gets set either in the compositor check below 
-## or the render-specific check later
-have_xrender=no
-
 XCOMPOSITE_VERSION=0.2
+
 AC_MSG_CHECKING([Xcomposite >= $XCOMPOSITE_VERSION])
 if $PKG_CONFIG --atleast-version $XCOMPOSITE_VERSION xcomposite; then
-   have_xcomposite=yes
-else
-   have_xcomposite=no
-fi
-AC_MSG_RESULT($have_xcomposite)
-
-if test x$enable_compositor = xyes; then
-   have_xcomposite=yes
-   echo "CompositeExt support forced on"
-elif test x$enable_compositor = xauto; then
-   echo "Building compositing manager by default now."
-   have_xcomposite=yes
-else
-   have_xcomposite=no
-fi
-
-if test x$have_xcomposite = xyes; then
-  echo "Building with CompositeExt"
-  METACITY_PC_MODULES="$METACITY_PC_MODULES xcomposite >= $XCOMPOSITE_VERSION xfixes xrender xdamage"
-  AC_DEFINE(HAVE_COMPOSITE_EXTENSIONS, , [Building with compositing manager support])
+  MUTTER_PC_MODULES="$MUTTER_PC_MODULES xcomposite >= $XCOMPOSITE_VERSION xfixes xrender xdamage"
+  AC_DEFINE(HAVE_COMPOSITE_EXTENSIONS, 1, [Building with compositing manager support])
+  echo "Building with compositing manager"

  ## force on render also
  have_xrender=yes
 else
-  echo "Building without compositing manager"
+  AC_MSG_ERROR([no. Mutter requires the Xcomposite extension to build.])
 fi

-## if no compositor, still possibly enable render
-if test x$have_xcomposite = xno; then
-  XRENDER_VERSION=0.0
-  AC_MSG_CHECKING([xrender >= $XRENDER_VERSION])
-  if $PKG_CONFIG --atleast-version $XRENDER_VERSION xrender; then
-     have_xrender=yes
-  else
-     have_xrender=no
-  fi
-  AC_MSG_RESULT($have_xrender)
+CLUTTER_VERSION=1.0.0
+CLUTTER_PACKAGE=clutter-1.0
+AC_SUBST(CLUTTER_PACKAGE)
+if $PKG_CONFIG --atleast-version $CLUTTER_VERSION $CLUTTER_PACKAGE ; then
+  MUTTER_PC_MODULES="$MUTTER_PC_MODULES $CLUTTER_PACKAGE "
+  PKG_CHECK_MODULES(CLUTTER, $CLUTTER_PACKAGE)
+  AC_DEFINE(WITH_CLUTTER, , [Building with Clutter compositor])

-  if test x$enable_render = xyes; then
-     have_xrender=yes
-     echo "Render support forced on"
-  elif test x$enable_render = xauto; then
-     true
-  else
-     have_xrender=no
-  fi
+  dnl Check for the clutter-glx-texture-pixmap header
+  mutter_save_cppflags="$CPPFLAGS"
+  CPPFLAGS="$CPPFLAGS $CLUTTER_CFLAGS"
+  AC_CHECK_HEADER([clutter/glx/clutter-glx-texture-pixmap.h],
+                  [have_glx_texture_pixmap=yes],
+                  [have_glx_texture_pixmap=no])
+  CPPFLAGS="$mutter_save_cppflags"

-  if test x$have_xrender = xyes; then
-     echo "Building with Render"
-     METACITY_PC_MODULES="$METACITY_PC_MODULES xrender >= $XRENDER_VERSION"
+  if test x$have_glx_texture_pixmap = xyes; then
+    AC_DEFINE(HAVE_GLX_TEXTURE_PIXMAP, ,
+              [Is ClutterGLXTexturePixmap available?])
  fi
-fi ## have_composite
-
-if test x$have_xrender = xyes; then
-  AC_DEFINE(HAVE_RENDER, , [Building with Render extension support])
+else
+  AC_MSG_ERROR([no. Mutter requires Clutter version $CLUTTER_VERSION.])
 fi

+if test x$with_introspection != xno; then
+  PKG_CHECK_MODULES(INTROSPECTION, gobject-introspection-1.0, have_introspection=yes, have_introspection=no)
+  if test x$have_introspection=xyes; then
+    MUTTER_PC_MODULES="$MUTTER_PC_MODULES gobject-introspection-1.0"
+    AC_DEFINE(HAVE_INTROSPECTION, 1, [Define if GObject introspection is available])
+    G_IR_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
+    AC_SUBST(G_IR_SCANNER)
+    G_IR_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
+    AC_SUBST(G_IR_COMPILER)
+    G_IR_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
+    AC_SUBST(G_IR_GENERATE)
+    GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
+    AC_SUBST(GIRDIR)
+    TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+    AC_SUBST(TYPELIBDIR)
+  fi
+fi
+AM_CONDITIONAL(WITH_INTROSPECTION, test "$have_introspection" = "yes")
+
 AC_MSG_CHECKING([Xcursor])
 if $PKG_CONFIG xcursor; then
     have_xcursor=yes
@@ -280,23 +281,23 @@ if $PKG_CONFIG xcursor; then

 if test x$have_xcursor = xyes; then
  echo "Building with Xcursor"
-  METACITY_PC_MODULES="$METACITY_PC_MODULES xcursor"
-  AC_DEFINE(HAVE_XCURSOR, , [Building with Xcursor support]) 
+  MUTTER_PC_MODULES="$MUTTER_PC_MODULES xcursor"
+  AC_DEFINE(HAVE_XCURSOR, , [Building with Xcursor support])
 fi

-PKG_CHECK_MODULES(METACITY, $METACITY_PC_MODULES)
+PKG_CHECK_MODULES(MUTTER, $MUTTER_PC_MODULES)

 AC_PATH_XTRA

 ALL_X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"

 # Check for Xinerama extension (Solaris impl or Xfree impl)
-metacity_save_cppflags="$CPPFLAGS"
+mutter_save_cppflags="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $X_CFLAGS"

 AC_ARG_ENABLE(xinerama,
  AC_HELP_STRING([--disable-xinerama],
-                 [disable metacity's use of the Xinerama extension]),
+                 [disable mutter's use of the Xinerama extension]),
  try_xinerama=$enable_xinerama,try_xinerama=yes)

 use_solaris_xinerama=no
@@ -318,7 +319,7 @@ if test "${try_xinerama}" != no; then
                                AC_DEFINE(HAVE_XINERAMA, , [Have some version of Xinerama]),
                                use_solaris_xinerama=no,
                                [#include <X11/Xlib.h>])
-            fi	
+            fi
            AC_MSG_CHECKING(for Xinerama support on Solaris)
            AC_MSG_RESULT($use_solaris_xinerama);
            ;;
@@ -327,12 +328,12 @@ if test "${try_xinerama}" != no; then
            use_xfree_xinerama=yes
            AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
                [AC_CHECK_HEADER(X11/extensions/Xinerama.h,
-                                 X_EXTRA_LIBS="-lXinerama $X_EXTRA_LIBS"   
+                                 X_EXTRA_LIBS="-lXinerama $X_EXTRA_LIBS"
                                 if test -z "`echo $ALL_X_LIBS | grep "\-lXext" 2> /dev/null`"; then
                                     X_EXTRA_LIBS="-lXext $X_EXTRA_LIBS"
                                 fi
                                 AC_DEFINE(HAVE_XFREE_XINERAMA, , [Have XFree86-style Xinerama])
-                                 AC_DEFINE(HAVE_XINERAMA,, [Have some version of Xinerama]), 
+                                 AC_DEFINE(HAVE_XINERAMA,, [Have some version of Xinerama]),
                                 use_xfree_xinerama=no,
                                 [#include <X11/Xlib.h>])],
                use_xfree_xinerama=no, -lXext $ALL_X_LIBS)
@@ -342,7 +343,7 @@ if test "${try_xinerama}" != no; then
    esac
 fi

-CPPFLAGS="$metacity_save_cppflags"
+CPPFLAGS="$mutter_save_cppflags"

 SHAPE_LIBS=
 found_shape=no
@@ -413,21 +414,21 @@ if test "x$found_xsync" = "xyes"; then
   AC_DEFINE(HAVE_XSYNC, , [Have the Xsync extension library])
 fi

-METACITY_LIBS="$METACITY_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
-METACITY_MESSAGE_LIBS="$METACITY_MESSAGE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
-METACITY_WINDOW_DEMO_LIBS="$METACITY_WINDOW_DEMO_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
-METACITY_PROPS_LIBS="$METACITY_PROPS_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+MUTTER_LIBS="$MUTTER_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lm"
+MUTTER_MESSAGE_LIBS="$MUTTER_MESSAGE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+MUTTER_WINDOW_DEMO_LIBS="$MUTTER_WINDOW_DEMO_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+MUTTER_PROPS_LIBS="$MUTTER_PROPS_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"

 found_sm=no
-case "$METACITY_LIBS" in
+case "$MUTTER_LIBS" in
 *-lSM*)
    found_sm=yes
    ;;
 *)
-  AC_CHECK_LIB(SM, SmcSaveYourselfDone, 
+  AC_CHECK_LIB(SM, SmcSaveYourselfDone,
               [AC_CHECK_HEADERS(X11/SM/SMlib.h,
-                                METACITY_LIBS="-lSM -lICE $METACITY_LIBS" found_sm=no)],
-               , $METACITY_LIBS)
+                                MUTTER_LIBS="-lSM -lICE $MUTTER_LIBS" found_sm=yes)],
+               , $MUTTER_LIBS)
    ;;
 esac

@@ -446,7 +447,7 @@ if test "$found_sm" = "yes"; then
   AC_DEFINE(HAVE_SM, , [Building with SM support])
 fi

-AM_CONDITIONAL(HAVE_SM, test "$found_sm" = "yes") 
+AM_CONDITIONAL(HAVE_SM, test "$found_sm" = "yes")

 HOST_ALIAS=$host_alias
 AC_SUBST(HOST_ALIAS)
@@ -459,13 +460,7 @@ fi

 AC_SUBST(GDK_PIXBUF_CSOURCE)

-## hack to work with old GTK versions for now 
-save_LDFLAGS=$LDFLAGS
-LDFLAGS="$METACITY_LIBS $LDFLAGS"
-AC_CHECK_FUNCS(gdk_pixbuf_new_from_stream)
-LDFLAGS=$save_LDFLAGS
-
-if test x$enable_gconf = xyes; then 
+if test x$enable_gconf = xyes; then
   AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
   if test x"$GCONFTOOL" = xno; then
     AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
@@ -477,21 +472,36 @@ else
  GCONF_SCHEMAS_INSTALL_FALSE=
 fi

+AC_PATH_PROG(ZENITY, zenity, no)
+if test x"$ZENITY" = xno; then
+  AC_MSG_ERROR([zenity not found in your path - needed for dialogs])
+fi
+
 AC_ARG_ENABLE(debug,
 	[  --enable-debug		enable debugging],,
 	enable_debug=no)
 if test "x$enable_debug" = "xyes"; then
-	CFLAGS="$CFLAGS -g -O -Wall"
+	CFLAGS="$CFLAGS -g -O"
 fi
+
+# Warnings are there for a reason
+if test "x$GCC" = "xyes"; then
+  CFLAGS="$CFLAGS -Wall -Werror -ansi"
+fi
+
+# Use gnome-doc-utils:
+GNOME_DOC_INIT([0.8.0])
+
 AC_CONFIG_FILES([
 Makefile
 doc/Makefile
 doc/man/Makefile
 src/Makefile
 src/wm-tester/Makefile
-src/libmetacity-private.pc
+src/libmutter-private.pc
+src/mutter-plugins.pc
 src/tools/Makefile
-src/themes/Makefile
+src/compositor/plugins/Makefile
 po/Makefile.in
 ])

@@ -507,14 +517,14 @@ fi
 if test x$enable_verbose_mode = xno; then
        echo "*** WARNING WARNING WARNING WARNING WARNING"
        echo "*** Building without verbose mode"
-        echo "*** This means there's no way to debug metacity problems."
-        echo "*** Please build normal desktop versions of metacity"
+        echo "*** This means there's no way to debug mutter problems."
+        echo "*** Please build normal desktop versions of mutter"
        echo "*** with verbose mode enabled so users can use it when they report bugs."
 fi

 dnl ==========================================================================
 echo "
-metacity-$VERSION:
+mutter-$VERSION:

 	prefix:                   ${prefix}
 	source code location:	  ${srcdir}
@@ -524,21 +534,20 @@ metacity-$VERSION:
 	XFree86 Xinerama:         ${use_xfree_xinerama}
 	Solaris Xinerama:         ${use_solaris_xinerama}
 	Startup notification:     ${have_startup_notification}
-	Compositing manager:      ${have_xcomposite}
+	Introspection:            ${have_introspection}
 	Session management:       ${found_sm}
 	Shape extension:          ${found_shape}
-	Resize-and-rotate:        ${found_randr}
 	Xsync:                    ${found_xsync}
-	Render:                   ${have_xrender}
 	Xcursor:                  ${have_xcursor}
 "

-METACITY_MINOR_VERSION=metacity_minor_version
-if test $(( $(echo $METACITY_MINOR_VERSION) %2)) == "1"; then
-   stable_version=$(( ($METACITY_MINOR_VERSION / 2) * 2))
-   echo "This is the UNSTABLE branch of metacity"
+
+MUTTER_MINOR_VERSION=mutter_minor_version
+if expr $MUTTER_MINOR_VERSION % 2 > /dev/null ; then
+   stable_version=`expr $MUTTER_MINOR_VERSION - 1`
+   echo "This is the UNSTABLE branch of mutter"
   echo -n "Use 2.$stable_version.x for stable "
   echo    "(gnome-2-$stable_version branch in Subversion)"
 else
-   echo "This is the stable branch of metacity"
+   echo "This is the stable branch of mutter"
 fi
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = man 
+SUBDIRS = man

-EXTRA_DIST=theme-format.txt metacity-theme.dtd dialogs.txt code-overview.txt \
+EXTRA_DIST=theme-format.txt dialogs.txt code-overview.txt \
 	how-to-get-focus-right.txt
--- a/doc/compositor-control.txt
+++ b/doc/compositor-control.txt
@@ -42,5 +42,5 @@ options you can set are:
      menus zooming, dialogues being semi-transparent, and so on. Try it
      and see whether you like it.

-If you have any problems, ask on metacity-devel-list@gnome.org, or
+If you have any problems, ask on mutter-devel-list@gnome.org, or
 #gnome-hackers on gimpnet, or come and find me (tthurman at gnome) and ask.
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -1,3 +1,4 @@
-man_MANS = metacity.1 metacity-theme-viewer.1 metacity-window-demo.1
+man_MANS = mutter.1 mutter-theme-viewer.1 \
+	   mutter-window-demo.1 mutter-message.1

 EXTRA_DIST = $(man_MANS)
--- a/doc/man/mutter-message.1
+++ b/doc/man/mutter-message.1
@@ -0,0 +1,60 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.\" -----
+.\" This file was confirmed to be licenced under the GPL
+.\" by its author and copyright holder, Akira TAGOH, on June 1st 2008:
+.\"
+.\" > I'm comfortable with DFSG-free. that sounds great if you think it's
+.\" > useful and worth containing it in upstream.
+.\" ...
+.\" > Right I know. any licenses that is DFSG-free, I'm ok with whatever,
+.\" > since I have contributed that for Debian. so GPL is no problem for me.
+.\" -----
+.TH MUTTER\-MESSAGE 1 "28 August 2002"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+MUTTER\-MESSAGE \- a command to send a message to Mutter
+.SH SYNOPSIS
+.B MUTTER\-MESSAGE
+[restart|reload\-theme|enable\-keybindings|disable\-keybindings]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B mutter\-message\fP.
+This manual page was written for the Debian distribution
+because the original program does not have a manual page.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
+.\" respectively.
+\fBmutter\-message\fP send a specified message to \fBmutter\fP(1).
+.SH OPTIONS
+.TP
+.B restart
+Restart \fBmutter\fP(1) which is running.
+.TP
+.B reload-theme
+Reload a theme which is specified on gconf database.
+.TP
+.B enable-keybindings
+Enable all of keybindings which is specified on gconf database.
+.TP
+.B disable-keybindings
+Disable all of keybindings which is specified on gconf database.
+.SH SEE ALSO
+.BR mutter (1)
+.SH AUTHOR
+This manual page was written by Akira TAGOH <tagoh@debian.org>,
+for the Debian GNU/Linux system (but may be used by others).
--- a/doc/man/metacity-theme-viewer.1
+++ b/doc/man/metacity-theme-viewer.1
@@ -3,21 +3,21 @@
 .\"
 .\" Based on template provided by Tom Christiansen <tchrist@jhereg.perl.com>.
 .\" 
-.TH METACITY-THEME-VIEWER 1 "1 June 2004" 
+.TH MUTTER-THEME-VIEWER 1 "1 June 2004" 
 .SH NAME
-metacity-theme-viewer \- view metacity themes
+mutter-theme-viewer \- view mutter themes
 .SH SYNOPSIS
-.B metacity-theme-viewer
+.B mutter-theme-viewer
 [
 .I THEMENAME
 ]
 .SH DESCRIPTION
 .\" Putting a newline after each sentence can generate better output.
-.B metacity-theme-viewer
-allows you to preview any installed Metacity theme.
+.B mutter-theme-viewer
+allows you to preview any installed Mutter theme.
 .PP
-When designing a new Metacity theme, you can use
-.B metacity-theme-viewer
+When designing a new Mutter theme, you can use
+.B mutter-theme-viewer
 to measure the performance of a window frame option, and to preview
 the option.
 .SH OPTIONS
@@ -32,12 +32,12 @@ It is case-sensitive.
 .I /usr/share/themes
 system themes directory
 .TP
-.I /usr/share/themes/*/metacity-1/metacity-theme-1.xml
+.I /usr/share/themes/*/mutter-1/mutter-theme-1.xml
 theme specification file
 .SH AUTHOR
 This manual page was written by Jose M. Moya <josem@die.upm.es>, for
 the Debian  GNU/Linux system (but may be used by others).
 .SH "SEE ALSO"
 .\" Always quote multiple words for .SH
-.BR metacity (1),
-.BR metacity-window-demo (1).
+.BR mutter (1),
+.BR mutter-window-demo (1).
--- a/doc/man/metacity-window-demo.1
+++ b/doc/man/metacity-window-demo.1
@@ -3,11 +3,11 @@
 .\"
 .\" Based on template provided by Tom Christiansen <tchrist@jhereg.perl.com>.
 .\" 
-.TH METACITY-WINDOW-DEMO 1 "1 June 2004" 
+.TH MUTTER-WINDOW-DEMO 1 "1 June 2004" 
 .SH NAME
-metacity-window-demo \- demo of window features
+mutter-window-demo \- demo of window features
 .SH SYNOPSIS
-.B metacity-window-demo
+.B mutter-window-demo
 .SH DESCRIPTION
 .\" Putting a newline after each sentence can generate better output.
 This program demonstrates various kinds of windows that window
@@ -21,5 +21,5 @@ the Debian  GNU/Linux system (but may be used by others).
 .SH "SEE ALSO"
 .\" Always quote multiple words for .SH
 .BR x-window-manager (1),
-.BR metacity (1),
-.BR metacity-theme-viewer (1).
+.BR mutter (1),
+.BR mutter-theme-viewer (1).
--- a/doc/man/metacity.1
+++ b/doc/man/metacity.1
@@ -2,7 +2,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH METACITY 1 "11 February 2006"
+.TH MUTTER 1 "11 February 2006"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -16,25 +16,25 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-METACITY \- minimal GTK2 Window Manager
+MUTTER \- Clutter based compositing GTK2 Window Manager
 .SH SYNOPSIS
-.B metacity
+.B mutter
 [\-\-display=\fIDISPLAY\fP] [\-\-replace] [\-\-sm\-client\-id=\fIID\fP] [\-\-sm\-disable] [\-\-sm\-save\-file=\fIFILENAME\fP] [\-\-version] [\-\-help]
 .SH DESCRIPTION
 This manual page documents briefly
-.B metacity\fP.
+.B mutter\fP.
 .PP
 .\" TeX users may be more comfortable with the \fB<whatever>\fP and
 .\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
 .\" respectively.
-\fBmetacity\fP is a minimal X window manager aimed at nontechnical users and is designed to integrate well with the GNOME desktop.  \fBmetacity\fP lacks some features that may be expected by traditional UNIX or other technical users; these users may want to investigate other available window managers for use with GNOME or standalone.
+\fBmutter\fP is a minimal X window manager aimed at nontechnical users and is designed to integrate well with the GNOME desktop.  \fBmutter\fP lacks some features that may be expected by traditional UNIX or other technical users; these users may want to investigate other available window managers for use with GNOME or standalone.
 .SH OPTIONS
 .TP
 .B \-\-display=DISPLAY
 Connect to X display \fIDISPLAY\fP.
 .TP
 .B \-\-replace
-a window manager which is running is replaced by \fBmetacity\fP.  Users are encouraged to change the GNOME window manager by running the new WM with the --replace or -replace option, and subsequently saving the session.
+a window manager which is running is replaced by \fBmutter\fP.  Users are encouraged to change the GNOME window manager by running the new WM with the --replace or -replace option, and subsequently saving the session.
 .TP
 .B \-\-sm\-client\-id=ID
 Specify a session management \fIID\fP.
@@ -51,10 +51,10 @@ Print the version number.
 .B \-?, \-\-help
 Show summary of options.
 .SH CONFIGURATION
-\fBmetacity\fP configuration can be found under \fIPreferences\fP->\fIWindows\fP and \fIPreferences\fP->\fIKeyboard Shortcuts\fP on the menu-panel. Advanced configuration can be achieved directly through gconf editing (gconf-editor or gconftool-2).
+\fBmutter\fP configuration can be found under \fIPreferences\fP->\fIWindows\fP and \fIPreferences\fP->\fIKeyboard Shortcuts\fP on the menu-panel. Advanced configuration can be achieved directly through gconf editing (gconf-editor or gconftool-2).
 .SH SEE ALSO
-.BR metacity-message (1)
+.BR mutter-message (1)
 .SH AUTHOR
 The original manual page was written by Thom May <thom@debian.org>.  It was updated by Akira TAGOH <tagoh@debian.org>
 for the Debian GNU/Linux system (with permission to use by others), and then updated by Luke Morton and Philip O'Brien
-for inclusion in metacity.
+for inclusion in mutter.
--- a/doc/metacity-theme.dtd
+++ b/doc/metacity-theme.dtd
@@ -1,273 +0,0 @@
-<!--
- DTD for Metacity themes, as of Metacity 2.4.1
- Author: Ross Burton <ross@burtonini.com>
- Copyright (C) 2002 Ross Burton
- Licensed under the GPL, version 2
-->
-
-<!-- Top-level element -->
-<!ELEMENT metacity_theme (info,(window|frame_style_set|frame_style|frame_geometry|constant|draw_ops|menu_icon)+)>
-
-<!-- Theme metadata -->
-<!ELEMENT info (name?|author?|copyright?|date?|description?)*>
-<!ELEMENT name (#PCDATA)>
-<!ELEMENT author (#PCDATA)>
-<!ELEMENT copyright (#PCDATA)>
-<!ELEMENT date (#PCDATA)>
-<!ELEMENT description (#PCDATA)>
-
-<!ENTITY % xyrequired "
-	x			CDATA #REQUIRED
-	y			CDATA #REQUIRED
-">
-
-<!ENTITY % xyimplied "
-	x			CDATA #IMPLIED
-	y			CDATA #IMPLIED
-">
-
-<!ENTITY % widthheightrequired "
-	width		CDATA #REQUIRED
-	height		CDATA #REQUIRED
-">
-
-<!ENTITY % widthheightimplied "
-	width		CDATA #IMPLIED
-	height		CDATA #IMPLIED
-">
-
-<!ENTITY % boolean "(true|false)">
-
-<!ENTITY % piece_positions "
-(entire_background|titlebar|titlebar_middle|left_titlebar_edge|right_titlebar_edge|top_titlebar_edge|bottom_titlebar_edge|title|left_edge|right_edge|bottom_edge|overlay)
-">
-
-<!ENTITY % gtk-state "
-	state (normal|prelight|active|selected|insensitive) #REQUIRED
-">
-
-<!ENTITY % gtk-shadow "
-	shadow (none|in|out|etched_in|etched_out) #REQUIRED
-">
-
-
-<!-- The actual theme -->
-
-<!ELEMENT window EMPTY>
-<!ATTLIST window
-	type		(normal|dialog|modal_dialog|menu|utility|border) #REQUIRED
-	style_set		CDATA #REQUIRED
->
-
-
-<!ELEMENT frame_style_set (frame+)>
-<!ATTLIST frame_style_set
-	name		CDATA #REQUIRED
-	parent		CDATA #IMPLIED
->
-
-<!ELEMENT frame EMPTY>
-<!ATTLIST frame
-	focus		(yes|no) #REQUIRED
-	state		(normal|maximized|shaded|maximized_and_shaded) #REQUIRED
-	resize		(both|horizontal|vertical|none) #IMPLIED
-	style		CDATA #REQUIRED
->
-
-<!ELEMENT frame_style (piece|button)*>
-<!ATTLIST frame_style
-	name		CDATA #REQUIRED
-	geometry		CDATA #REQUIRED
-	parent		CDATA #IMPLIED
->
-
-<!ELEMENT piece (draw_ops?)>
-<!ATTLIST piece
-	position		%piece_positions; #REQUIRED
-	draw_ops		CDATA #IMPLIED
->
-
-<!ELEMENT button (draw_ops?)>
-<!ATTLIST button
-	function		(menu|minimize|maximize|close|left_left_background|left_middle_background|left_right_background|right_left_background|right_middle_background|right_right_background) #REQUIRED
-	state		(normal|prelight|pressed) #REQUIRED
-	draw_ops		CDATA #IMPLIED
->
-
-<!ELEMENT frame_geometry (border|(aspect_ratio|distance))+>
-<!ATTLIST frame_geometry
-	name		CDATA #REQUIRED
-	parent		CDATA #IMPLIED
-	title_scale		(xx-small|x-small|small|medium|large|x-large|xx-large) #IMPLIED
-	has_title		(true|false) 'true'
-	rounded_top_left		%boolean; #IMPLIED
-	rounded_top_right		%boolean; #IMPLIED
-	rounded_bottom_left	%boolean; #IMPLIED
-	rounded_bottom_right	%boolean; #IMPLIED
->
-
-<!ELEMENT distance EMPTY>
-<!ATTLIST distance
-	name		(left_width|right_width|bottom_height|title_vertical_pad|right_titlebar_edge|left_titlebar_edge|button_width|button_height) #REQUIRED
-	value		CDATA #REQUIRED
->
-
-<!ELEMENT border EMPTY>
-<!ATTLIST border
-	name		CDATA #REQUIRED
-	top		CDATA #REQUIRED
-	bottom		CDATA #REQUIRED
-	left		CDATA #REQUIRED
-	right		CDATA #REQUIRED
->
-
-<!ELEMENT aspect_ratio EMPTY>
-<!ATTLIST aspect_ratio
-	name		CDATA #REQUIRED
-	value		CDATA #REQUIRED
->
-
-<!ELEMENT draw_ops (line|rectangle|arc|tint|gradient|image|gtk_arrow|gtk_box|gtk_vline|icon|title|clip|include|tile)*>
-<!-- not sure about this.. maybe it should be removed. see #3478 in theme-parser.c -->
-<!ATTLIST draw_ops
-	name		CDATA #IMPLIED
->
-
-<!ELEMENT line EMPTY>
-<!ATTLIST line
-	color			CDATA #REQUIRED
-	x1			CDATA #REQUIRED
-	y1			CDATA #REQUIRED
-	x2			CDATA #REQUIRED
-	y2			CDATA #REQUIRED
-	width		CDATA #IMPLIED
-	dash_on_length CDATA #IMPLIED
-	dash_off_length CDATA #IMPLIED
->
-
-<!ELEMENT rectangle EMPTY>
-<!ATTLIST rectangle
-	color			CDATA #REQUIRED
-	%xyrequired;
-	%widthheightrequired;
-	filled			%boolean; 'false'
->
-
-<!ELEMENT arc EMPTY>
-<!ATTLIST arc
-	color			CDATA #REQUIRED
-	%xyrequired;
-	%widthheightrequired;
-	start_angle	CDATA	#REQUIRED
-	extent_angle	CDATA	#REQUIRED
-	filled			%boolean; 'false'
->
-
-<!ELEMENT icon EMPTY>
-<!ATTLIST icon
-	%xyrequired;
-	width		CDATA #REQUIRED
-	height		CDATA #REQUIRED
-	alpha		CDATA #IMPLIED
-	fill_type		(tile|scale) 'scale'
->
-
-<!ELEMENT image EMPTY>
-<!ATTLIST image
-	filename		CDATA #REQUIRED
-	colorize		CDATA #IMPLIED
-	%xyrequired;
-	%widthheightrequired;
-	alpha		CDATA #IMPLIED
-	fill_type		(tile|scale) 'scale'
->
-
-<!ELEMENT tile EMPTY>
-<!ATTLIST tile
-	name		CDATA #REQUIRED
-	%xyrequired;
-	%widthheightrequired;
-	tile_xoffset	CDATA #IMPLIED
-	tile_yoffset	CDATA #IMPLIED
-	tile_width		CDATA #REQUIRED
-	tile_height	CDATA #REQUIRED
->
-
-<!ELEMENT clip EMPTY>
-<!ATTLIST clip
-	%xyrequired;
-	%widthheightrequired;
->
-
-<!ELEMENT title EMPTY>
-<!ATTLIST title
-	color			CDATA #REQUIRED
-	%xyrequired;
->
-
-<!ELEMENT tint EMPTY>
-<!ATTLIST tint
-	color			CDATA #REQUIRED
-	%xyrequired;
-	%widthheightrequired;
-	alpha		CDATA #REQUIRED
->
-
-<!ELEMENT gtk_box EMPTY>
-<!ATTLIST gtk_box
-	%gtk-state;
-	%gtk-shadow;
-	%xyrequired;
-	%widthheightrequired;
->
-
-<!ELEMENT gtk_arrow EMPTY>
-<!ATTLIST gtk_arrow
-	%gtk-state;
-	%gtk-shadow;
-	arrow		(up|down|left|right) #REQUIRED
-	%xyrequired;
-	%widthheightrequired;
-	filed			CDATA #IMPLIED
->
-
-<!ELEMENT gtk_vline EMPTY>
-<!ATTLIST gtk_vline
-	%gtk-state;
-	x			CDATA #REQUIRED
-	y1			CDATA #REQUIRED
-	y2			CDATA #REQUIRED
->
-
-<!ELEMENT gradient (color)+>
-<!ATTLIST gradient
-	type		(vertical|horizontal|diagonal) #REQUIRED
-	%xyrequired;
-	%widthheightrequired;
-	alpha		CDATA #IMPLIED
->
-
-<!ELEMENT color EMPTY>
-<!ATTLIST color
-	value		CDATA #REQUIRED
->
-
-<!ELEMENT include EMPTY>
-<!ATTLIST include
-	name		CDATA #REQUIRED
-	%xyimplied;
-	%widthheightimplied;
->
-
-<!ELEMENT constant EMPTY>
-<!ATTLIST constant
-	name		CDATA #REQUIRED
-	value		CDATA #REQUIRED
->
-
-<!ELEMENT menu_icon (draw_ops?)>
-<!ATTLIST menu_icon
-	function		(close|maximize|minimize|unmaximize) #REQUIRED
-	%gtk-state;
-	draw_ops		CDATA #IMPLIED
->
--- a/mutter.doap
+++ b/mutter.doap
@@ -0,0 +1,32 @@
+<Project xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+         xmlns:foaf="http://xmlns.com/foaf/0.1/"
+         xmlns:gnome="http://api.gnome.org/doap-extensions#"
+         xmlns="http://usefulinc.com/ns/doap#">
+
+  <name xml:lang="en">mutter</name>
+  <shortdesc xml:lang="en">Window and compositing manager based on Clutter</shortdesc>
+  <!--
+  <homepage rdf:resource="http://www.gnome.org/" />
+  -->
+  <mailing-list rdf:resource="http://mail.gnome.org/mailman/listinfo/gnome-shell-list" />
+  <download-page rdf:resource="http://download.gnome.org/sources/mutter/" />
+  <bug-database rdf:resource="http://bugzilla.gnome.org/browse.cgi?product=mutter" />
+
+  <category rdf:resource="http://api.gnome.org/doap-extensions#desktop" />
+
+  <maintainer>
+    <foaf:Person>
+      <foaf:name>Tomas Frydrych</foaf:name>
+      <foaf:mbox rdf:resource="mailto:tf@linux.intel.com" />
+      <gnome:userid>tomasf</gnome:userid>
+    </foaf:Person>
+  </maintainer>
+  <maintainer>
+    <foaf:Person>
+      <foaf:name>Owen Taylor</foaf:name>
+      <foaf:mbox rdf:resource="mailto:otaylor@redhat.com" />
+      <gnome:userid>otaylor</gnome:userid>
+    </foaf:Person>
+  </maintainer>
+</Project>
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,718 @@
+2009-04-05  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Updated Norwegian bokmål translation.
+
+2009-03-30  Baris Cicek  <baris@teamforce.name.tr>
+
+	* tr.po: Updated Turkish translation.
+
+2009-03-28  Simos Xenitellis  <simos@gnome.org>
+
+	* el.po: Updated Greek translation.
+
+2009-03-27  Simos Xenitellis  <simos@gnome.org>
+
+	* el.po: Updated Greek translation.
+
+2009-03-21  Goran Rakic <grakic@devbase.net>
+
+	* sr.po, sr@latin.po: Updated Serbian translation by Miloš Popović.
+
+2009-03-19  Tomasz Dominikowski  <tdominikowski@aviary.pl>
+
+	* pl.po: Updated Polish translation
+
+2009-03-19  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Updated Norwegian bokmål translation.
+
+2009-03-18  Ignacio Casal Quinteiro  <icq@gnome.org>
+
+	 * gl.po: Updated Galician translation by Suso Baleato.
+
+2009-03-18  Kostas Papadimas <pkst@gnome.org>
+
+	* el.po: Updated Greek Translation by Fotis Tsamis.
+
+2009-03-18  Djihed Afifi <djihed@gmail.com>
+
+	* ar.po: Updated Arabic translation.
+
+2009-03-17  Alexander Shopov  <ash@contact.bg>
+
+	* bg.po: Updated Bulgarian translation by
+	Alexander Shopov <ash@contact.bg>
+
+2009-03-16  Amitakhya Phukan <amitakhya@svn.gnome.org>
+
+	* as.po: Updated Assamese translations.
+
+2009-03-15  Rajesh Ranjan  <rajeshkajha@yahoo.com>
+
+	* mai.po: added Maithili translation.
+	* LINGUAS: Added Maithili (mai) to the list of Languages.
+
+2009-03-15  Ankitkumar Patel  <ankit@redhat.com>
+
+	* gu.po: Updated Gujarati Translations.
+
+2009-03-14  Gintautas Miliauskas  <gintautas@miliauskas.lt>
+
+	* lt.po: Updated Lithuanian translation.
+
+2009-03-14  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
+
+	* ru.po: Updated Russian translation by Yuriy Penkin.
+
+2009-03-14  Sandeep Shedmake  <sshedmak@redhat.com>
+
+	* mr.po: Updated Marathi Translations.
+
+2009-03-14  Rajesh Ranjan <rranjan@redhat.com>
+
+	* hi.po: Updated Hindi Translation.
+
+2009-03-13  Kostas Papadimas <pkst@gnome.org>
+
+	* el.po: Updated Greek Translation by Jennie Petoumenou.
+
+2009-03-13  Priit Laes  <plaes at svn dot gnome dot org>
+
+	* et.po: Translation updated by Mattias Põldaru
+
+2009-03-12  Manoj Kumar Giri  <mgiri@redhat.com>
+
+	* or.po: Updated Oriya Translation.
+
+2009-03-11  Krishnababu K  <kkrothap@redhat.com>
+
+	* te.po: Updated Telugu Translation.
+	* LINGUAS: Added Telugu [te] language.
+
+2009-03-10  Runa Bhattacharjee  <runab@redhat.com>
+
+	* bn_IN.po: Updated partial Bengali India Translation 
+
+2009-03-08  Petr Kovar  <pknbe@volny.cz>
+
+	* cs.po: Updated Czech translation.
+
+2009-03-07  Mark Krapivner  <mark125@gmail.com>
+
+	* he.po: Updated Hebrew translation.
+
+2009-03-06  Milo Casagrande  <milo@ubuntu.com>
+
+	* it.po: Updated Italian translation by Luca Ferretti.
+
+2009-03-04  Luca Ferretti  <elle.uca@libero.it>
+
+	* it.po: Updated Italian translation
+
+2009-03-02  Claude Paroz  <claude@2xlibre.net>
+
+	* fr.po: Updated French translation by Frédéric Peters and Claude Paroz.
+
+2009-03-02  I. Felix <ifelix@redhat.com>
+
+	* ta.po:  Tamil Translation updated by Tirumurthi Vasudevan
+
+2009-02-28  Duarte Loreto <happyguy_pt@hotmail.com>
+
+	* pt.po: Updated Portuguese translation.
+
+2009-02-23  Philip Withnall  <philip@tecnocode.co.uk>
+
+	* en_GB.po: Updated British English translation.
+
+2009-02-23  Gil Forcada  <gforcada@gnome.org>
+
+	* ca.po: Updated Catalan translation by David Planella.
+
+2009-02-23  Ilkka Tuohela <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2009-02-21  Christian Kirbach  <Christian.Kirbach@googlemail.com>
+
+	* de.po: Updated German translation.
+
+2009-02-20 Og Maciel <ogmaciel@gnome.org>
+
+	* pt_BR.po: Updated Brazilian Portuguese translation by
+	Vladimir Melo.
+
+2009-02-19  Jani Monoses  <jani@ubuntu.com>
+
+	* ro.po: Updated Romanian translation
+	by Adi Roiban <adi@roiban.ro>
+
+2009-02-19  Ilkka Tuohela <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2009-02-18  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
+
+	* zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
+	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
+
+2009-02-18  Changwoo Ryu  <cwryu@debian.org>
+
+	* ko.po: Updated Korean translation.
+
+2009-02-17  Gabor Kelemen  <kelemeng@gnome.hu>
+
+	* hu.po: Translation updated.
+
+2009-02-16  Wouter Bolsterlee  <wbolster@svn.gnome.org>
+
+	* nl.po: Updated Dutch translation by Wouter Bolsterlee.
+
+2009-02-15 Kenneth Nielsen <k.nielsen81@gmail.com>
+
+	* da.po: Updated Danish translation by Ask H. Larsen
+
+2009-02-15  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
+
+	* zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
+	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
+
+2009-02-14  Ihar Hrachyshka <booxter@lacinka.org>
+
+	* be@latin.po: Updated Belarusian Latin translation by Ihar Hrachyshka.
+
+2009-02-13  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+
+	* th.po: Updated Thai translation.
+
+2009-02-12  Inaki Larranaga Murgoitio  <dooteo@euskalgnu.org>
+
+	* eu.po: Updated Basque translation.
+
+2009-02-11  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: Updated Swedish translation.
+
+2009-02-11  Takeshi AIHANA <takeshi.aihana@gmail.com>
+
+	* ja.po: Updated Japanese translation.
+
+2009-02-10  Gil Forcada  <gforcada@gnome.org>
+
+	* ast.po: Updated Asturian translation on behalf of Mikel González.
+
+2009-02-07  Clytie Siddall <clytie@riverland.net.au>
+
+	* vi.po: Updated Vietnamese translation.
+
+2009-02-03  Jorge Gonzalez  <jorgegonz@svn.gnome.org>  
+
+	* es.po: Updated Spanish translation.
+
+2009-02-01  Gil Forcada  <gforcada@gnome.org>
+
+	* ca.po: Updated Catalan translation by David Planella.
+
+2009-01-31  Jorge Gonzalez  <jorgegonz@svn.gnome.org>  
+
+	* es.po: Updated Spanish translation
+
+2009-01-31  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: Updated Swedish translation.
+
+2009-01-29  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Updated Norwegian bokmål translation.
+
+2009-01-29  Changwoo Ryu  <cwryu@debian.org>
+
+	* ko.po: Updated Korean translation.
+
+2009-01-24  Raivis DEjus  <orvils@gmail.com>
+
+	* lv.po: Updated Latvian translation.
+
+2009-01-22  Yair Hershkovitz  <yairhr@gmail.com>
+
+	* he.po: Updated Hebrew translation.
+
+2009-01-17  Thomas Thurman  <tthurman@gnome.org>
+
+	* ig.po: Added Igbo translation by Sylvester Onye.
+	* yo.po Added Yoruba translation by Sunday Ayo Fajuyitan.
+	* ha.po: Added Hausa translation by Saudat Mohammed.
+	* LINGUAS: added Igbo, Yoruba and Hausa.
+	
+2009-01-17  Gabor Kelemen  <kelemeng@gnome.hu>
+
+	* hu.po: Translation updated.
+
+2009-01-09  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: Updated Swedish translation.
+
+2009-01-03  甘露(Gan Lu) <rhythm.gan@gmail.com>
+
+	* zh_CN.po: Updated Chinese Simplified translation
+
+2009-01-03  Priit Laes  <plaes at svn dot gnome dot org>
+
+	* et.po: Translation updated by Mattias Põldaru
+
+2008-12-26  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation.
+
+2008-12-12  Luca Ferretti  <elle.uca@libero.it>
+
+	* it.po: Imported updated translation from gnome-2-24 branch.
+
+2008-12-08  Priit Laes  <plaes at svn dot gnome dot org>
+
+	* et.po: Translation updated by Mattias Põldaru
+
+2008-11-23  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2008-11-14  Thomas Thurman  <tthurman@gnome.org>
+
+	* la.po: Updated Latin translation
+
+2008-11-14  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2008-11-09  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2008-11-08  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2008-11-03  Leonardo Ferreira Fontenelle  <leonardof@gnome.org>
+
+	* pt_BR.po: Merged from branch gnome-2-24. Minor capitalization fix in
+	the Brazilian Portuguese translation.
+
+2008-10-27 Og Maciel <ogmaciel@gnome.org>
+
+	* pt_BR.po: Updated Brazilian Portuguese translation by
+	Og Maciel.
+
+2008-10-27  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: Updated Swedish translation.
+
+2008-10-23  Gil Forcada  <gforcada@gnome.org>
+
+	* LINGUAS: Added ast.
+	* ast.po: Added Asturian translation on behalf of Mikel González.
+
+2008-10-22  Jordi Mallach  <jordi@sindominio.net>
+
+	* ca@valencia.po: New Valencian (Southern Catalan) translation
+	based on the Catalan file.
+	* LINGUAS: Added Valencian (Southern Catalan) (ca@valencia).
+
+2008-10-22  Jordi Mallach  <jordi@sindominio.net>
+
+	* ca.po: Apply Catalan fixes from Robert Millan.
+
+2008-10-17  Thomas Thurman  <tthurman@gnome.org>
+
+	* la.po: Updated Latin translation.
+
+2008-10-16  Marcel Telka  <marcel@telka.sk>
+
+	* sk.po: Updated Slovak translation by Pavol Šimo.
+
+2008-10-15  Thomas Thurman  <tthurman@gnome.org>
+
+	* la.po: Updated Latin translation.
+
+2008-10-15  Thomas Thurman  <tthurman@gnome.org>
+
+	* la.po: Updated Latin translation.
+
+2008-10-12  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Updated Norwegian bokmål translation.
+
+2008-10-12  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+
+	* th.po: Updated Thai translation (merged from gnome-2-24 branch).
+
+2008-10-11  Claude Paroz  <claude@2xlibre.net>
+
+	* fr.po: Fixed minimize/unmaximize French translation (sync with 2.24) and
+	complete some other translations.
+
+2008-09-30 Og Maciel <ogmaciel@gnome.org>
+
+	* pt_BR.po: Updated Brazilian Portuguese translation by Vladimir Melo.
+
+2008-09-29  Alexander Shopov  <ash@contact.bg>
+
+	* bg.po: Updated Bulgarian translation by
+	Alexander Shopov <ash@contact.bg>
+
+2008-09-27  Gil Forcada  <gforcada@gnome.org>
+
+	* ca.po: Updated Catalan translation.
+
+2008-09-27  Laurent Dhima  <laurenti@alblinux.net>
+
+	* sq.po: Updated Albanian Translation.
+
+2008-09-24  Priit Laes  <plaes at svn dot gnome dot org>
+
+	* et.po: Translation updated by Ivar Smolin
+
+2008-09-22 Kenneth Nielsen <k.nielsen81@gmail.com>
+
+	* da.po: Updated Danish translation by Kenneth Nielsen
+
+2008-09-22 Kenneth Nielsen <k.nielsen81@gmail.com>
+
+	* da.po: Updated Danish translation by Kenneth Nielsen
+
+2008-09-22  Mugurel Tudor  <mugurelu@gnome.ro>
+
+	* ro.po: Updated Romanian translation by
+	Mişu Moldovan <dumol@gnome.ro>
+
+2008-09-21  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+
+	* th.po: Updated Thai translation.
+
+2008-09-21  Gintautas Miliauskas  <gintas@akl.lt>
+
+	* lt.po: Updated Lithuanian translation.
+
+2008-09-20  Priit Laes  <plaes at svn dot gnome dot org>
+
+	* et.po: Translation updated by Ivar Smolin
+
+2008-09-17  Gabor Kelemen  <kelemeng@gnome.hu>
+
+	* hu.po: Translation updated.
+
+2008-09-14  Duarte Loreto <happyguy_pt@hotmail.com>
+
+	* pt.po: Fixed Portuguese terminology.
+
+2008-09-12  Hendrik Richter  <hendrikr@gnome.org>
+
+	* de.po: Updated German translation.
+
+2008-09-12  Goran Rakić  <grakic@devbase.net>
+
+	* sr.po, sr@latin.po: Updated Serbian translation (by Miloš Popović).
+
+2008-09-09  Robert Sedak  <robert.sedak@sk.t-com.hr>
+
+	* hr.po: Updated Croatian translation.
+
+2008-09-08  Priit Laes  <plaes at svn dot gnome dot org>
+
+	* et.po: Translation updated by Mattias Põldaru
+
+2008-09-07  Seán de Búrca  <sdeburca@svn.gnome.org>
+
+	* ga.po: Updated Irish translation.
+
+2008-09-06  Funda Wang  <fundawang@gmail.com>
+
+	* zh_CN.po: Updated zh_CN translation.
+
+2008-09-06  Claude Paroz  <claude@2xlibre.net>
+
+	* fr.po: Updated French translation.
+
+2008-08-24  Gintautas Miliauskas  <gintas@akl.lt>
+
+	* lt.po: Updated Lithuanian translation.
+
+2008-08-23  Inaki Larranaga Murgoitio  <dooteo@euskalgnu.org>
+
+	* eu.po: Updated Basque translation.
+
+2008-08-21  Laurent Dhima  <laurenti@alblinux.net>
+
+	* sq.po: Updated Albanian Translation.
+
+2008-08-14  Duarte Loreto <happyguy_pt@hotmail.com>
+
+	* pt.po: Updated Portuguese translation.
+
+2008-08-13  Leonardo Ferreira Fontenelle  <leonardof@gnome.org>
+
+	* pt_BR.po: Brazilian Portuguese translation updated by Djavan
+	Fagundes.
+
+2008-08-13  Ilkka Tuohela <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2008-08-09  Petr Kovar  <pknbe@volny.cz>
+
+	* cs.po: Updated Czech translation.
+
+2008-08-07  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	 gl.po: Updated Galician translation
+
+2008-08-6  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation by Khaled Hosny.
+
+2008-08-02  Takeshi AIHANA <takeshi.aihana@gmail.com>
+
+	* ja.po: Updated Japanese translation.
+
+2008-07-29  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation by Khaled Hosny.
+
+2008-07-29  Wouter Bolsterlee  <wbolster@svn.gnome.org>
+
+	* nl.po: Dutch translation updated by Wouter Bolsterlee.
+
+2008-07-25  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: Updated Swedish translation.
+
+2008-07-24  Leonardo Ferreira Fontenelle  <leonardof@gnome.org>
+
+	* pt_BR.po: Terminology fixes by Vladimir Melo.
+
+2008-07-17  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: Updated Swedish translation.
+
+2008-07-14  Luca Ferretti  <elle.uca@libero.it>
+
+	* it.po: Updated Italian translation.
+
+2008-07-10  Matej Urbančič  <mateju@svn.gnome.org>
+
+	* sl.po: Updated Slovenian Translation.
+
+2008-07-10  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+
+	* th.po: Updated Thai translation.
+
+2008-07-09  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Updated Norwegian bokmål translation.
+
+2008-07-01  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Updated Norwegian bokmål translation.
+
+2008-06-24  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: Updated Swedish translation.
+
+2008-06-21  Gabor Kelemen  <kelemeng@gnome.hu>
+
+	* hu.po: Translation updated.
+
+2008-06-16  Alexander Shopov  <ash@contact.bg>
+
+	* bg.po: Updated Bulgarian translation by
+	Yavor Doganov <yavor@gnu.org>
+
+2008-06-15  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation  
+
+2008-06-12  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+
+	* th.po: Updated Thai translation.
+
+2008-06-11  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation by Khaled Hosny.
+
+2008-06-11  Yannig Marchegay <yannig@marchegay.org>
+
+	* oc.po: Updated Occitan translation.
+
+2008-06-08  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Updated Norwegian bokmål translation.
+
+2008-06-01  Clytie Siddall <clytie@riverland.net.au>
+
+	* vi.po: Updated Vietnamese translation.
+
+2008-05-22  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation by Khaled Hosny.
+
+2008-05-20  Vincent van Adrighem  <adrighem@gnome.org>
+
+	* nl.po: Translation updated by Tino Meinen.
+
+2008-05-19  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation by Khaled Hosny.
+
+2008-05-18  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+
+	* th.po: Updated Thai translation.
+
+2008-05-14  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Updated Norwegian bokmål translation.
+
+2008-05-13  Vincent van Adrighem  <adrighem@gnome.org>
+
+	* nl.po: Translation updated by Tino Meinen.
+
+2008-05-06  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Updated Norwegian bokmål translation.
+
+2008-05-01  Gabor Kelemen  <kelemeng@gnome.org>
+
+	* hu.po: Translation updated.
+
+2008-04-20  Yair Hershkovitz  <yairhr@gmail.com>
+
+	* he.po: Updated Hebrew translation.
+
+2008-04-10  Yair Hershkovitz  <yairhr@gmail.com>
+
+	* he.po: Updated Hebrew translation.
+
+2008-04-04  Eskild Hustvedt  <eskildh@gnome.org>
+
+	* nn.po: Updated Norwegian Nynorsk translation
+
+2008-03-31 Baris Cicek <baris@teamforce.name.tr>
+
+	* tr.po: Updated Turkish translation
+	
+2008-03-30  Jorge Gonzalez  <jorgegonz@svn.gnome.org>  
+
+	* es.po: Updated Spanish translation
+
+2008-03-23  Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
+
+	* vi.po: Update Vietnamese translation
+
+2008-03-20  Abel Cheung  <abelcheung@gmail.com>
+
+	* zh_HK.po, zh_TW.po: Typo fix for traditional Chinese translations.
+
+2008-03-18  Gabor Kelemen  <kelemeng@gnome.hu>
+
+	* hu.po: Translation updated
+
+2008-03-09  Kenneth Nielsen  <k.nielsen81@gmail.com>
+
+	* da.po: Updated Danish translation
+
+2008-03-09  Gabor Kelemen  <kelemeng@gnome.hu>
+
+	* hu.po: Translation updated
+
+2008-03-09  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: Updated Swedish translation.
+
+2008-03-09  Vasiliy Faronov  <qvvx@yandex.ru>
+
+	* ru.po: Updated Russian translation.
+
+2008-03-07 Maxim Dziumanenko <dziumanenko@gmail.com>
+
+	* uk.po: Updated Ukrainian translation.
+
+2008-03-03  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2008-03-01  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
+
+	* zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
+	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
+
+2008-02-27  Stéphane Raimbault  <stephane.raimbault@gmail.com>
+
+	* fr.po: Updated French translation (merged from gnome-2-22).
+
+2008-02-25  Changwoo Ryu  <cwryu@debian.org>
+
+	* ko.po: Updated Korean translation.
+
+2008-02-24  Ilkka Tuohela <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation (bug #518255).
+
+2008-02-23  Ihar Hrachyshka <booxter@lacinka.org>
+
+	* be@latin.po: Updated Belarusian Latin translation.
+
+2008-02-20  Ilkka Tuohela <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2008-02-18  Wouter Bolsterlee  <wbolster@svn.gnome.org>
+
+	* nl.po: Updated Dutch translation by Wouter Bolsterlee.
+
+2008-02-18  Ihar Hrachyshka <booxter@lacinka.org>
+
+	* be@latin.po: Updated Belarusian Latin translation.
+
+2008-02-15  Runa Bhattacharjee <runabh@gmail.com>
+
+	* kn.po: Added Kannada Translations by Shankar Prasad
+	* LINGUAS: Added Kannada (kn) to the List of Languages
+
+2008-02-14  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	* gl.po: Updated Galician Translation.
+
+2008-02-14  Pawan Chitrakar <chautari@gmail.com>
+
+	* ne.po: Updated Nepali Translation.
+
+2008-02-14  Ilkka Tuohela <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2008-02-13  Ilkka Tuohela <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2008-02-10  Duarte Loreto <happyguy_pt@hotmail.com>
+
+	* pt.po: Updated Portuguese translation.
+
+2008-02-09  Hendrik Brandt  <heb@gnome-de.org>
+	
+	* de.po: Updated German translation.
+
+2008-02-07  Artur Flinta  <aflinta@svn.gnome.org>
+
+	* pl.po: Updated Polish translation by GNOME PL Team.
+
+2008-02-05  Rhys Jones <rhys@sucs.org>
+
+	* cy.po: Updated Welsh translation.
+
+2008-02-03  Amitakhya Phukan <amitakhya@svn.gnome.org>
+
+	* LINGUAS: Added as to LINGUAS.
+	* as.po: Updated assamese translations.
+
 2008-02-03  Arangel Angov <arangel@linux.net.mk>

 	* mk.po: Updated Macedonian translation.
@@ -58,7 +773,7 @@

 	* be@latin.po: Updated Belarusian Latin translation.

-2008-01-05   Clytie Siddall <clytie@riverland.net.au>
+2008-01-05  Clytie Siddall <clytie@riverland.net.au>

 	* vi.po: Updated Vietnamese translation.

@@ -89,7 +804,7 @@

 2007-12-19  Jorge Gonzalez  <jorgegonz@svn.gnome.org>

-        * es.po: Updated Spanish translation.
+	* es.po: Updated Spanish translation.

 2007-12-17  Daniel Nylander <po@danielnylander.se>

@@ -101,7 +816,7 @@

 2007-12-10  Jorge Gonzalez  <jorgegonz@svn.gnome.org>

-        * es.po: Updated Spanish translation, fixes bug #500562 and bug #500831
+	* es.po: Updated Spanish translation, fixes bug #500562 and bug #500831

 2007-12-10  Matej Urbančič  <mateju@svn.gnome.org>

@@ -109,11 +824,11 @@

 2007-12-10  Jorge Gonzalez  <jorgegonz@svn.gnome.org>

-        * es.po: Updated Spanish translation, fixes bug #500831
+	* es.po: Updated Spanish translation, fixes bug #500831

 2007-12-09  Jorge Gonzalez  <jorgegonz@svn.gnome.org>

-        * es.po: Updated Spanish translation, fixes bug #500562
+	* es.po: Updated Spanish translation, fixes bug #500562

 2007-12-08  Jakub Friedl  <jfriedl@suse.cz>

@@ -261,7 +976,7 @@

 2007-09-05  Jovan Naumovski  <jovan@lugola.net>

- 	 * mk.po: Updated Macedonian translation.
+	* mk.po: Updated Macedonian translation.

 2007-09-03  Clytie Siddall <clytie@riverland.net.au>

@@ -273,11 +988,11 @@

 2007-09-03  Jovan Naumovski  <jovan@lugola.net>

- 	 * mk.po: Updated Macedonian translation.
+	* mk.po: Updated Macedonian translation.

 2007-09-01  Jovan Naumovski  <jovan@lugola.net>

- 	 * mk.po: Updated Macedonian translation.
+	* mk.po: Updated Macedonian translation.

 2007-09-01  Stéphane Raimbault  <stephane.raimbault@gmail.com>

@@ -412,7 +1127,7 @@

 2007-05-09  Jovan Naumovski  <jovan@lugola.net>

- 	 * mk.po: Updated Macedonian translation.
+	* mk.po: Updated Macedonian translation.

 2007-05-2  Djihed Afifi <djihed@gmail.com>

@@ -1817,7 +2532,7 @@

 2005-04-17  Pauli Virtanen <pauli.virtanen@hut.fi>

-	 * fi.po: Fix a small mistranslation.
+	* fi.po: Fix a small mistranslation.

 2005-04-09  Christopher Orr  <chris@protactin.co.uk>

@@ -2004,7 +2719,7 @@

 2005-02-06  Pauli Virtanen <pauli.virtanen@hut.fi>

-	 * fi.po: Updated Finnish translation.
+	* fi.po: Updated Finnish translation.

 2005-02-05  Frank Arnold  <farnold@cvs.gnome.org>

@@ -2619,7 +3334,7 @@

 2004-02-07  Robert Sedak  <robert.sedak@sk.htnet.hr>

-	 * hr.po: Updated Croatian translation.
+	* hr.po: Updated Croatian translation.

 2004-02-08  Changwoo Ryu  <cwryu@debian.org>

--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -2,6 +2,8 @@
 #
 am
 ar
+as
+ast
 az
 be
 be@latin
@@ -10,6 +12,7 @@ bn
 bn_IN
 bs
 ca
+ca@valencia
 cs
 cy
 da
@@ -27,20 +30,25 @@ fr
 ga
 gl
 gu
+ha
 he
 hi
 hr
 hu
 hy
 id
+ig
 is
 it
 ja
 ka
+kn
 ko
 ku
+la
 lt
 lv
+mai
 mg
 mk
 ml
@@ -65,9 +73,10 @@ sk
 sl
 sq
 sr
-sr@Latn
+sr@latin
 sv
 ta
+te
 th
 tk
 tr
@@ -75,6 +84,7 @@ uk
 vi
 wa
 xh
+yo
 zh_CN
 zh_HK
 zh_TW
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,5 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-src/50-metacity-desktop-key.xml.in
-src/50-metacity-key.xml.in
 src/core/core.c
 src/core/delete.c
 src/core/display.c
@@ -12,18 +10,19 @@ src/core/prefs.c
 src/core/screen.c
 src/core/session.c
 src/core/util.c
-src/core/window-props.c
 src/core/window.c
+src/core/window-props.c
 src/core/xprops.c
-src/metacity.desktop.in
-src/metacity.schemas.in
+src/include/all-keybindings.h
+src/mutter.desktop.in
+src/mutter-wm.desktop.in
+src/mutter.schemas.in
+src/tools/mutter-message.c
 src/ui/frames.c
 src/ui/menu.c
 src/ui/metaaccellabel.c
-src/ui/metacity-dialog.c
 src/ui/resizepopup.c
+src/ui/theme.c
 src/ui/theme-parser.c
 src/ui/theme-viewer.c
-src/ui/theme.c
-src/tools/metacity-message.c

--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -0,0 +1,2 @@
+src/metacity.schemas.in
+
--- a/po/ar.po
+++ b/po/ar.po
--- a/po/as.po
+++ b/po/as.po
--- a/po/ast.po
+++ b/po/ast.po
--- a/po/be@latin.po
+++ b/po/be@latin.po
--- a/po/bg.po
+++ b/po/bg.po
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
--- a/po/ca.po
+++ b/po/ca.po
--- a/po/ca@valencia.po
+++ b/po/ca@valencia.po
--- a/po/cs.po
+++ b/po/cs.po
--- a/po/cy.po
+++ b/po/cy.po
--- a/po/da.po
+++ b/po/da.po
--- a/po/de.po
+++ b/po/de.po
--- a/po/el.po
+++ b/po/el.po
--- a/po/en_GB.po
+++ b/po/en_GB.po
--- a/po/es.po
+++ b/po/es.po
--- a/po/et.po
+++ b/po/et.po
--- a/po/eu.po
+++ b/po/eu.po
--- a/po/fi.po
+++ b/po/fi.po
--- a/po/fr.po
+++ b/po/fr.po
--- a/po/ga.po
+++ b/po/ga.po
--- a/po/gl.po
+++ b/po/gl.po
--- a/po/gu.po
+++ b/po/gu.po
--- a/po/ha.po
+++ b/po/ha.po
--- a/po/he.po
+++ b/po/he.po
--- a/po/hi.po
+++ b/po/hi.po
--- a/po/hr.po
+++ b/po/hr.po
--- a/po/hu.po
+++ b/po/hu.po
--- a/po/ig.po
+++ b/po/ig.po
--- a/po/it.po
+++ b/po/it.po
--- a/po/ja.po
+++ b/po/ja.po
--- a/po/kn.po
+++ b/po/kn.po
--- a/po/ko.po
+++ b/po/ko.po
--- a/po/la.po
+++ b/po/la.po
--- a/po/lt.po
+++ b/po/lt.po
--- a/po/lv.po
+++ b/po/lv.po
--- a/po/mai.po
+++ b/po/mai.po
--- a/po/mr.po
+++ b/po/mr.po
--- a/po/nb.po
+++ b/po/nb.po
--- a/po/ne.po
+++ b/po/ne.po
--- a/po/nl.po
+++ b/po/nl.po
--- a/po/nn.po
+++ b/po/nn.po
--- a/po/oc.po
+++ b/po/oc.po
--- a/po/or.po
+++ b/po/or.po
--- a/po/pa.po
+++ b/po/pa.po
--- a/po/pl.po
+++ b/po/pl.po
--- a/po/pt.po
+++ b/po/pt.po
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
--- a/po/ro.po
+++ b/po/ro.po
--- a/po/ru.po
+++ b/po/ru.po
--- a/po/sk.po
+++ b/po/sk.po
--- a/po/sl.po
+++ b/po/sl.po
--- a/po/sq.po
+++ b/po/sq.po
--- a/po/sr.po
+++ b/po/sr.po
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
--- a/po/sv.po
+++ b/po/sv.po
--- a/po/ta.po
+++ b/po/ta.po
--- a/po/te.po
+++ b/po/te.po
--- a/po/th.po
+++ b/po/th.po
--- a/po/tr.po
+++ b/po/tr.po
--- a/po/uk.po
+++ b/po/uk.po
--- a/po/vi.po
+++ b/po/vi.po
--- a/po/yo.po
+++ b/po/yo.po
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
--- a/src/.cvsignore
+++ b/src/.cvsignore
@@ -9,6 +9,7 @@ testboxes
 testgradient
 inlinepixbufs.h
 metacity.desktop
+metacity-wm.desktop
 metacity.schemas
 libmetacity-private.pc
 testasyncgetprop
--- a/src/50-metacity-desktop-key.xml.in
+++ b/src/50-metacity-desktop-key.xml.in
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<KeyListEntries _name="Desktop" wm_name="Metacity" package="metacity">
-
-	<KeyListEntry
-	name="/apps/metacity/global_keybindings/panel_run_dialog" />
-
-	<KeyListEntry
-	name="/apps/metacity/global_keybindings/panel_main_menu" />
-
-	<KeyListEntry
-	name="/apps/metacity/global_keybindings/run_command_screenshot" />
-
-	<KeyListEntry
-	name="/apps/metacity/global_keybindings/run_command_window_screenshot" />
-
-	<KeyListEntry
-	name="/apps/metacity/global_keybindings/run_command_terminal" />
-
-</KeyListEntries>
-
--- a/src/50-metacity-key.xml.in
+++ b/src/50-metacity-key.xml.in
@@ -1,269 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<KeyListEntries _name="Window Management" wm_name="Metacity" package="metacity">
-
-	<KeyListEntry
-	name="/apps/metacity/window_keybindings/activate_window_menu" />
-
-	<KeyListEntry
-	name="/apps/metacity/window_keybindings/toggle_fullscreen" />
-
-	<KeyListEntry
-	name="/apps/metacity/window_keybindings/toggle_maximized" />
-
-	<KeyListEntry
-	name="/apps/metacity/window_keybindings/maximize" />
-
-	<KeyListEntry
-	name="/apps/metacity/window_keybindings/unmaximize" />
-
-	<KeyListEntry
-	name="/apps/metacity/window_keybindings/toggle_shaded" />
-
-	<KeyListEntry
-	name="/apps/metacity/window_keybindings/close" />
-
-	<KeyListEntry
-	name="/apps/metacity/window_keybindings/minimize" />
-
-	<KeyListEntry
-	name="/apps/metacity/window_keybindings/begin_move" />
-
-	<KeyListEntry
-	name="/apps/metacity/window_keybindings/begin_resize" />
-
-	<KeyListEntry
-	name="/apps/metacity/window_keybindings/toggle_on_all_workspaces"
-	value="1"
-	key="/apps/metacity/general/num_workspaces"
-	comparison="gt" />
-
-	<KeyListEntry
-	name="/apps/metacity/window_keybindings/raise_or_lower" />
-
-	<KeyListEntry
-	name="/apps/metacity/window_keybindings/raise" />
-
-	<KeyListEntry
-	name="/apps/metacity/window_keybindings/lower" />
-
-	<KeyListEntry
-	name="/apps/metacity/window_keybindings/maximize_vertically" />
-
-	<KeyListEntry
-	name="/apps/metacity/window_keybindings/maximize_horizontally" />
-
-	<KeyListEntry
-	name="/apps/metacity/window_keybindings/move_to_workspace_1"
-	value="1"
-	key="/apps/metacity/general/num_workspaces"
-	comparison="gt" />
-
-	<KeyListEntry
-	name="/apps/metacity/window_keybindings/move_to_workspace_2"
-	value="1"
-	key="/apps/metacity/general/num_workspaces"
-	comparison="gt" />
-
-	<KeyListEntry
-	name="/apps/metacity/window_keybindings/move_to_workspace_3"
-	value="2"
-	key="/apps/metacity/general/num_workspaces"
-	comparison="gt" />
-
-	<KeyListEntry
-	name="/apps/metacity/window_keybindings/move_to_workspace_4"
-	value="3"
-	key="/apps/metacity/general/num_workspaces"
-	comparison="gt" />
-
-	<KeyListEntry
-	name="/apps/metacity/window_keybindings/move_to_workspace_5"
-	value="4"
-	key="/apps/metacity/general/num_workspaces"
-	comparison="gt" />
-
-	<KeyListEntry
-	name="/apps/metacity/window_keybindings/move_to_workspace_6"
-	value="5"
-	key="/apps/metacity/general/num_workspaces"
-	comparison="gt" />
-
-	<KeyListEntry
-	name="/apps/metacity/window_keybindings/move_to_workspace_7"
-	value="6"
-	key="/apps/metacity/general/num_workspaces"
-	comparison="gt" />
-
-	<KeyListEntry
-	name="/apps/metacity/window_keybindings/move_to_workspace_8"
-	value="7"
-	key="/apps/metacity/general/num_workspaces"
-	comparison="gt" />
-
-	<KeyListEntry
-	name="/apps/metacity/window_keybindings/move_to_workspace_9"
-	value="8"
-	key="/apps/metacity/general/num_workspaces"
-	comparison="gt" />
-
-	<KeyListEntry
-	name="/apps/metacity/window_keybindings/move_to_workspace_10"
-	value="9"
-	key="/apps/metacity/general/num_workspaces"
-	comparison="gt" />
-
-	<KeyListEntry
-	name="/apps/metacity/window_keybindings/move_to_workspace_11"
-	value="10"
-	key="/apps/metacity/general/num_workspaces"
-	comparison="gt" />
-
-	<KeyListEntry
-	name="/apps/metacity/window_keybindings/move_to_workspace_12"
-	value="11"
-	key="/apps/metacity/general/num_workspaces"
-	comparison="gt" />
-
-	<KeyListEntry
-	name="/apps/metacity/window_keybindings/move_to_workspace_left"
-	value="1"
-	key="/apps/metacity/general/num_workspaces"
-	comparison="gt" />
-
-	<KeyListEntry
-	name="/apps/metacity/window_keybindings/move_to_workspace_right"
-	value="1"
-	key="/apps/metacity/general/num_workspaces"
-	comparison="gt" />
-
-	<KeyListEntry
-	name="/apps/metacity/window_keybindings/move_to_workspace_up"
-	value="1"
-	key="/apps/metacity/general/num_workspaces"
-	comparison="gt" />
-
-	<KeyListEntry
-	name="/apps/metacity/window_keybindings/move_to_workspace_down"
-	value="1"
-	key="/apps/metacity/general/num_workspaces"
-	comparison="gt" />
-
-	<KeyListEntry
-	name="/apps/metacity/global_keybindings/switch_windows" />
-
-	<KeyListEntry
-	name="/apps/metacity/global_keybindings/switch_group" />
-
-	<KeyListEntry
-	name="/apps/metacity/global_keybindings/switch_panels" />
-
-	<KeyListEntry
-	name="/apps/metacity/global_keybindings/cycle_windows" />
-
-	<KeyListEntry
-	name="/apps/metacity/global_keybindings/cycle_group" />
-
-	<KeyListEntry
-	name="/apps/metacity/global_keybindings/cycle_panels" />
-
-	<KeyListEntry
-	name="/apps/metacity/global_keybindings/show_desktop" />
-
-	<KeyListEntry
-	name="/apps/metacity/global_keybindings/switch_to_workspace_1"
-	value="1"
-	key="/apps/metacity/general/num_workspaces"
-	comparison="gt" />
-
-	<KeyListEntry
-	name="/apps/metacity/global_keybindings/switch_to_workspace_2"
-	value="1"
-	key="/apps/metacity/general/num_workspaces"
-	comparison="gt" />
-
-	<KeyListEntry
-	name="/apps/metacity/global_keybindings/switch_to_workspace_3"
-	value="2"
-	key="/apps/metacity/general/num_workspaces"
-	comparison="gt" />
-
-	<KeyListEntry
-	name="/apps/metacity/global_keybindings/switch_to_workspace_4"
-	value="3"
-	key="/apps/metacity/general/num_workspaces"
-	comparison="gt" />
-
-	<KeyListEntry
-	name="/apps/metacity/global_keybindings/switch_to_workspace_5"
-	value="4"
-	key="/apps/metacity/general/num_workspaces"
-	comparison="gt" />
-
-	<KeyListEntry
-	name="/apps/metacity/global_keybindings/switch_to_workspace_6"
-	value="5"
-	key="/apps/metacity/general/num_workspaces"
-	comparison="gt" />
-
-	<KeyListEntry
-	name="/apps/metacity/global_keybindings/switch_to_workspace_7"
-	value="6"
-	key="/apps/metacity/general/num_workspaces"
-	comparison="gt" />
-
-	<KeyListEntry
-	name="/apps/metacity/global_keybindings/switch_to_workspace_8"
-	value="7"
-	key="/apps/metacity/general/num_workspaces"
-	comparison="gt" />
-
-	<KeyListEntry
-	name="/apps/metacity/global_keybindings/switch_to_workspace_9"
-	value="8"
-	key="/apps/metacity/general/num_workspaces"
-	comparison="gt" />
-
-	<KeyListEntry
-	name="/apps/metacity/global_keybindings/switch_to_workspace_10"
-	value="9"
-	key="/apps/metacity/general/num_workspaces"
-	comparison="gt" />
-
-	<KeyListEntry
-	name="/apps/metacity/global_keybindings/switch_to_workspace_11"
-	value="10"
-	key="/apps/metacity/general/num_workspaces"
-	comparison="gt" />
-
-	<KeyListEntry
-	name="/apps/metacity/global_keybindings/switch_to_workspace_12"
-	value="11"
-	key="/apps/metacity/general/num_workspaces"
-	comparison="gt" />
-
-	<KeyListEntry
-	name="/apps/metacity/global_keybindings/switch_to_workspace_left"
-	value="1"
-	key="/apps/metacity/general/num_workspaces"
-	comparison="gt" />
-
-	<KeyListEntry
-	name="/apps/metacity/global_keybindings/switch_to_workspace_right"
-	value="1"
-	key="/apps/metacity/general/num_workspaces"
-	comparison="gt" />
-
-	<KeyListEntry
-	name="/apps/metacity/global_keybindings/switch_to_workspace_up"
-	value="1"
-	key="/apps/metacity/general/num_workspaces"
-	comparison="gt" />
-
-	<KeyListEntry
-	name="/apps/metacity/global_keybindings/switch_to_workspace_down"
-	value="1"
-	key="/apps/metacity/general/num_workspaces"
-	comparison="gt" />
-
-</KeyListEntries>
-
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,72 +1,103 @@
-lib_LTLIBRARIES = libmetacity-private.la
+lib_LTLIBRARIES = libmutter-private.la

-SUBDIRS=wm-tester tools themes
+SUBDIRS=wm-tester tools compositor/plugins

-INCLUDES=@METACITY_CFLAGS@ -I $(srcdir)/include -DMETACITY_LIBEXECDIR=\"$(libexecdir)\" -DHOST_ALIAS=\"@HOST_ALIAS@\" -DMETACITY_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DMETACITY_PKGDATADIR=\"$(pkgdatadir)\" -DMETACITY_DATADIR=\"$(datadir)\" -DG_LOG_DOMAIN=\"metacity\" -DSN_API_NOT_YET_FROZEN=1
+INCLUDES=@MUTTER_CFLAGS@ -I $(srcdir)/include -I$(srcdir)/compositor -DMUTTER_LIBEXECDIR=\"$(libexecdir)\" -DHOST_ALIAS=\"@HOST_ALIAS@\" -DMUTTER_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DMUTTER_PKGDATADIR=\"$(pkgdatadir)\" -DMUTTER_DATADIR=\"$(datadir)\" -DG_LOG_DOMAIN=\"mutter\" -DSN_API_NOT_YET_FROZEN=1 -DMUTTER_MAJOR_VERSION=$(MUTTER_MAJOR_VERSION) -DMUTTER_MINOR_VERSION=$(MUTTER_MINOR_VERSION) -DMUTTER_MICRO_VERSION=$(MUTTER_MICRO_VERSION) -DMUTTER_PLUGIN_API_VERSION=$(MUTTER_PLUGIN_API_VERSION) -DMUTTER_PKGLIBDIR=\"$(pkglibdir)\" -DMUTTER_PLUGIN_DIR=\"@MUTTER_PLUGIN_DIR@\"

-metacity_SOURCES= 				\
+mutter_built_sources = \
+	mutter-marshal.h \
+	mutter-marshal.c \
+	mutter-enum-types.h \
+	mutter-enum-types.c
+
+mutter_SOURCES= 				\
 	core/async-getprop.c			\
 	core/async-getprop.h			\
+	core/alttabhandler.c			\
+	include/alttabhandler.h			\
+	core/alttabhandlerdefault.c		\
+	include/alttabhandlerdefault.h		\
 	core/bell.c				\
 	core/bell.h				\
 	core/boxes.c				\
 	include/boxes.h				\
-	core/compositor.c			\
-	core/compositor.h			\
+	compositor/compositor.c			\
+	compositor/compositor-private.h		\
+	compositor/mutter-module.c		\
+	compositor/mutter-module.h		\
+	compositor/mutter-plugin.c		\
+	compositor/mutter-plugin-manager.c	\
+	compositor/mutter-plugin-manager.h	\
+	compositor/mutter-shaped-texture.c	\
+	compositor/mutter-window.c		\
+	compositor/mutter-window-private.h	\
+	compositor/mutter-window-group.c	\
+	compositor/mutter-window-group.h	\
+	compositor/shadow.c			\
+	compositor/shadow.h			\
+	compositor/mutter-shaped-texture.h	\
+	compositor/tidy/tidy-texture-frame.c	\
+	compositor/tidy/tidy-texture-frame.h	\
+	include/compositor.h			\
+	include/mutter-plugin.h			\
+	include/mutter-window.h			\
+	include/compositor-mutter.h 		\
 	core/constraints.c			\
 	core/constraints.h			\
 	core/core.c				\
 	core/delete.c				\
 	core/display.c				\
-	core/display.h				\
+	core/display-private.h			\
+	include/display.h			\
 	ui/draw-workspace.c			\
 	ui/draw-workspace.h			\
 	core/edge-resistance.c			\
 	core/edge-resistance.h			\
-	core/effects.c				\
-	core/effects.h				\
 	core/errors.c				\
-	core/errors.h				\
+	include/errors.h			\
 	core/eventqueue.c			\
 	core/eventqueue.h			\
 	core/frame.c				\
-	core/frame.h				\
+	core/frame-private.h			\
+	include/frame.h				\
 	ui/gradient.c				\
 	ui/gradient.h				\
 	core/group-private.h			\
 	core/group-props.c			\
 	core/group-props.h			\
 	core/group.c				\
-	core/group.h				\
+	include/group.h				\
 	core/iconcache.c			\
 	core/iconcache.h			\
 	core/keybindings.c			\
-	core/keybindings.h			\
+	core/keybindings-private.h		\
 	core/main.c				\
-	include/main.h				\
-	core/metacity-Xatomtype.h		\
+	core/mutter-Xatomtype.h		\
 	core/place.c				\
 	core/place.h				\
 	core/prefs.c				\
 	include/prefs.h				\
 	core/screen.c				\
-	core/screen.h				\
+	core/screen-private.h			\
+	include/screen.h			\
+	include/types.h                         \
 	core/session.c				\
 	core/session.h				\
-	core/spring-model.c			\
-	core/spring-model.h			\
 	core/stack.c				\
 	core/stack.h				\
+	core/stack-tracker.c			\
+	core/stack-tracker.h			\
 	core/util.c				\
 	include/util.h				\
 	core/window-props.c			\
 	core/window-props.h			\
 	core/window.c				\
-	core/window.h				\
+	core/window-private.h			\
+	include/window.h			\
 	core/workspace.c			\
-	core/workspace.h			\
+	core/workspace-private.h		\
 	core/xprops.c				\
-	core/xprops.h				\
+	include/xprops.h			\
 	include/common.h			\
 	include/core.h				\
 	include/ui.h				\
@@ -89,12 +120,14 @@ metacity_SOURCES= 				\
 	ui/theme.h				\
 	ui/themewidget.c			\
 	ui/themewidget.h			\
-	ui/ui.c
+	ui/ui.c					\
+	include/all-keybindings.h               \
+	$(mutter_built_sources)

-# by setting libmetacity_private_la_CFLAGS, the files shared with
-# metacity proper will be compiled with different names.
-libmetacity_private_la_CFLAGS =
-libmetacity_private_la_SOURCES=			\
+# by setting libmutter_private_la_CFLAGS, the files shared with
+# mutter proper will be compiled with different names.
+libmutter_private_la_CFLAGS =
+libmutter_private_la_SOURCES=			\
 	core/boxes.c				\
 	include/boxes.h				\
 	ui/gradient.c				\
@@ -109,33 +142,93 @@ libmetacity_private_la_SOURCES=			\
 	ui/theme.c				\
 	ui/theme.h

-libmetacity_private_la_LDFLAGS = -no-undefined
-libmetacity_private_la_LIBADD  = @METACITY_LIBS@
+libmutter_private_la_LDFLAGS = -no-undefined
+libmutter_private_la_LIBADD  = @MUTTER_LIBS@

-libmetacityincludedir = $(includedir)/metacity-1/metacity-private
+libmutterincludedir = $(includedir)/mutter/mutter-private

-libmetacityinclude_HEADERS =			\
+# Headers installed for plugins; introspected information will
+# be extracted into Mutter-<version>.gir
+libmutterinclude_base_headers =		\
+	include/alttabhandler.h			\
 	include/boxes.h				\
 	ui/gradient.h				\
+	include/main.h				\
 	include/util.h				\
 	include/common.h			\
-	ui/preview-widget.h			\
 	ui/theme-parser.h			\
-	ui/theme.h
+	ui/theme.h				\
+	include/prefs.h				\
+	include/window.h			\
+	include/workspace.h			\
+	include/compositor.h			\
+	include/compositor-mutter.h		\
+	include/types.h				\
+	include/screen.h			\
+	include/display.h			\
+	include/group.h				\
+	include/keybindings.h			\
+	include/mutter-plugin.h			\
+	include/mutter-window.h

-metacity_theme_viewer_SOURCES=  \
+# Excluded from scanning for introspection but installed
+# preview-widget.h: only part of libmutter-private
+# atomnames.h: macros cause problems for scanning process
+libmutterinclude_extra_headers =		\
+	ui/preview-widget.h			\
+	include/atomnames.h
+
+libmutterinclude_HEADERS =			\
+	$(libmutterinclude_base_headers)	\
+	$(libmutterinclude_extra_headers)
+
+mutter_theme_viewer_SOURCES=  \
 	ui/theme-viewer.c

-metacity_dialog_SOURCES= 	\
-	ui/metacity-dialog.c
+bin_PROGRAMS=mutter mutter-theme-viewer

-bin_PROGRAMS=metacity metacity-theme-viewer
-libexec_PROGRAMS=metacity-dialog
+api_version = $(MUTTER_MAJOR_VERSION).$(MUTTER_MINOR_VERSION)
+
+if WITH_INTROSPECTION
+# These files are in package-private directories, even though they may be used
+# by plugins.  If you're writing a plugin, use g-ir-compiler --add-include-path
+# and g-ir-compiler --includedir.
+girdir = $(pkglibdir)
+gir_DATA = Meta-$(api_version).gir
+
+typelibdir = $(pkglibdir)
+typelib_DATA = Meta-$(api_version).typelib
+
+# We need to strip out the attribute that would point back to libmutter-introspect
+# so that libgirepository looks for symbols in the executable instead
+Meta-$(api_version).gir: $(G_IR_SCANNER) mutter $(libmutterinclude_HEADERS) $(mutter_SOURCES)
+	$(AM_V_GEN) pwd=`pwd` ;				\
+        cd $(srcdir) &&					\
+	$(G_IR_SCANNER)					\
+		--namespace=Meta			\
+		--nsversion=$(api_version)		\
+		--include=GObject-2.0			\
+		--include=Gdk-2.0			\
+		--include=Gtk-2.0			\
+		--include=Clutter-1.0			\
+		--pkg=clutter-1.0			\
+		--pkg=gtk+-2.0				\
+		--include=xfixes-4.0			\
+		--program=$$pwd/mutter			\
+		$(filter %.c,$(mutter_SOURCES))		\
+		$(libmutterinclude_base_headers)	\
+		$(INCLUDES)				\
+		-o $$pwd/$@
+
+Meta-$(api_version).typelib: $(G_IR_COMPILER) Meta-$(api_version).gir
+	$(AM_V_GEN) LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. $(G_IR_COMPILER) Meta-$(api_version).gir -o $@
+endif

 EFENCE=
-metacity_LDADD=@METACITY_LIBS@ $(EFENCE)
-metacity_theme_viewer_LDADD= @METACITY_LIBS@ libmetacity-private.la
-metacity_dialog_LDADD=@METACITY_LIBS@
+mutter_LDADD=@MUTTER_LIBS@ $(EFENCE)
+mutter_LDFLAGS=-export-dynamic
+
+mutter_theme_viewer_LDADD= @MUTTER_LIBS@ libmutter-private.la

 testboxes_SOURCES=include/util.h core/util.c include/boxes.h core/boxes.c core/testboxes.c
 testgradient_SOURCES=ui/gradient.h ui/gradient.c ui/testgradient.c
@@ -143,26 +236,28 @@ testasyncgetprop_SOURCES=core/async-getprop.h core/async-getprop.c core/testasyn

 noinst_PROGRAMS=testboxes testgradient testasyncgetprop

-testboxes_LDADD= @METACITY_LIBS@
-testgradient_LDADD= @METACITY_LIBS@
-testasyncgetprop_LDADD= @METACITY_LIBS@
+testboxes_LDADD= @MUTTER_LIBS@
+testgradient_LDADD= @MUTTER_LIBS@
+testasyncgetprop_LDADD= @MUTTER_LIBS@

-desktopfilesdir=$(datadir)/gnome/wm-properties
-desktopfiles_in_files=metacity.desktop.in
-desktopfiles_files=$(desktopfiles_in_files:.desktop.in=.desktop)
-desktopfiles_DATA = $(desktopfiles_files)
@INTLTOOL_DESKTOP_RULE@

+desktopfilesdir=$(datadir)/applications
+desktopfiles_in_files=mutter.desktop.in
+desktopfiles_files=$(desktopfiles_in_files:.desktop.in=.desktop)
+desktopfiles_DATA = $(desktopfiles_files)
+
+wmpropertiesdir=$(datadir)/gnome/wm-properties
+wmproperties_in_files=mutter-wm.desktop.in
+wmproperties_files=$(wmproperties_in_files:.desktop.in=.desktop)
+wmproperties_DATA = $(wmproperties_files)
+
 schemadir   = @GCONF_SCHEMA_FILE_DIR@
-schema_in_files = metacity.schemas.in
+schema_in_files = mutter.schemas.in
 schema_DATA = $(schema_in_files:.schemas.in=.schemas)

@INTLTOOL_XML_NOMERGE_RULE@

-xmldir       = @GNOME_KEYBINDINGS_KEYSDIR@
-xml_in_files = 50-metacity-desktop-key.xml.in 50-metacity-key.xml.in
-xml_DATA     = $(xml_in_files:.xml.in=.xml)
-
@INTLTOOL_SCHEMAS_RULE@

 if GCONF_SCHEMAS_INSTALL
@@ -172,26 +267,79 @@ else
 install-data-local:
 endif

-IMAGES=default_icon.png stock_maximize.png stock_minimize.png stock_delete.png
-VARIABLES=default_icon_data $(srcdir)/default_icon.png \
-          stock_maximize_data $(srcdir)/stock_maximize.png \
+IMAGES=stock_maximize.png stock_minimize.png stock_delete.png
+VARIABLES=stock_maximize_data $(srcdir)/stock_maximize.png \
          stock_minimize_data $(srcdir)/stock_minimize.png \
          stock_delete_data $(srcdir)/stock_delete.png

 BUILT_SOURCES = inlinepixbufs.h
-CLEANFILES = inlinepixbufs.h metacity.desktop metacity.schemas 50-metacity-desktop-key.xml 50-metacity-key.xml
+CLEANFILES =					\
+	inlinepixbufs.h				\
+	mutter.desktop				\
+	mutter-wm.desktop			\
+	mutter.schemas				\
+	$(mutter_built_sources)			\
+	$(typelib_DATA)				\
+	$(gir_DATA)

 inlinepixbufs.h: $(IMAGES)
 	$(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h

 pkgconfigdir = $(libdir)/pkgconfig

-pkgconfig_DATA = libmetacity-private.pc
+pkgconfig_DATA = libmutter-private.pc mutter-plugins.pc

 EXTRA_DIST=$(desktopfiles_files) 	\
-	$(IMAGES) $(schema_DATA) 	\
+	$(wmproperties_files)		\
+	$(IMAGES) 			\
 	$(desktopfiles_in_files)	\
+	$(wmproperties_in_files)	\
 	$(schema_in_files)		\
-	$(xml_in_files)			\
-	libmetacity-private.pc.in
+	libmutter-private.pc.in	\
+	mutter-plugins.pc.in  \
+	mutter-enum-types.h.in \
+	mutter-enum-types.c.in \
+	mutter-marshal.list

+BUILT_SOURCES += $(mutter_built_sources)
+MUTTER_STAMP_FILES = stamp-mutter-marshal.h stamp-mutter-enum-types.h
+CLEANFILES += $(MUTTER_STAMP_FILES)
+
+mutter-marshal.h: stamp-mutter-marshal.h
+	@true
+stamp-mutter-marshal.h: Makefile mutter-marshal.list
+	$(AM_V_GEN) $(GLIB_GENMARSHAL) \
+		--prefix=_mutter_marshal \
+		--header \
+	$(srcdir)/mutter-marshal.list > xgen-tmh && \
+	(cmp -s xgen-tmh mutter-marshal.h || cp -f xgen-tmh mutter-marshal.h) && \
+	rm -f xgen-tmh && \
+	echo timestamp > $(@F)
+
+mutter-marshal.c: Makefile mutter-marshal.list
+	 $(AM_V_GEN) (echo "#include \"mutter-marshal.h\"" ; \
+	 $(GLIB_GENMARSHAL) \
+		--prefix=_mutter_marshal \
+		--body \
+	 $(srcdir)/mutter-marshal.list ) > xgen-tmc && \
+	cp -f xgen-tmc mutter-marshal.c && \
+	rm -f xgen-tmc
+
+mutter-enum-types.h: stamp-mutter-enum-types.h Makefile
+	@true
+stamp-mutter-enum-types.h: $(mutter_source_h) mutter-enum-types.h.in
+	$(AM_V_GEN) ( cd $(srcdir) && \
+	  $(GLIB_MKENUMS) \
+	    --template $(srcdir)/mutter-enum-types.h.in \
+	  $(libmutterinclude_base_headers) ) >> xgen-teth && \
+	(cmp -s xgen-teth mutter-enum-types.h || cp xgen-teth mutter-enum-types.h) && \
+	rm -f xgen-teth && \
+	echo timestamp > $(@F)
+
+mutter-enum-types.c: stamp-mutter-enum-types.h mutter-enum-types.c.in
+	  $(AM_V_GEN) ( cd $(srcdir) && \
+	  $(GLIB_MKENUMS) \
+	    --template $(srcdir)/mutter-enum-types.c.in \
+	  $(libmutterinclude_base_headers) ) >> xgen-tetc && \
+	cp xgen-tetc mutter-enum-types.c && \
+	rm -f xgen-tetc
--- a/src/compositor/README
+++ b/src/compositor/README
@@ -0,0 +1,10 @@
+Intro
+=====
+
+Fix me.
+
+
+Env Vars
+========
+
+MUTTER_DISABLE_MIPMAPS - set to disable use of mipmaped windows.
--- a/src/compositor/compositor-private.h
+++ b/src/compositor/compositor-private.h
@@ -0,0 +1,54 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+#ifndef META_COMPOSITOR_PRIVATE_H
+#define META_COMPOSITOR_PRIVATE_H
+
+#include <X11/extensions/Xfixes.h>
+
+#include "compositor.h"
+#include "display.h"
+#include "mutter-plugin-manager.h"
+#include <clutter/clutter.h>
+
+typedef struct _MetaCompScreen MetaCompScreen;
+
+struct _MetaCompositor
+{
+  MetaDisplay    *display;
+
+  Atom            atom_x_root_pixmap;
+  Atom            atom_x_set_root;
+  Atom            atom_net_wm_window_opacity;
+  guint           repaint_func_id;
+
+  ClutterActor   *shadow_src;
+
+  gboolean        show_redraw : 1;
+  gboolean        debug       : 1;
+  gboolean        no_mipmaps  : 1;
+};
+
+struct _MetaCompScreen
+{
+  MetaScreen            *screen;
+
+  ClutterActor          *stage, *window_group, *overlay_group;
+  ClutterActor		*hidden_group;
+  GList                 *windows;
+  GHashTable            *windows_by_xid;
+  Window                 output;
+
+  /* Before we create the output window */
+  XserverRegion     pending_input_region;
+
+  gint                   switch_workspace_in_progress;
+
+  MutterPluginManager *plugin_mgr;
+};
+
+void mutter_switch_workspace_completed (MetaScreen    *screen);
+void mutter_set_stage_input_region     (MetaScreen    *screen,
+                                        XserverRegion  region);
+void mutter_empty_stage_input_region   (MetaScreen    *screen);
+
+#endif /* META_COMPOSITOR_PRIVATE_H */
--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
@@ -0,0 +1,953 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+#include <config.h>
+
+#include <clutter/x11/clutter-x11.h>
+
+#include "screen.h"
+#include "errors.h"
+#include "window.h"
+#include "compositor-private.h"
+#include "compositor-mutter.h"
+#include "xprops.h"
+#include "prefs.h"
+#include "mutter-window-private.h"
+#include "mutter-window-group.h"
+#include "../core/window-private.h" /* to check window->hidden */
+#include "../core/display-private.h" /* for meta_display_lookup_x_window() */
+#include <X11/extensions/shape.h>
+#include <X11/extensions/Xcomposite.h>
+
+/* #define DEBUG_TRACE g_print */
+#define DEBUG_TRACE(X)
+
+static inline gboolean
+composite_at_least_version (MetaDisplay *display, int maj, int min)
+{
+  static int major = -1;
+  static int minor = -1;
+
+  if (major == -1)
+    meta_display_get_compositor_version (display, &major, &minor);
+
+  return (major > maj || (major == maj && minor >= min));
+}
+
+static MutterWindow*
+find_window_for_screen (MetaScreen *screen, Window xwindow)
+{
+  MetaCompScreen *info = meta_screen_get_compositor_data (screen);
+
+  if (info == NULL)
+    return NULL;
+
+  return g_hash_table_lookup (info->windows_by_xid,
+                              (gpointer) xwindow);
+}
+
+static MutterWindow *
+find_window_in_display (MetaDisplay *display, Window xwindow)
+{
+  GSList *index;
+  MetaWindow *window = meta_display_lookup_x_window (display, xwindow);
+
+  if (window)
+    {
+      void *priv = meta_window_get_compositor_private (window);
+      if (priv)
+	return priv;
+    }
+
+  for (index = meta_display_get_screens (display);
+       index;
+       index = index->next)
+    {
+      MutterWindow *cw = find_window_for_screen (index->data, xwindow);
+
+      if (cw != NULL)
+        return cw;
+    }
+
+  return NULL;
+}
+
+static MutterWindow *
+find_window_for_child_window_in_display (MetaDisplay *display, Window xwindow)
+{
+  Window ignored1, *ignored2, parent;
+  guint  ignored_children;
+
+  XQueryTree (meta_display_get_xdisplay (display), xwindow, &ignored1,
+              &parent, &ignored2, &ignored_children);
+
+  if (parent != None)
+    return find_window_in_display (display, parent);
+
+  return NULL;
+}
+
+static void sync_actor_stacking (GList *windows);
+
+static void
+mutter_finish_workspace_switch (MetaCompScreen *info)
+{
+  GList *l;
+
+  /* Finish hiding and showing actors for the new workspace */
+  for (l = info->windows; l; l = l->next)
+    mutter_window_sync_visibility (l->data);
+
+  /*
+   * Fix up stacking order in case the plugin messed it up.
+   */
+  sync_actor_stacking (info->windows);
+
+/*   printf ("... FINISHED DESKTOP SWITCH\n"); */
+
+}
+
+void
+mutter_switch_workspace_completed (MetaScreen *screen)
+{
+  MetaCompScreen *info = meta_screen_get_compositor_data (screen);
+
+  /* FIXME -- must redo stacking order */
+  info->switch_workspace_in_progress--;
+  if (info->switch_workspace_in_progress < 0)
+    {
+      g_warning ("Error in workspace_switch accounting!");
+      info->switch_workspace_in_progress = 0;
+    }
+
+  if (!info->switch_workspace_in_progress)
+    mutter_finish_workspace_switch (info);
+}
+
+void
+meta_compositor_destroy (MetaCompositor *compositor)
+{
+  clutter_threads_remove_repaint_func (compositor->repaint_func_id);
+}
+
+static void
+add_win (MetaWindow *window)
+{
+  MetaScreen		*screen = meta_window_get_screen (window);
+  MetaCompScreen        *info = meta_screen_get_compositor_data (screen);
+
+  g_return_if_fail (info != NULL);
+
+  mutter_window_new (window);
+
+  sync_actor_stacking (info->windows);
+}
+
+static void
+process_damage (MetaCompositor     *compositor,
+                XDamageNotifyEvent *event)
+{
+  MutterWindow *cw = find_window_in_display (compositor->display, event->drawable);
+  if (cw == NULL)
+    return;
+
+  mutter_window_process_damage (cw, event);
+}
+
+#ifdef HAVE_SHAPE
+static void
+process_shape (MetaCompositor *compositor,
+               XShapeEvent    *event)
+{
+  MutterWindow *cw = find_window_in_display (compositor->display,
+                                             event->window);
+  if (cw == NULL)
+    return;
+
+  if (event->kind == ShapeBounding)
+    {
+      mutter_window_update_shape (cw, event->shaped);
+    }
+}
+#endif
+
+static void
+process_property_notify (MetaCompositor	*compositor,
+                         XPropertyEvent *event)
+{
+  MetaDisplay *display = compositor->display;
+
+  /* Check for the opacity changing */
+  if (event->atom == compositor->atom_net_wm_window_opacity)
+    {
+      MutterWindow *cw = find_window_in_display (display, event->window);
+
+      if (!cw)
+        {
+          /* Applications can set this for their toplevel windows, so
+           * this must be propagated to the window managed by the compositor
+           */
+          cw = find_window_for_child_window_in_display (display,
+                                                        event->window);
+        }
+
+      if (!cw)
+	{
+	  DEBUG_TRACE ("process_property_notify: opacity, early exit\n");
+	  return;
+	}
+
+      mutter_window_update_opacity (cw);
+    }
+  else if (event->atom == meta_display_get_atom (display,
+					       META_ATOM__NET_WM_WINDOW_TYPE))
+    {
+      MutterWindow *cw = find_window_in_display (display, event->window);
+
+      if (!cw)
+	{
+	  DEBUG_TRACE ("process_property_notify: net_wm_type, early exit\n");
+	  return;
+	}
+
+      mutter_window_update_window_type (cw);
+      DEBUG_TRACE ("process_property_notify: net_wm_type\n");
+      return;
+    }
+  DEBUG_TRACE ("process_property_notify: unknown\n");
+}
+
+static Window
+get_output_window (MetaScreen *screen)
+{
+  MetaDisplay *display = meta_screen_get_display (screen);
+  Display     *xdisplay = meta_display_get_xdisplay (display);
+  Window       output, xroot;
+  XWindowAttributes attr;
+  long         event_mask;
+
+  xroot = meta_screen_get_xroot (screen);
+
+  event_mask = FocusChangeMask |
+               ExposureMask |
+               EnterWindowMask | LeaveWindowMask |
+	       PointerMotionMask |
+               PropertyChangeMask |
+               ButtonPressMask | ButtonReleaseMask |
+               KeyPressMask | KeyReleaseMask;
+
+  output = XCompositeGetOverlayWindow (xdisplay, xroot);
+
+  if (XGetWindowAttributes (xdisplay, output, &attr))
+      {
+        event_mask |= attr.your_event_mask;
+      }
+
+  XSelectInput (xdisplay, output, event_mask);
+
+  return output;
+}
+
+ClutterActor *
+mutter_get_stage_for_screen (MetaScreen *screen)
+{
+  MetaCompScreen *info = meta_screen_get_compositor_data (screen);
+
+  if (!info)
+    return NULL;
+
+  return info->stage;
+}
+
+ClutterActor *
+mutter_get_overlay_group_for_screen (MetaScreen *screen)
+{
+  MetaCompScreen *info = meta_screen_get_compositor_data (screen);
+
+  if (!info)
+    return NULL;
+
+  return info->overlay_group;
+}
+
+ClutterActor *
+mutter_get_window_group_for_screen (MetaScreen *screen)
+{
+  MetaCompScreen *info = meta_screen_get_compositor_data (screen);
+
+  if (!info)
+    return NULL;
+
+  return info->window_group;
+}
+
+GList *
+mutter_get_windows (MetaScreen *screen)
+{
+  MetaCompScreen *info = meta_screen_get_compositor_data (screen);
+
+  if (!info)
+    return NULL;
+
+  return info->windows;
+}
+
+static void
+do_set_stage_input_region (MetaScreen *screen,
+                           XserverRegion region)
+{
+  MetaCompScreen *info = meta_screen_get_compositor_data (screen);
+  MetaDisplay *display = meta_screen_get_display (screen);
+  Display        *xdpy = meta_display_get_xdisplay (display);
+  Window        xstage = clutter_x11_get_stage_window (CLUTTER_STAGE (info->stage));
+
+  XFixesSetWindowShapeRegion (xdpy, xstage, ShapeInput, 0, 0, region);
+  XFixesSetWindowShapeRegion (xdpy, info->output, ShapeInput, 0, 0, region);
+}
+
+void
+mutter_set_stage_input_region (MetaScreen *screen,
+                               XserverRegion region)
+{
+  MetaCompScreen *info = meta_screen_get_compositor_data (screen);
+  MetaDisplay  *display = meta_screen_get_display (screen);
+  Display      *xdpy    = meta_display_get_xdisplay (display);
+
+  if (info->stage && info->output)
+    {
+      do_set_stage_input_region (screen, region);
+    }
+  else 
+    {
+      /* Reset info->pending_input_region if one existed before and set the new
+       * one to use it later. */ 
+      if (info->pending_input_region)
+        {
+          XFixesDestroyRegion (xdpy, info->pending_input_region);
+          info->pending_input_region = None;
+        }
+      if (region != None)
+        {
+          info->pending_input_region = XFixesCreateRegion (xdpy, NULL, 0);
+          XFixesCopyRegion (xdpy, info->pending_input_region, region);
+        }
+    } 
+}
+
+void
+mutter_empty_stage_input_region (MetaScreen *screen)
+{
+  /* Using a static region here is a bit hacky, but Metacity never opens more than
+   * one XDisplay, so it works fine. */
+  static XserverRegion region = None;
+
+  if (region == None)
+    {
+      MetaDisplay  *display = meta_screen_get_display (screen);
+      Display      *xdpy    = meta_display_get_xdisplay (display);
+      region = XFixesCreateRegion (xdpy, NULL, 0);
+    }
+
+  mutter_set_stage_input_region (screen, region);
+}
+
+void
+meta_compositor_manage_screen (MetaCompositor *compositor,
+                               MetaScreen     *screen)
+{
+  MetaCompScreen *info;
+  MetaDisplay    *display       = meta_screen_get_display (screen);
+  Display        *xdisplay      = meta_display_get_xdisplay (display);
+  int             screen_number = meta_screen_get_screen_number (screen);
+  Window          xroot         = meta_screen_get_xroot (screen);
+  Window          xwin;
+  gint            width, height;
+  XWindowAttributes attr;
+  long            event_mask;
+
+  /* Check if the screen is already managed */
+  if (meta_screen_get_compositor_data (screen))
+    return;
+
+  meta_error_trap_push_with_return (display);
+  XCompositeRedirectSubwindows (xdisplay, xroot, CompositeRedirectManual);
+  XSync (xdisplay, FALSE);
+
+  if (meta_error_trap_pop_with_return (display, FALSE))
+    {
+      g_warning ("Another compositing manager is running on screen %i",
+                 screen_number);
+      return;
+    }
+
+  info = g_new0 (MetaCompScreen, 1);
+  /*
+   * We use an empty input region for Clutter as a default because that allows
+   * the user to interact with all the windows displayed on the screen.
+   * We have to initialize info->pending_input_region to an empty region explicitly, 
+   * because None value is used to mean that the whole screen is an input region.
+   */
+  info->pending_input_region = XFixesCreateRegion (xdisplay, NULL, 0);
+
+  info->screen = screen;
+
+  meta_screen_set_compositor_data (screen, info);
+
+  info->output = None;
+  info->windows = NULL;
+  info->windows_by_xid = g_hash_table_new (g_direct_hash, g_direct_equal);
+
+  meta_screen_set_cm_selection (screen);
+
+  info->stage = clutter_stage_get_default ();
+
+  meta_screen_get_size (screen, &width, &height);
+  clutter_actor_set_size (info->stage, width, height);
+
+  xwin = clutter_x11_get_stage_window (CLUTTER_STAGE (info->stage));
+
+  event_mask = FocusChangeMask |
+               ExposureMask |
+               EnterWindowMask | LeaveWindowMask |
+               PointerMotionMask |
+               PropertyChangeMask |
+               ButtonPressMask | ButtonReleaseMask |
+               KeyPressMask | KeyReleaseMask |
+               StructureNotifyMask;
+
+  if (XGetWindowAttributes (xdisplay, xwin, &attr))
+      {
+        event_mask |= attr.your_event_mask;
+      }
+
+  XSelectInput (xdisplay, xwin, event_mask);
+
+  info->window_group = mutter_window_group_new (screen);
+  info->overlay_group = clutter_group_new ();
+  info->hidden_group = clutter_group_new ();
+
+  clutter_container_add (CLUTTER_CONTAINER (info->stage),
+                         info->window_group,
+                         info->overlay_group,
+			 info->hidden_group,
+                         NULL);
+
+  clutter_actor_hide (info->hidden_group);
+
+  info->plugin_mgr =
+    mutter_plugin_manager_new (screen);
+  if (!mutter_plugin_manager_load (info->plugin_mgr))
+    g_critical ("failed to load plugins");
+  if (!mutter_plugin_manager_initialize (info->plugin_mgr))
+    g_critical ("failed to initialize plugins");
+
+  /*
+   * Delay the creation of the overlay window as long as we can, to avoid
+   * blanking out the screen. This means that during the plugin loading, the
+   * overlay window is not accessible; if the plugin needs to access it
+   * directly, it should hook into the "show" signal on stage, and do
+   * its stuff there.
+   */
+  info->output = get_output_window (screen);
+  XReparentWindow (xdisplay, xwin, info->output, 0, 0);
+
+ /* Make sure there isn't any left-over output shape on the 
+  * overlay window by setting the whole screen to be an
+  * output region.
+  * 
+  * Note: there doesn't seem to be any real chance of that
+  *  because the X server will destroy the overlay window
+  *  when the last client using it exits.
+  */
+  XFixesSetWindowShapeRegion (xdisplay, info->output, ShapeBounding, 0, 0, None);
+
+  do_set_stage_input_region (screen, info->pending_input_region);
+  if (info->pending_input_region != None)
+    {
+      XFixesDestroyRegion (xdisplay, info->pending_input_region);
+      info->pending_input_region = None;
+    }
+
+  clutter_actor_show (info->overlay_group);
+  clutter_actor_show (info->stage);
+}
+
+void
+meta_compositor_unmanage_screen (MetaCompositor *compositor,
+                                 MetaScreen     *screen)
+{
+}
+
+void
+meta_compositor_add_window (MetaCompositor    *compositor,
+                            MetaWindow        *window)
+{
+  MetaScreen *screen = meta_window_get_screen (window);
+  MetaDisplay *display = meta_screen_get_display (screen);
+
+  DEBUG_TRACE ("meta_compositor_add_window\n");
+  meta_error_trap_push (display);
+
+  add_win (window);
+
+  meta_error_trap_pop (display, FALSE);
+}
+
+void
+meta_compositor_remove_window (MetaCompositor *compositor,
+                               MetaWindow     *window)
+{
+  MutterWindow         *cw     = NULL;
+
+  DEBUG_TRACE ("meta_compositor_remove_window\n");
+  cw = MUTTER_WINDOW (meta_window_get_compositor_private (window));
+  if (!cw)
+    return;
+
+  mutter_window_destroy (cw);
+}
+
+void
+meta_compositor_set_updates (MetaCompositor *compositor,
+                             MetaWindow     *window,
+                             gboolean        updates)
+{
+}
+
+gboolean
+meta_compositor_process_event (MetaCompositor *compositor,
+                               XEvent         *event,
+                               MetaWindow     *window)
+{
+  if (window)
+    {
+      MetaCompScreen *info;
+      MetaScreen     *screen;
+
+      screen = meta_window_get_screen (window);
+      info = meta_screen_get_compositor_data (screen);
+
+      if (mutter_plugin_manager_xevent_filter (info->plugin_mgr, event))
+	{
+	  DEBUG_TRACE ("meta_compositor_process_event (filtered,window==NULL)\n");
+	  return TRUE;
+	}
+    }
+  else
+    {
+      GSList *l;
+
+      l = meta_display_get_screens (compositor->display);
+
+      while (l)
+	{
+	  MetaScreen     *screen = l->data;
+	  MetaCompScreen *info;
+
+	  info = meta_screen_get_compositor_data (screen);
+
+	  if (mutter_plugin_manager_xevent_filter (info->plugin_mgr, event))
+	    {
+	      DEBUG_TRACE ("meta_compositor_process_event (filtered,window==NULL)\n");
+	      return TRUE;
+	    }
+
+	  l = l->next;
+	}
+    }
+
+  /*
+   * This trap is so that none of the compositor functions cause
+   * X errors. This is really a hack, but I'm afraid I don't understand
+   * enough about Metacity/X to know how else you are supposed to do it
+   */
+
+
+  meta_error_trap_push (compositor->display);
+  switch (event->type)
+    {
+    case PropertyNotify:
+      process_property_notify (compositor, (XPropertyEvent *) event);
+      break;
+
+    default:
+      if (event->type == meta_display_get_damage_event_base (compositor->display) + XDamageNotify)
+        {
+	  DEBUG_TRACE ("meta_compositor_process_event (process_damage)\n");
+          process_damage (compositor, (XDamageNotifyEvent *) event);
+        }
+#ifdef HAVE_SHAPE
+      else if (event->type == meta_display_get_shape_event_base (compositor->display) + ShapeNotify)
+	{
+	  DEBUG_TRACE ("meta_compositor_process_event (process_shape)\n");
+	  process_shape (compositor, (XShapeEvent *) event);
+	}
+#endif /* HAVE_SHAPE */
+      break;
+    }
+
+  meta_error_trap_pop (compositor->display, FALSE);
+
+  /* Clutter needs to know about MapNotify events otherwise it will
+     think the stage is invisible */
+  if (event->type == MapNotify)
+    clutter_x11_handle_event (event);
+
+  /* The above handling is basically just "observing" the events, so we return
+   * FALSE to indicate that the event should not be filtered out; if we have
+   * GTK+ windows in the same process, GTK+ needs the ConfigureNotify event, for example.
+   */
+  return FALSE;
+}
+
+void
+meta_compositor_show_window (MetaCompositor *compositor,
+			     MetaWindow	    *window,
+                             MetaCompEffect  effect)
+{
+  MutterWindow *cw = MUTTER_WINDOW (meta_window_get_compositor_private (window));
+  DEBUG_TRACE ("meta_compositor_show_window\n");
+  if (!cw)
+    return;
+
+  mutter_window_show (cw, effect);
+}
+
+void
+meta_compositor_hide_window (MetaCompositor *compositor,
+                             MetaWindow     *window,
+                             MetaCompEffect  effect)
+{
+  MutterWindow *cw = MUTTER_WINDOW (meta_window_get_compositor_private (window));
+  DEBUG_TRACE ("meta_compositor_hide_window\n");
+  if (!cw)
+    return;
+
+  mutter_window_hide (cw, effect);
+}
+
+void
+meta_compositor_maximize_window (MetaCompositor    *compositor,
+                                 MetaWindow        *window,
+				 MetaRectangle	   *old_rect,
+				 MetaRectangle	   *new_rect)
+{
+  MutterWindow	 *cw = MUTTER_WINDOW (meta_window_get_compositor_private (window));
+  DEBUG_TRACE ("meta_compositor_maximize_window\n");
+  if (!cw)
+    return;
+
+  mutter_window_maximize (cw, old_rect, new_rect);
+}
+
+void
+meta_compositor_unmaximize_window (MetaCompositor    *compositor,
+                                   MetaWindow        *window,
+				   MetaRectangle     *old_rect,
+				   MetaRectangle     *new_rect)
+{
+  MutterWindow	 *cw = MUTTER_WINDOW (meta_window_get_compositor_private (window));
+  DEBUG_TRACE ("meta_compositor_unmaximize_window\n");
+  if (!cw)
+    return;
+
+  mutter_window_unmaximize (cw, old_rect, new_rect);
+}
+
+void
+meta_compositor_update_workspace_geometry (MetaCompositor *compositor,
+                                           MetaWorkspace  *workspace)
+{
+#if 0
+  /* FIXME -- should do away with this function in favour of MetaWorkspace
+   * signal.
+   */
+  MetaScreen     *screen = meta_workspace_get_screen (workspace);
+  MetaCompScreen *info;
+  MutterPluginManager *mgr;
+
+  DEBUG_TRACE ("meta_compositor_update_workspace_geometry\n");
+  info = meta_screen_get_compositor_data (screen);
+  mgr  = info->plugin_mgr;
+
+  if (!mgr || !workspace)
+    return;
+
+  mutter_plugin_manager_update_workspace (mgr, workspace);
+#endif
+}
+
+void
+meta_compositor_switch_workspace (MetaCompositor     *compositor,
+                                  MetaScreen         *screen,
+                                  MetaWorkspace      *from,
+                                  MetaWorkspace      *to,
+                                  MetaMotionDirection direction)
+{
+  MetaCompScreen *info;
+  gint            to_indx, from_indx;
+
+  info      = meta_screen_get_compositor_data (screen);
+  to_indx   = meta_workspace_index (to);
+  from_indx = meta_workspace_index (from);
+
+  DEBUG_TRACE ("meta_compositor_switch_workspace\n");
+
+  if (!info) /* During startup before manage_screen() */
+    return;
+
+  info->switch_workspace_in_progress++;
+
+  if (!info->plugin_mgr ||
+      !mutter_plugin_manager_switch_workspace (info->plugin_mgr,
+					       (const GList **)&info->windows,
+					       from_indx,
+					       to_indx,
+					       direction))
+    {
+      info->switch_workspace_in_progress--;
+
+      /* We have to explicitely call this to fix up stacking order of the
+       * actors; this is because the abs stacking position of actors does not
+       * necessarily change during the window hiding/unhiding, only their
+       * relative position toward the destkop window.
+       */
+      mutter_finish_workspace_switch (info);
+    }
+}
+
+static void
+sync_actor_stacking (GList *windows)
+{
+  GList *tmp;
+
+  /* NB: The first entry in the list is stacked the lowest */
+
+  for (tmp = g_list_last (windows); tmp != NULL; tmp = tmp->prev)
+    {
+      MutterWindow *cw = tmp->data;
+
+      clutter_actor_lower_bottom (CLUTTER_ACTOR (cw));
+    }
+}
+
+void
+meta_compositor_sync_stack (MetaCompositor  *compositor,
+			    MetaScreen	    *screen,
+			    GList	    *stack)
+{
+  GList *old_stack;
+  MetaCompScreen *info = meta_screen_get_compositor_data (screen);
+
+  DEBUG_TRACE ("meta_compositor_sync_stack\n");
+
+  /* This is painful because hidden windows that we are in the process
+   * of animating out of existence. They'll be at the bottom of the
+   * stack of X windows, but we want to leave them in their old position
+   * until the animation effect finishes.
+   */
+
+  /* Sources: first window is the highest */
+  stack = g_list_copy (stack); /* The new stack of MetaWindow */
+  old_stack = g_list_reverse (info->windows); /* The old stack of MutterWindow */
+  info->windows = NULL;
+
+  while (TRUE)
+    {
+      MutterWindow *old_actor = NULL, *stack_actor = NULL, *actor;
+      MetaWindow *old_window = NULL, *stack_window = NULL, *window;
+
+      /* Find the remaining top actor in our existing stack (ignoring
+       * windows that have been hidden and are no longer animating) */
+      while (old_stack)
+        {
+          old_actor = old_stack->data;
+          old_window = mutter_window_get_meta_window (old_actor);
+
+          if (old_window->hidden &&
+              !mutter_window_effect_in_progress (old_actor))
+            old_stack = g_list_delete_link (old_stack, old_stack);
+          else
+            break;
+        }
+
+      /* And the remaining top actor in the new stack */
+      while (stack)
+        {
+          stack_window = stack->data;
+          stack_actor = MUTTER_WINDOW (meta_window_get_compositor_private (stack_window));
+          if (!stack_actor)
+            {
+              meta_verbose ("Failed to find corresponding MutterWindow "
+                            "for window %s\n", meta_window_get_description (stack_window));
+              stack = g_list_delete_link (stack, stack);
+            }
+          else
+            break;
+        }
+
+      if (!old_actor && !stack_actor) /* Nothing more to stack */
+        break;
+
+      /* We usually prefer the window in the new stack, but if if we
+       * found a hidden window in the process of being animated out
+       * of existence in the old stack we use that instead. We've
+       * filtered out non-animating hidden windows above.
+       */
+      if (old_actor &&
+          (!stack_actor || old_window->hidden))
+        {
+          actor = old_actor;
+          window = old_window;
+        }
+      else
+        {
+          actor = stack_actor;
+          window = stack_window;
+        }
+
+      /* OK, we know what actor we want next. Add it to our window
+       * list, and remove it from both source lists. (It will
+       * be at the front of at least one, hopefully it will be
+       * near the front of the other.)
+       */
+      info->windows = g_list_prepend (info->windows, actor);
+
+      stack = g_list_remove (stack, window);
+      old_stack = g_list_remove (old_stack, actor);
+    }
+
+  sync_actor_stacking (info->windows);
+}
+
+void
+meta_compositor_window_mapped (MetaCompositor *compositor,
+                               MetaWindow     *window)
+{
+  MutterWindow *cw = MUTTER_WINDOW (meta_window_get_compositor_private (window));
+  DEBUG_TRACE ("meta_compositor_window_mapped\n");
+  if (!cw)
+    return;
+
+  mutter_window_mapped (cw);
+}
+
+void
+meta_compositor_window_unmapped (MetaCompositor *compositor,
+                                 MetaWindow     *window)
+{
+  MutterWindow *cw = MUTTER_WINDOW (meta_window_get_compositor_private (window));
+  DEBUG_TRACE ("meta_compositor_window_unmapped\n");
+  if (!cw)
+    return;
+
+  mutter_window_unmapped (cw);
+}
+
+void
+meta_compositor_sync_window_geometry (MetaCompositor *compositor,
+				      MetaWindow *window)
+{
+  MutterWindow	 *cw = MUTTER_WINDOW (meta_window_get_compositor_private (window));
+  MetaScreen	 *screen = meta_window_get_screen (window);
+  MetaCompScreen *info = meta_screen_get_compositor_data (screen);
+
+  DEBUG_TRACE ("meta_compositor_sync_window_geometry\n");
+  g_return_if_fail (info);
+
+  if (!cw)
+    return;
+
+  mutter_window_sync_actor_position (cw);
+}
+
+void
+meta_compositor_sync_screen_size (MetaCompositor  *compositor,
+				  MetaScreen	  *screen,
+				  guint		   width,
+				  guint		   height)
+{
+  MetaCompScreen *info = meta_screen_get_compositor_data (screen);
+
+  DEBUG_TRACE ("meta_compositor_sync_screen_size\n");
+  g_return_if_fail (info);
+
+  clutter_actor_set_size (info->stage, width, height);
+
+  meta_verbose ("Changed size for stage on screen %d to %dx%d\n",
+		meta_screen_get_screen_number (screen),
+		width, height);
+}
+
+static void
+pre_paint_windows (MetaCompScreen *info)
+{
+  GList *l;
+
+  for (l = info->windows; l; l = l->next)
+    mutter_window_pre_paint (l->data);
+}
+
+static gboolean
+mutter_repaint_func (gpointer data)
+{
+  MetaCompositor *compositor = data;
+  GSList *screens = meta_display_get_screens (compositor->display);
+  GSList *l;
+
+  for (l = screens; l; l = l->next)
+    {
+      MetaScreen *screen = l->data;
+      MetaCompScreen *info = meta_screen_get_compositor_data (screen);
+      if (!info)
+        continue;
+
+      pre_paint_windows (info);
+    }
+
+  return TRUE;
+}
+
+MetaCompositor *
+meta_compositor_new (MetaDisplay *display)
+{
+  char *atom_names[] = {
+    "_XROOTPMAP_ID",
+    "_XSETROOT_ID",
+    "_NET_WM_WINDOW_OPACITY",
+  };
+  Atom                   atoms[G_N_ELEMENTS(atom_names)];
+  MetaCompositor        *compositor;
+  Display               *xdisplay = meta_display_get_xdisplay (display);
+
+  if (!composite_at_least_version (display, 0, 3))
+    return NULL;
+
+  compositor = g_new0 (MetaCompositor, 1);
+
+  compositor->display = display;
+
+  if (g_getenv("MUTTER_DISABLE_MIPMAPS"))
+    compositor->no_mipmaps = TRUE;
+
+  meta_verbose ("Creating %d atoms\n", (int) G_N_ELEMENTS (atom_names));
+  XInternAtoms (xdisplay, atom_names, G_N_ELEMENTS (atom_names),
+                False, atoms);
+
+  compositor->atom_x_root_pixmap = atoms[0];
+  compositor->atom_x_set_root = atoms[1];
+  compositor->atom_net_wm_window_opacity = atoms[2];
+
+  compositor->repaint_func_id = clutter_threads_add_repaint_func (mutter_repaint_func,
+                                                                  compositor,
+                                                                  NULL);
+
+  return compositor;
+}
+
+Window
+mutter_get_overlay_window (MetaScreen *screen)
+{
+  MetaCompScreen *info = meta_screen_get_compositor_data (screen);
+
+  return info->output;
+}
--- a/src/compositor/mutter-module.c
+++ b/src/compositor/mutter-module.c
@@ -0,0 +1,208 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (c) 2008 Intel Corp.
+ *
+ * Author: Tomas Frydrych <tf@linux.intel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#include "mutter-plugin.h"
+#include "mutter-module.h"
+
+#include <gmodule.h>
+
+enum
+{
+  PROP_0,
+  PROP_PATH,
+};
+
+struct _MutterModulePrivate
+{
+  GModule      *lib;
+  gchar        *path;
+  GType         plugin_type;
+};
+
+#define MUTTER_MODULE_GET_PRIVATE(obj) \
+(G_TYPE_INSTANCE_GET_PRIVATE ((obj), MUTTER_TYPE_MODULE, MutterModulePrivate))
+
+G_DEFINE_TYPE (MutterModule, mutter_module, G_TYPE_TYPE_MODULE);
+
+static gboolean
+mutter_module_load (GTypeModule *gmodule)
+{
+  MutterModulePrivate  *priv = MUTTER_MODULE (gmodule)->priv;
+  MutterPluginVersion  *info = NULL;
+  GType                (*register_type) (GTypeModule *) = NULL;
+
+  if (priv->lib && priv->plugin_type)
+    return TRUE;
+
+  g_assert (priv->path);
+
+  if (!priv->lib &&
+      !(priv->lib = g_module_open (priv->path, 0)))
+    {
+      g_warning ("Could not load library [%s (%s)]",
+                 priv->path, g_module_error ());
+      return FALSE;
+    }
+
+  if (g_module_symbol (priv->lib, "mutter_plugin_version",
+                       (gpointer *)(void *)&info) &&
+      g_module_symbol (priv->lib, "mutter_plugin_register_type",
+		       (gpointer *)(void *)&register_type) &&
+      info && register_type)
+    {
+      if (info->version_api != MUTTER_PLUGIN_API_VERSION)
+	g_warning ("Plugin API mismatch for [%s]", priv->path);
+      else
+        {
+          GType plugin_type;
+
+          if (!(plugin_type = register_type (gmodule)))
+            {
+              g_warning ("Could not register type for plugin %s",
+                         priv->path);
+              return FALSE;
+            }
+          else
+            {
+              priv->plugin_type =  plugin_type;
+            }
+
+          return TRUE;
+        }
+    }
+  else
+    g_warning ("Broken plugin module [%s]", priv->path);
+
+  return FALSE;
+}
+
+static void
+mutter_module_unload (GTypeModule *gmodule)
+{
+  MutterModulePrivate *priv = MUTTER_MODULE (gmodule)->priv;
+
+  g_module_close (priv->lib);
+
+  priv->lib = NULL;
+  priv->plugin_type = 0;
+}
+
+static void
+mutter_module_dispose (GObject *object)
+{
+  G_OBJECT_CLASS (mutter_module_parent_class)->dispose (object);
+}
+
+static void
+mutter_module_finalize (GObject *object)
+{
+  MutterModulePrivate *priv = MUTTER_MODULE (object)->priv;
+
+  g_free (priv->path);
+  priv->path = NULL;
+
+  G_OBJECT_CLASS (mutter_module_parent_class)->finalize (object);
+}
+
+static void
+mutter_module_set_property (GObject      *object,
+			    guint         prop_id,
+			    const GValue *value,
+			    GParamSpec   *pspec)
+{
+  MutterModulePrivate *priv = MUTTER_MODULE (object)->priv;
+
+  switch (prop_id)
+    {
+    case PROP_PATH:
+      g_free (priv->path);
+      priv->path = g_value_dup_string (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+mutter_module_get_property (GObject    *object,
+			    guint       prop_id,
+			    GValue     *value,
+			    GParamSpec *pspec)
+{
+  MutterModulePrivate *priv = MUTTER_MODULE (object)->priv;
+
+  switch (prop_id)
+    {
+    case PROP_PATH:
+      g_value_set_string (value, priv->path);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+mutter_module_class_init (MutterModuleClass *klass)
+{
+  GObjectClass     *gobject_class = G_OBJECT_CLASS (klass);
+  GTypeModuleClass *gmodule_class = G_TYPE_MODULE_CLASS (klass);
+
+  gobject_class->finalize     = mutter_module_finalize;
+  gobject_class->dispose      = mutter_module_dispose;
+  gobject_class->set_property = mutter_module_set_property;
+  gobject_class->get_property = mutter_module_get_property;
+
+  gmodule_class->load         = mutter_module_load;
+  gmodule_class->unload       = mutter_module_unload;
+
+  g_object_class_install_property (gobject_class,
+				   PROP_PATH,
+				   g_param_spec_string ("path",
+							"Path",
+							"Load path",
+							NULL,
+							G_PARAM_READWRITE |
+						      G_PARAM_CONSTRUCT_ONLY));
+
+  g_type_class_add_private (gobject_class, sizeof (MutterModulePrivate));
+}
+
+static void
+mutter_module_init (MutterModule *self)
+{
+  MutterModulePrivate *priv;
+
+  self->priv = priv = MUTTER_MODULE_GET_PRIVATE (self);
+
+}
+
+GType
+mutter_module_get_plugin_type (MutterModule *module)
+{
+  MutterModulePrivate *priv = MUTTER_MODULE (module)->priv;
+
+  return priv->plugin_type;
+}
+
--- a/src/compositor/mutter-module.h
+++ b/src/compositor/mutter-module.h
@@ -0,0 +1,57 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (c) 2008 Intel Corp.
+ *
+ * Author: Tomas Frydrych <tf@linux.intel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#ifndef MUTTER_MODULE_H_
+#define MUTTER_MODULE_H_
+
+#include <glib-object.h>
+
+#define MUTTER_TYPE_MODULE            (mutter_module_get_type ())
+#define MUTTER_MODULE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MUTTER_TYPE_MODULE, MutterModule))
+#define MUTTER_MODULE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  MUTTER_TYPE_MODULE, MutterModuleClass))
+#define MUTTER_IS_MODULE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MUTTER_MODULE_TYPE))
+#define MUTTER_IS_MODULE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  MUTTER_TYPE_MODULE))
+#define MUTTER_MODULE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  MUTTER_TYPE_MODULE, MutterModuleClass))
+
+typedef struct _MutterModule        MutterModule;
+typedef struct _MutterModuleClass   MutterModuleClass;
+typedef struct _MutterModulePrivate MutterModulePrivate;
+
+struct _MutterModule
+{
+  GTypeModule parent;
+
+  MutterModulePrivate *priv;
+};
+
+struct _MutterModuleClass
+{
+  GTypeModuleClass parent_class;
+};
+
+
+GType mutter_module_get_type (void);
+
+GType mutter_module_get_plugin_type (MutterModule *module);
+
+#endif
--- a/src/compositor/mutter-plugin-manager.c
+++ b/src/compositor/mutter-plugin-manager.c
@@ -0,0 +1,634 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (c) 2008 Intel Corp.
+ *
+ * Author: Tomas Frydrych <tf@linux.intel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#include "config.h"
+#include "mutter-plugin-manager.h"
+#include "prefs.h"
+#include "errors.h"
+#include "workspace.h"
+#include "mutter-module.h"
+
+#include <string.h>
+
+#include <clutter/x11/clutter-x11.h>
+
+/*
+ * There is only one instace of each module per the process.
+ */
+static GHashTable *plugin_modules = NULL;
+
+static gboolean mutter_plugin_manager_reload (MutterPluginManager *plugin_mgr);
+
+struct MutterPluginManager
+{
+  MetaScreen   *screen;
+
+  GList /* MutterPluginPending */ *pending_plugin_modules; /* Plugins not yet fully loaded */
+  GList /* MutterPlugin */       *plugins;  /* TODO -- maybe use hash table */
+  GList                          *unload;  /* Plugins that are disabled and pending unload */
+
+  guint         idle_unload_id;
+};
+
+typedef struct MutterPluginPending
+{
+  MutterModule *module;
+  char *path;
+  char *params;
+} MutterPluginPending;
+
+/*
+ * Checks that the plugin is compatible with the WM and sets up the plugin
+ * struct.
+ */
+static MutterPlugin *
+mutter_plugin_load (MutterPluginManager *mgr,
+                    MutterModule        *module,
+                    const gchar         *params)
+{
+  MutterPlugin *plugin = NULL;
+  GType         plugin_type = mutter_module_get_plugin_type (module);
+
+  if (!plugin_type)
+    {
+      g_warning ("Plugin type not registered !!!");
+      return NULL;
+    }
+
+  plugin = g_object_new (plugin_type,
+                         "screen", mgr->screen,
+                         "params", params,
+                         NULL);
+
+  return plugin;
+}
+
+/*
+ * Attempst to unload a plugin; returns FALSE if plugin cannot be unloaded at
+ * present (e.g., and effect is in progress) and should be scheduled for
+ * removal later.
+ */
+static gboolean
+mutter_plugin_unload (MutterPlugin *plugin)
+{
+  if (mutter_plugin_running (plugin))
+    {
+      g_object_set (plugin, "disabled", TRUE, NULL);
+      return FALSE;
+    }
+
+  g_object_unref (plugin);
+
+  return TRUE;
+}
+
+/*
+ * Iddle callback to remove plugins that could not be removed directly and are
+ * pending for removal.
+ */
+static gboolean
+mutter_plugin_manager_idle_unload (MutterPluginManager *plugin_mgr)
+{
+  GList *l = plugin_mgr->unload;
+  gboolean dont_remove = TRUE;
+
+  while (l)
+    {
+      MutterPlugin *plugin = l->data;
+
+      if (mutter_plugin_unload (plugin))
+        {
+          /* Remove from list */
+          GList *p = l->prev;
+          GList *n = l->next;
+
+          if (!p)
+            plugin_mgr->unload = n;
+          else
+            p->next = n;
+
+          if (n)
+            n->prev = p;
+
+          g_list_free_1 (l);
+
+          l = n;
+        }
+      else
+        l = l->next;
+    }
+
+  if (!plugin_mgr->unload)
+    {
+      /* If no more unloads are pending, remove the handler as well */
+      dont_remove = FALSE;
+      plugin_mgr->idle_unload_id = 0;
+    }
+
+  return dont_remove;
+}
+
+/*
+ * Unloads all plugins
+ */
+static void
+mutter_plugin_manager_unload (MutterPluginManager *plugin_mgr)
+{
+  GList *plugins = plugin_mgr->plugins;
+
+  while (plugins)
+    {
+      MutterPlugin *plugin = plugins->data;
+
+      /* If the plugin could not be removed, move it to the unload list */
+      if (!mutter_plugin_unload (plugin))
+        {
+          plugin_mgr->unload = g_list_prepend (plugin_mgr->unload, plugin);
+
+          if (!plugin_mgr->idle_unload_id)
+            {
+              plugin_mgr->idle_unload_id = g_idle_add ((GSourceFunc)
+                            mutter_plugin_manager_idle_unload,
+                            plugin_mgr);
+            }
+        }
+
+      plugins = plugins->next;
+    }
+
+  g_list_free (plugin_mgr->plugins);
+  plugin_mgr->plugins = NULL;
+}
+
+static void
+prefs_changed_callback (MetaPreference pref,
+                        void          *data)
+{
+  MutterPluginManager *plugin_mgr = data;
+
+  if (pref == META_PREF_CLUTTER_PLUGINS)
+    {
+      mutter_plugin_manager_reload (plugin_mgr);
+    }
+}
+
+static MutterModule *
+mutter_plugin_manager_get_module (const gchar *path)
+{
+  MutterModule *module = g_hash_table_lookup (plugin_modules, path);
+
+  if (!module &&
+      (module = g_object_new (MUTTER_TYPE_MODULE, "path", path, NULL)))
+    {
+      g_hash_table_insert (plugin_modules, g_strdup (path), module);
+    }
+
+  return module;
+}
+
+/*
+ * Loads all plugins listed in gconf registry.
+ */
+gboolean
+mutter_plugin_manager_load (MutterPluginManager *plugin_mgr)
+{
+  const gchar *dpath = MUTTER_PLUGIN_DIR "/";
+  GSList      *plugins, *fallback = NULL;
+
+  plugins = meta_prefs_get_clutter_plugins ();
+
+  if (!plugins)
+    {
+      /*
+       * If no plugins are specified, try to load the default plugin.
+       */
+      fallback = g_slist_append (fallback, "default");
+      plugins = fallback;
+    }
+
+  while (plugins)
+    {
+      gchar   *plugin_string;
+      gchar   *params;
+
+      plugin_string = g_strdup (plugins->data);
+
+      if (plugin_string)
+        {
+          MutterModule *module;
+          gchar        *path;
+
+          params = strchr (plugin_string, ':');
+
+          if (params)
+            {
+              *params = 0;
+              ++params;
+            }
+
+          if (g_path_is_absolute (plugin_string))
+            path = g_strdup (plugin_string);
+          else
+            path = g_strconcat (dpath, plugin_string, ".so", NULL);
+
+          module = mutter_plugin_manager_get_module (path);
+
+          if (module)
+            {
+              gboolean      use_succeeded;
+
+              /*
+               * This dlopens the module and registers the plugin type with the
+               * GType system, if the module is not already loaded.  When we
+               * create a plugin, the type system also calls g_type_module_use()
+               * to guarantee the module will not be unloaded during the plugin
+               * life time. Consequently we can unuse() the module again.
+               */
+              use_succeeded = g_type_module_use (G_TYPE_MODULE (module));
+
+              if (use_succeeded)
+                {
+                  MutterPluginPending *pending = g_new0 (MutterPluginPending, 1);
+                  pending->module = module;
+                  pending->path = g_strdup (path);
+                  pending->params = g_strdup (params);
+                  plugin_mgr->pending_plugin_modules =
+                    g_list_prepend (plugin_mgr->pending_plugin_modules, pending);
+                }
+            }
+          else
+            g_warning ("Unable to load plugin module [%s]: %s",
+                       path, g_module_error());
+
+          g_free (path);
+          g_free (plugin_string);
+        }
+
+      plugins = plugins->next;
+    }
+
+
+  if (fallback)
+    g_slist_free (fallback);
+
+  if (plugin_mgr->pending_plugin_modules != NULL)
+    {
+      meta_prefs_add_listener (prefs_changed_callback, plugin_mgr);
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+gboolean
+mutter_plugin_manager_initialize (MutterPluginManager *plugin_mgr)
+{
+  GList *iter;
+
+  for (iter = plugin_mgr->pending_plugin_modules; iter; iter = iter->next)
+    {
+      MutterPluginPending *pending = (MutterPluginPending*) iter->data;
+      MutterPlugin *p;
+
+      if ((p = mutter_plugin_load (plugin_mgr, pending->module, pending->params)))
+        {
+          plugin_mgr->plugins = g_list_prepend (plugin_mgr->plugins, p);
+        }
+      else
+        {
+          g_warning ("Plugin load for [%s] failed", pending->path);
+        }
+
+      g_type_module_unuse (G_TYPE_MODULE (pending->module));
+      g_free (pending->path);
+      g_free (pending->params);
+      g_free (pending);
+    }
+  g_list_free (plugin_mgr->pending_plugin_modules);
+  plugin_mgr->pending_plugin_modules = NULL;
+  return TRUE;
+}
+
+/*
+ * Reloads all plugins
+ */
+static gboolean
+mutter_plugin_manager_reload (MutterPluginManager *plugin_mgr)
+{
+  /* TODO -- brute force; should we build a list of plugins to load and list of
+   * plugins to unload? We are probably not going to have large numbers of
+   * plugins loaded at the same time, so it might not be worth it.
+   */
+  mutter_plugin_manager_unload (plugin_mgr);
+  return mutter_plugin_manager_load (plugin_mgr);
+}
+
+MutterPluginManager *
+mutter_plugin_manager_new (MetaScreen *screen)
+{
+  MutterPluginManager *plugin_mgr;
+
+  if (!plugin_modules)
+    {
+      plugin_modules = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
+                                              NULL);
+    }
+
+  plugin_mgr = g_new0 (MutterPluginManager, 1);
+
+  plugin_mgr->screen        = screen;
+
+  return plugin_mgr;
+}
+
+static void
+mutter_plugin_manager_kill_effect (MutterPluginManager *plugin_mgr,
+                                   MutterWindow        *actor,
+                                   unsigned long        events)
+{
+  GList *l = plugin_mgr->plugins;
+
+  while (l)
+    {
+      MutterPlugin        *plugin = l->data;
+      MutterPluginClass   *klass = MUTTER_PLUGIN_GET_CLASS (plugin);
+
+      if (!mutter_plugin_disabled (plugin)
+	  && (mutter_plugin_features (plugin) & events)
+	  && klass->kill_effect)
+        klass->kill_effect (plugin, actor, events);
+
+      l = l->next;
+    }
+}
+
+#define ALL_BUT_SWITCH \
+  MUTTER_PLUGIN_ALL_EFFECTS & \
+  ~MUTTER_PLUGIN_SWITCH_WORKSPACE
+/*
+ * Public method that the compositor hooks into for events that require
+ * no additional parameters.
+ *
+ * Returns TRUE if at least one of the plugins handled the event type (i.e.,
+ * if the return value is FALSE, there will be no subsequent call to the
+ * manager completed() callback, and the compositor must ensure that any
+ * appropriate post-effect cleanup is carried out.
+ */
+gboolean
+mutter_plugin_manager_event_simple (MutterPluginManager *plugin_mgr,
+                                    MutterWindow        *actor,
+                                    unsigned long        event)
+{
+  GList *l = plugin_mgr->plugins;
+  gboolean retval = FALSE;
+
+  while (l)
+    {
+      MutterPlugin        *plugin = l->data;
+      MutterPluginClass   *klass = MUTTER_PLUGIN_GET_CLASS (plugin);
+
+      if (!mutter_plugin_disabled (plugin) &&
+          (mutter_plugin_features (plugin) & event))
+        {
+          retval = TRUE;
+
+          switch (event)
+            {
+            case MUTTER_PLUGIN_MINIMIZE:
+              if (klass->minimize)
+                {
+                  mutter_plugin_manager_kill_effect (
+		      plugin_mgr,
+		      actor,
+		      ALL_BUT_SWITCH);
+
+                  _mutter_plugin_effect_started (plugin);
+                  klass->minimize (plugin, actor);
+                }
+              break;
+            case MUTTER_PLUGIN_MAP:
+              if (klass->map)
+                {
+                  mutter_plugin_manager_kill_effect (
+		      plugin_mgr,
+		      actor,
+		      ALL_BUT_SWITCH);
+
+                  _mutter_plugin_effect_started (plugin);
+                  klass->map (plugin, actor);
+                }
+              break;
+            case MUTTER_PLUGIN_DESTROY:
+              if (klass->destroy)
+                {
+                  _mutter_plugin_effect_started (plugin);
+                  klass->destroy (plugin, actor);
+                }
+              break;
+            default:
+              g_warning ("Incorrect handler called for event %lu", event);
+            }
+        }
+
+      l = l->next;
+    }
+
+  return retval;
+}
+
+/*
+ * The public method that the compositor hooks into for maximize and unmaximize
+ * events.
+ *
+ * Returns TRUE if at least one of the plugins handled the event type (i.e.,
+ * if the return value is FALSE, there will be no subsequent call to the
+ * manager completed() callback, and the compositor must ensure that any
+ * appropriate post-effect cleanup is carried out.
+ */
+gboolean
+mutter_plugin_manager_event_maximize (MutterPluginManager *plugin_mgr,
+                                      MutterWindow        *actor,
+                                      unsigned long        event,
+                                      gint                 target_x,
+                                      gint                 target_y,
+                                      gint                 target_width,
+                                      gint                 target_height)
+{
+  GList *l = plugin_mgr->plugins;
+  gboolean retval = FALSE;
+
+  while (l)
+    {
+      MutterPlugin        *plugin = l->data;
+      MutterPluginClass   *klass = MUTTER_PLUGIN_GET_CLASS (plugin);
+
+      if (!mutter_plugin_disabled (plugin) &&
+          (mutter_plugin_features (plugin) & event))
+        {
+          retval = TRUE;
+
+          switch (event)
+            {
+            case MUTTER_PLUGIN_MAXIMIZE:
+              if (klass->maximize)
+                {
+                  mutter_plugin_manager_kill_effect (
+		      plugin_mgr,
+		      actor,
+		      ALL_BUT_SWITCH);
+
+                  _mutter_plugin_effect_started (plugin);
+                  klass->maximize (plugin, actor,
+                                   target_x, target_y,
+                                   target_width, target_height);
+                }
+              break;
+            case MUTTER_PLUGIN_UNMAXIMIZE:
+              if (klass->unmaximize)
+                {
+                  mutter_plugin_manager_kill_effect (
+		      plugin_mgr,
+		      actor,
+		      ALL_BUT_SWITCH);
+
+                  _mutter_plugin_effect_started (plugin);
+                  klass->unmaximize (plugin, actor,
+                                     target_x, target_y,
+                                     target_width, target_height);
+                }
+              break;
+            default:
+              g_warning ("Incorrect handler called for event %lu", event);
+            }
+        }
+
+      l = l->next;
+    }
+
+  return retval;
+}
+
+/*
+ * The public method that the compositor hooks into for desktop switching.
+ *
+ * Returns TRUE if at least one of the plugins handled the event type (i.e.,
+ * if the return value is FALSE, there will be no subsequent call to the
+ * manager completed() callback, and the compositor must ensure that any
+ * appropriate post-effect cleanup is carried out.
+ */
+gboolean
+mutter_plugin_manager_switch_workspace (MutterPluginManager *plugin_mgr,
+                                        const GList        **actors,
+                                        gint                 from,
+                                        gint                 to,
+                                        MetaMotionDirection  direction)
+{
+  GList *l = plugin_mgr->plugins;
+  gboolean retval = FALSE;
+
+  while (l)
+    {
+      MutterPlugin        *plugin = l->data;
+      MutterPluginClass   *klass = MUTTER_PLUGIN_GET_CLASS (plugin);
+
+      if (!mutter_plugin_disabled (plugin) &&
+          (mutter_plugin_features (plugin) & MUTTER_PLUGIN_SWITCH_WORKSPACE) &&
+          (actors && *actors))
+        {
+          if (klass->switch_workspace)
+            {
+              retval = TRUE;
+              mutter_plugin_manager_kill_effect (
+		  plugin_mgr,
+		  MUTTER_WINDOW ((*actors)->data),
+		  MUTTER_PLUGIN_SWITCH_WORKSPACE);
+
+              _mutter_plugin_effect_started (plugin);
+              klass->switch_workspace (plugin, actors, from, to, direction);
+            }
+        }
+
+      l = l->next;
+    }
+
+  return retval;
+}
+
+/*
+ * The public method that the compositor hooks into for desktop switching.
+ *
+ * Returns TRUE if at least one of the plugins handled the event type (i.e.,
+ * if the return value is FALSE, there will be no subsequent call to the
+ * manager completed() callback, and the compositor must ensure that any
+ * appropriate post-effect cleanup is carried out.
+ */
+gboolean
+mutter_plugin_manager_xevent_filter (MutterPluginManager *plugin_mgr,
+                                     XEvent              *xev)
+{
+  GList *l;
+  gboolean have_plugin_xevent_func;
+
+  if (!plugin_mgr)
+    return FALSE;
+
+  l = plugin_mgr->plugins;
+
+  /* We need to make sure that clutter gets certain events, like
+   * ConfigureNotify on the stage window. If there is a plugin that
+   * provides an xevent_filter function, then it's the responsibility
+   * of that plugin to pass events to Clutter. Otherwise, we send the
+   * event directly to Clutter ourselves.
+   *
+   * What happens if there are two plugins with xevent_filter functions
+   * is undefined; in general, multiple competing plugins are something
+   * we don't support well or care much about.
+   *
+   * FIXME: Really, we should just always handle sending the event to
+   *  clutter if a plugin doesn't report the event as handled by
+   *  returning TRUE, but it doesn't seem worth breaking compatibility
+   *  of the plugin interface right now to achieve this; the way it is
+   *  now works fine in practice.
+   */
+  have_plugin_xevent_func = FALSE;
+
+  while (l)
+    {
+      MutterPlugin      *plugin = l->data;
+      MutterPluginClass *klass = MUTTER_PLUGIN_GET_CLASS (plugin);
+
+      if (klass->xevent_filter)
+        {
+          have_plugin_xevent_func = TRUE;
+          if (klass->xevent_filter (plugin, xev) == TRUE)
+            return TRUE;
+        }
+
+      l = l->next;
+    }
+
+  if (!have_plugin_xevent_func)
+    return clutter_x11_handle_event (xev) != CLUTTER_X11_FILTER_CONTINUE;
+
+  return FALSE;
+}
--- a/src/compositor/mutter-plugin-manager.h
+++ b/src/compositor/mutter-plugin-manager.h
@@ -0,0 +1,63 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (c) 2008 Intel Corp.
+ *
+ * Author: Tomas Frydrych <tf@linux.intel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#ifndef MUTTER_PLUGIN_MANAGER_H_
+#define MUTTER_PLUGIN_MANAGER_H_
+
+#include "types.h"
+#include "screen.h"
+
+#define  MUTTER_PLUGIN_FROM_MANAGER_
+#include "mutter-plugin.h"
+#undef   MUTTER_PLUGIN_FROM_MANAGER_
+
+typedef struct MutterPluginManager MutterPluginManager;
+
+MutterPluginManager * mutter_plugin_manager_new (MetaScreen *screen);
+gboolean mutter_plugin_manager_load (MutterPluginManager *mgr);
+gboolean mutter_plugin_manager_initialize (MutterPluginManager *plugin_mgr);
+gboolean mutter_plugin_manager_event_simple (MutterPluginManager *mgr,
+					     MutterWindow  *actor,
+					     unsigned long    event);
+
+gboolean mutter_plugin_manager_event_maximize (MutterPluginManager *mgr,
+					       MutterWindow  *actor,
+					       unsigned long    event,
+					       gint             target_x,
+					       gint             target_y,
+					       gint             target_width,
+					       gint		target_height);
+void mutter_plugin_manager_update_workspaces (MutterPluginManager *mgr);
+
+void mutter_plugin_manager_update_workspace (MutterPluginManager *mgr, MetaWorkspace *w);
+
+gboolean mutter_plugin_manager_switch_workspace (MutterPluginManager *mgr,
+						 const GList **actors,
+						 gint          from,
+						 gint          to,
+						 MetaMotionDirection direction);
+
+gboolean mutter_plugin_manager_xevent_filter (MutterPluginManager *mgr,
+					      XEvent *xev);
+
+#endif
--- a/Show More
+++ b/Show More