Commit Graph

404 Commits

Author SHA1 Message Date
Owen W. Taylor
2d57904bf4 Bump version to 2.29.0 2010-02-18 17:08:21 -05:00
Richard Hughes
65766fcaac Fix the build when using a compiler that defaults to --no-add-needed
https://bugzilla.gnome.org/show_bug.cgi?id=606388
2010-02-16 16:32:11 -05:00
Owen W. Taylor
857c8aaaa2 Make libcanberra support optional
Add a configure switch:

 --with-libcanberra=[yes/no/auto]

(defaulting to auto); if libcanberra is not found or explicitly
disabled, then the default system bell will be used for the bell
sound and no switch workspace sound is played.

https://bugzilla.gnome.org/show_bug.cgi?id=609585
2010-02-11 12:04:11 -05:00
Matthias Clasen
5aab9e878f Use libcanberra to play system bell and workspace switch sounds
Patch by Lennart Poettering

* configure.in: Require libcanberra-gtk

* src/core/bell.c (meta_bell_notify): Play the alert sound from
the sound theme instead of the dreaded system bell.

* src/core/workspace.c (meta_workspace_activate_with_focus): Play
a sound on workspace switch.

https://bugzilla.gnome.org/show_bug.cgi?id=557921

https://bugzilla.gnome.org/show_bug.cgi?id=609585
2010-02-11 12:04:10 -05:00
Richard Hughes
3c76478510 Bump version to 2.28.1 2009-10-14 17:02:44 +01:00
Owen W. Taylor
200cd629df Bump version to 2.28.0 2009-10-07 18:40:18 -04:00
Owen W. Taylor
ac3eac7154 Bump version to 2.27.5 2009-09-15 17:30:07 -04:00
Owen W. Taylor
8d663ff055 Bump version to 2.27.4
Remove comment about Fibonacci micro numbering. We aren't going
to do that.
2009-09-04 19:00:03 -04:00
Owen W. Taylor
8d402971a8 Bump version to 2.27.3 2009-08-28 19:14:34 -04:00
Owen W. Taylor
dafdecb4e8 Be silent by default
We might as well turn on the AM_SILENT_RULES by default if a new-enough
automake is found rather than requiring --enable-silent-rules.

http://bugzilla.gnome.org/show_bug.cgi?id=591367
2009-08-11 18:53:30 -04:00
Owen W. Taylor
c5874e0da5 Bump version to 2.27.2 2009-08-10 12:24:03 -04:00
Tomas Frydrych
0f64202a29 Added --enable-silent-rules if automake-1.11 is available 2009-08-07 17:58:02 +01:00
Owen W. Taylor
da934be354 Elimitate use of arithmetic expansion for portability
Use expr rather than $(( <arithmetic> )) - this is needed at least
for the default Solaris shell.

Based on patch by Halton Huo
http://bugzilla.gnome.org/show_bug.cgi?id=590719
2009-08-04 11:18:43 -04:00
Colin Walters
acfc498344 Also update Clutter 1.0 pkg-config requirement and README
We need to also change the pkg-config requirement to be 1.0.
2009-07-29 13:04:18 -04:00
Owen W. Taylor
0060c8ddb9 Switch to dist-bzip2
When generating a tarball from 'make dist', make a .bz2 tarball
instead of a .gz tarball. Makes the upload to master.gnome.org
marginally faster.
2009-07-16 18:07:01 -04:00
Owen W. Taylor
f9c11c2dbf Bump minor version to 2.27.1
We'll use 2.27.1 for the first tarball release on the 2.27 branch
to avoid confusion with previous snapshots.
2009-07-16 18:06:52 -04:00
Owen W. Taylor
b62ee94b89 Remove check for PangoXft
Mutter doesn't use PangoXft, and I doubt Metacity has for a long
time either so don't check for it in configure.in.
2009-07-16 17:54:06 -04:00
Milan Bouchet-Valat
2c17ef4803 Emit signals when workspaces are added, removed or switched
The patch adds GLib marshalling code to Mutter, since it's required for the "workspace-switched" signal.
The definition of MetaMotionDirection enum is moved to common.h since it's now used in workspace.c.
A little cleaning is done in workspace.c:meta_workspace_activate_with_focus(), where compositor-specific code is merged with the rest of the function (required to emit signal), removing #ifdefs.
2009-07-04 10:57:52 +02:00
Jon Nettleton
0b8a57bcba There can be only one compositor engine
Mutter is a Clutter-based compositing manager. So, remove the code for
the XRender-based compositor, and make it mandatory to have XComposite,
XRender and Clutter.

Run-time support for non-composited operation is left for now.

* src/compositor/mutter/: Move files from this subdirectory into
  the main compositor/ directory.

* compositor/compositor-xrender.ccompositor/compositor-xrender.h:
  Remove

* include/compositor-clutter.h: Remove this stray file, it had been
  replaced with compositor-mutter.h some time back.

http://bugzilla.gnome.org/show_bug.cgi?id=581813
2009-06-30 09:34:03 -04:00
Owen W. Taylor
a13dec34ef Fix accidental rename of --with-clutter/--with-introspection options
Since --with-clutter and --with-introspection refer to use of external
libraries, they should in fact be --with and not --enable. Fix accidental
change that got committed as part of the big metacity => mutter change.

http://bugzilla.gnome.org/show_bug.cgi?id=586821
2009-06-24 14:10:19 -04:00
Jon Nettleton
51a6467968 Comprehensively rename to Mutter
Code:
All references in the code not related to themes, keybindings, or
GConf were changed from 'metacity' to 'mutter'. This includes, among other
things, strings, comments, the atoms used in the message protocol, and
the envvars used for debugging. The GConf schema file was reduced to
the 3 settings new to mutter.

The overall version was brought up to 2.27 to match current gnome.

Structure:
All files named '*metacity*' were renamed '*mutter*' with appropriate
changes in the automake system.  Files removed are
doc/creating_themes, src/themes, doc/metacity-theme.dtd,
metacity.doap.  These files will eventually end up in an external
gnome-wm-data module.

Installation location:
On the filesystem the mutter-plugindir was change from
$(libdir)/metacity/plugins/clutter to just $(libdir)/mutter/plugins.
The mutter-plugins.pc.in reflects these changes.

Note:
mutter.desktop.in and mutter-wm.desktop both continue to have
X-GNOME-WMSettingsModule=metacity set.  This allows
gnome-control-center to continue using libmetacity.so for
configuration.  This is fine since most the general keybindings and wm
settings are being read from /apps/metacity/* in gconf.
2009-06-16 14:17:10 -04:00
Owen W. Taylor
dcf387c91a Increase version to 2.27
Set metacity_minor_version to 27, reflecting the devel status
of this module.
2009-04-25 11:41:40 -04:00
Owen W. Taylor
76a3f9d402 Build and install introspection information
Build a XML gir file and binary typelib file for the interfaces that
we are installing for plugin use. They are installed into $(pkglibdir)
since they are private to the application.

http://bugzilla.gnome.org/show_bug.cgi?id=580041
2009-04-24 09:54:18 -04:00
Owen W. Taylor
626912a9a4 Merge branch 'gnome-2-26' into master
Conflicts:
	configure.in
	src/core/schema-bindings.c
2009-04-08 16:11:12 -04:00
Tomas Frydrych
058c884f1f Bumped mutter version to 0.7 2009-04-07 13:39:57 +01:00
Tomas Frydrych
ae97ccba80 Bumped mutter version to 0.6 2009-04-02 09:44:48 +01:00
Thomas James Alexander Thurman
d38b1abb49 change version to 2.26.0
svn path=/branches/gnome-2-26/; revision=4217
2009-03-16 17:59:02 +00:00
Tomas Frydrych
540fc4b76b Bump mutter to 0.5 2009-03-19 16:12:35 +00:00
Tomas Frydrych
8ae90af01f Bump to 2.25.144_0.4 2009-03-17 15:40:06 +00:00
Tomas Frydrych
d8a28621cc Bumped mutter version to 0.3 2009-03-12 15:37:30 +00:00
Tomas Frydrych
52ea2fd45d Bump mutter version to 0.2 2009-03-10 15:54:53 +00:00
Tomas Frydrych
39a3bb2c7d Sync up to upstream 2.25.144
Conflicts:

	configure.in
	src/core/main.c
	src/core/prefs.c
	src/core/window.c
	src/include/prefs.h
2009-02-12 17:14:12 +00:00
Tomas Frydrych
7eb2843718 Thou shall not use - in version string. 2009-02-12 11:55:11 +00:00
Tomas Frydrych
91490ed713 Added mutter specific versioning component to the overall version. 2009-02-12 10:56:37 +00:00
Thomas James Alexander Thurman
ad16804344 Post-release bump to 2.25.233.
svn path=/trunk/; revision=4106
2009-02-01 20:56:48 +00:00
Thomas Wood
4589d1246d Update to Clutter 0.9
Fixes various API breakage due to switching to Clutter 0.9.
2009-01-28 15:43:36 +00:00
Thomas James Alexander Thurman
9ecc00a33b Post-release bump to 2.25.144.
svn path=/trunk/; revision=4068
2008-12-26 18:22:00 +00:00
Thomas James Alexander Thurman
9abdc6c0fa Post-release bump to 2.25.89.
svn path=/trunk/; revision=4058
2008-12-16 01:40:23 +00:00
Thomas James Alexander Thurman
c48c5e44bd fix build on Solaris. Closes #564123.
* configure.in: fix build on Solaris.  Closes #564123.


svn path=/trunk/; revision=4055
2008-12-16 01:35:30 +00:00
Thomas James Alexander Thurman
6e1ed9ad55 Post-release bump to 2.25.55.
svn path=/trunk/; revision=4052
2008-12-02 09:30:37 +00:00
Thomas James Alexander Thurman
e7a69b6a13 Post-release bump to 2.25.34.
svn path=/trunk/; revision=4048
2008-12-01 23:01:20 +00:00
Thomas James Alexander Thurman
3b1e91342e gnome-doc-tools version doesn't need to be so high. disable the entire
* configure.in: gnome-doc-tools version doesn't need to be so high.
	* src/compositor/compositor-xrender.c: disable the entire file if the
          compositor is disabled.
	* src/core/async-getprop.[ch]: fixes for -Wall
	* src/core/iconcache.c: fixes for -Wall
	* src/core/testasyncgetprop.c: fixes for -Wall
	* src/core/xprops.c: fixes for -Wall


svn path=/trunk/; revision=4045
2008-12-01 22:54:57 +00:00
Thomas James Alexander Thurman
c0d90e5b76 Post-release bump to 2.25.21.
svn path=/trunk/; revision=4042
2008-11-25 23:29:08 +00:00
Thomas James Alexander Thurman
3592f8e92e Post-release bump to 2.25.13.
svn path=/trunk/; revision=4035
2008-11-23 22:03:37 +00:00
Thomas James Alexander Thurman
88cd978837 reviewed by: Thomas Thurman
* configure.in: only accept --enable-compositor if we find we can
	  actually composite.


svn path=/trunk/; revision=4028
2008-11-23 20:23:57 +00:00
Thomas James Alexander Thurman
68ac59ff6d Set -ansi so people stop complaining about C99.
* configure.in: Set -ansi so people stop complaining about C99.


svn path=/trunk/; revision=4025
2008-11-22 19:47:02 +00:00
Thomas Thurman
ac365b4ead (Apologies for huge commit; these were done on a transatlantic flight. This is why we need bzr.)
2008-11-22  Thomas Thurman  <tthurman@gnome.org>

        * src/core/all-keybindings.h: "backward", not "backwards" throughout.

2008-11-20  Thomas Thurman  <tthurman@gnome.org>

        * configure.in: turned on -Wall and -Werror in order to
          trap as many problems as possible.
        * src/ui/resizepopup.c: added correct #include.
        * src/ui/theme-viewer.c: initialised variable.
        * src/core/xprops.c: corrected cast.
        * src/core/main.c: added warning if chdir() fails.
        * src/core/schema-bindings.c: checking the return
          result of fgets().

2008-11-20  Thomas Thurman  <tthurman@gnome.org>

        Merged screen and window keybinding tables so that
        we can use just one file for the both.  Also incidentally
        closes #528337.  Further efficiencies of scale to come.

        * src/include/prefs.h: replace META_PREF_*_KEYBINDINGS
          with META_PREF_KEYBINDINGS
        * src/core/keybindings.c: replace *_bindings with key_bindings
          and similar throughout; all window-based functions are now
          guaranteed to receive a window so don't need to check for
          themselves
          (find_handler): moved so it can also be called from
                          rebuild_binding_table
        * src/core/display-private.h: replace *_bindings with key_bindings
        * src/core/prefs.c: update_*_binding becomes update_key_binding;
          (change_notify): tidy up references to "enormous if statement"
                           since it's almost entirely gone now
        * src/core/all-keybindings.h: new merged version of
                           screen-bindings.h and window-bindings.h.


svn path=/trunk/; revision=4022
2008-11-22 19:02:54 +00:00
Thomas James Alexander Thurman
c4768a3b9f added dependency on Zenity remove error_on_generic_command() and
* configure.in: added dependency on Zenity
	* src/core/keybindings.c: remove error_on_generic_command() and
	  error_on_terminal_command(); rewrite error_on_command
	  in terms of meta_show_dialog()
	* src/core/util.c: add meta_show_dialog() to call Zenity
	* src/include/util.h: ditto


svn path=/trunk/; revision=4013
2008-11-08 18:51:56 +00:00
Tomas Frydrych
3b3226b678 Merge branch 'plugin-gobject' into next-generation
Conflicts:

	src/compositor/mutter/compositor-mutter.c
	src/core/window.c
2008-12-18 12:41:56 +00:00
Tomas Frydrych
9821453b5f Merge branch 'upstream-2.25.55' into next-generation
Conflicts:

	configure.in
	src/Makefile.am
	src/core/screen-bindings.h
	src/metacity.schemas.in
2008-12-18 11:00:19 +00:00
Tomas Frydrych
c61eb77a70 GObjectified MutterPlugin. 2008-12-17 09:33:56 +00:00
Tomas Frydrych
7bef175590 MUTTER_PLUGIN_DIR variable/define
Define for use in plugin manager
  Makefile variable for plugin pc file and plugin installation.
2008-10-29 10:28:48 +00:00
Tomas Frydrych
68c2f75558 Changes necessary to build plugins out of tree:
metacity-plugins.pc.in
  installation necessary header files
  fixed misplaced inclusion of config.h
2008-10-28 10:45:45 +00:00
Thomas James Alexander Thurman
c1348f0322 Post-release bump to 2.25.8.
svn path=/trunk/; revision=3996
2008-10-23 04:42:57 +00:00
Thomas Thurman
348795b94d Post-release bump to 2.25.5.
2008-10-23  Thomas Thurman  <tthurman@gnome.org>

        * configure.in: Post-release bump to 2.25.5.


svn path=/trunk/; revision=3993
2008-10-23 04:29:11 +00:00
Thomas Thurman
7a9da7eb69 bump to 2.25.3 (thought the release script had already done this)
2008-10-22  Thomas Thurman  <tthurman@gnome.org>

        * configure.in: bump to 2.25.3 (thought the release script
          had already done this)


svn path=/trunk/; revision=3986
2008-10-22 13:09:59 +00:00
Götz Waschk
9cb0b6ff52 add libm reference. Closes #557357.
2008-10-22  Götz Waschk  <waschk@mandriva.org>

        * configure.in: add libm reference.  Closes #557357.


svn path=/trunk/; revision=3984
2008-10-22 12:08:48 +00:00
Murray Cumming
4c3a5883d7 Call GNOME_DOC_INIT() so we can use the gnome-doc-utils variables in our
2008-10-17  Murray Cumming  <murrayc@murrayc.com>

        * configure.in: Call GNOME_DOC_INIT() so we can use the gnome-doc-utils 
        variables in our Makefile.am:
        * doc/Makefile.am:
        * doc/creating_themes/Makefile.am
        * doc/creating_themes/C/creating_metacity_themes.xml:
        Added this new DocBook document, converted from the HTML here
        http://blogs.gnome.org/metacity/2008/05/30/themes/
        This will be installed for yelp and can be translated and hosted on 
        library.gnome.org.


svn path=/trunk/; revision=3964
2008-10-18 01:52:39 +00:00
Robert Bragg
2f790b0165 This changes the meta_compositor_clutter namespacing to simply "mutter" which
helps makes code much more readable.
2008-10-16 12:50:01 +01:00
Robert Bragg
69c0da91e5 Creates a src/compositor/clutter directory to help de-clutter things 2008-10-08 14:17:54 +01:00
Neil Roberts
ee60128334 Support for GL ES in the Clutter compositor.
Check for whether clutter/glx/clutter-glx-texture-pixmap.h is
available in the configure script and if not use
ClutterX11TexturePixmap directly.

glGetTexLevelParameter isn't available on GL ES so instead it checks
whether NPOTs textures are available and assumes the next power of two
size if not.
2008-09-30 15:33:18 +01:00
Tomas Frydrych
9b3a0d1ad8 Basic plugin infastructure and a sample simple plugin. 2008-09-18 16:09:11 +01:00
Tomas Frydrych
d509097967 Sync with upstream r3901
Merge branch 'upstream' into clutter
2008-09-17 17:12:27 +01:00
Tomas Frydrych
438ac55cb1 update to upstream 2.25.1
Merge commit '49cc773eb4801fb0ee3cddeeb1d27042f4a46e2e' into clutter
2008-09-03 19:48:23 +01:00
Thomas James Alexander Thurman
18d9d15a1a Post-release bump to 2.25.2.
svn path=/trunk/; revision=3843
2008-09-01 04:28:16 +00:00
Tomas Frydrych
a3f56bb289 Added --with-clutter option; initialize Clutter from meta_ui_init().
Fixed up the build files so we do not build xrender compositor when building
clutter backend; moved clutter initialization to meta_ui_init() so commandline
arguments can be passed into clutter_init().
2008-08-20 10:31:10 +01:00
Thomas Thurman
129fde88fa Post-release version bump to 2.25.1.
2008-08-18  Thomas Thurman  <tthurman@gnome.org>

        * configure.in: Post-release version bump to 2.25.1.


svn path=/trunk/; revision=3827
2008-08-18 15:02:30 +00:00
Thomas Thurman
13f3cb0b9a correct incorrect version number
2008-08-18  Thomas Thurman  <tthurman@gnome.org>

        * configure.in: correct incorrect version number


svn path=/trunk/; revision=3825
2008-08-18 14:37:50 +00:00
Tomas Frydrych
5ebaa15333 Updated to clutter-0.8. 2008-08-18 12:02:14 +01:00
Tomas Frydrych
e1965914a3 Synced with Metacity 2.23.89 (r3800)
Merge commit '51de9ef8605f7a195ef360afb3a504488125611f' into clutter
2008-08-18 11:11:32 +01:00
Thomas Thurman
3cd7574749 Post-branch bump to 2.25.0.
2008-08-13  Thomas Thurman  <tthurman@gnome.org>

        * configure.in: Post-branch bump to 2.25.0.



svn path=/trunk/; revision=3808
2008-08-13 11:54:52 +00:00
Thomas James Alexander Thurman
416bc2432c Post-release bump to 2.23.144.
svn path=/trunk/; revision=3802
2008-08-04 17:48:08 +00:00
Thomas James Alexander Thurman
f9a0c6d456 Post-release bump to 2.23.89.
svn path=/trunk/; revision=3791
2008-07-14 01:30:25 +00:00
Thomas James Alexander Thurman
ed22f38e7e Post-release bump to 2.23.55.
svn path=/trunk/; revision=3765
2008-06-16 23:53:39 +00:00
Matthew Allum
c29232fd0d Misc cleanups, removal of stray printf's etc. Add basic win opacity handling 2008-06-04 20:51:08 +01:00
Thomas James Alexander Thurman
8fea7a4128 Post-release bump to 2.23.34.
svn path=/trunk/; revision=3731
2008-05-26 21:52:25 +00:00
Thomas James Alexander Thurman
b8a9ed1d3a Post-release bump to 2.23.21.
svn path=/trunk/; revision=3696
2008-04-27 21:42:57 +00:00
Thomas James Alexander Thurman
3d9f2868fc Post-release bump to 2.23.13.
svn path=/trunk/; revision=3691
2008-04-22 12:35:31 +00:00
Thomas Thurman
2caa49bca8 Post-release bump to 2.21.8. (Which was seriously belated. Sorry, folks.)
2008-04-22  Thomas Thurman  <tthurman@gnome.org>

        * configure.in: Post-release bump to 2.21.8.
	(Which was seriously belated.  Sorry, folks.)


svn path=/trunk/; revision=3686
2008-04-22 12:21:22 +00:00
Thomas James Alexander Thurman
38b4f08b2b Post-release bump to 2.23.5.
svn path=/trunk/; revision=3660
2008-03-21 04:12:42 +00:00
Thomas James Alexander Thurman
80e838aed5 Post-release bump to 2.23.3.
svn path=/trunk/; revision=3632
2008-03-07 03:12:35 +00:00
Thomas James Alexander Thurman
4b8a05b803 Post-release bump to 2.23.2.
svn path=/trunk/; revision=3628
2008-03-06 22:15:25 +00:00
Thomas James Alexander Thurman
3d4adc8be9 Post-release bump to 2.23.1.
svn path=/trunk/; revision=3604
2008-02-26 19:19:42 +00:00
Thomas Thurman
8c487ddbb2 if we have libSM and its headers, that means we did find it, not that we
2008-02-18  Thomas Thurman  <tthurman@gnome.org>

        * configure.in: if we have libSM and its headers,
	that means we did find it, not that we didn't.
	Closes #328210.


svn path=/trunk/; revision=3579
2008-02-18 01:29:27 +00:00
Thomas Thurman
f23d8a3774 Correct help for verbose option name.
2008-02-12  Thomas Thurman  <tthurman@gnome.org>                                                                 
                                                                                                                 
        * configure.in: Correct help for verbose option name. 


svn path=/trunk/; revision=3563
2008-02-13 04:13:06 +00:00
Thomas Thurman
aad6f37f8a Post-branch bump to 2.23.0.
2008-02-12  Thomas Thurman  <tthurman@gnome.org>                                                                 
                                                                                                                 
        * configure.in: Post-branch bump to 2.23.0.


svn path=/trunk/; revision=3562
2008-02-12 14:45:42 +00:00
Thomas James Alexander Thurman
404a61b571 Post-release bump to 2.21.21.
svn path=/trunk/; revision=3560
2008-02-12 00:05:38 +00:00
Thomas Thurman
4c8557055c remove workaround for a problem in GTK 1.3.9(!) which was causing
2008-02-04  Thomas Thurman  <tthurman@gnome.org>

        * configure.in, src/ui/ui.c: remove workaround for a problem
          in GTK 1.3.9(!) which was causing problems. Closes #513737.


svn path=/trunk/; revision=3551
2008-02-04 17:25:30 +00:00
Thomas James Alexander Thurman
d70219b88d Post-release bump to 2.21.13.
svn path=/trunk/; revision=3547
2008-02-03 22:36:08 +00:00
Havoc Pennington
72b08c82b1 sort source files into these directories according to which part of the WM
2007-12-19  Havoc Pennington  <hp@redhat.com>

	* src/ui, src/core, src/include: sort source files into these
	directories according to which part of the WM they are supposed to
	be in. In an eventual plan, we should also create
	src/compositor/render, src/compositor/fallback and move some of
	the compositor stuff into that.
	
	* autogen.sh: require a newer automake, so we don't have to use
	a recursive build

	* src/ui/tabpopup.c: put in a hack to make the build temporarily
	work, want to commit the large rearrangement before fixing this
	not to include workspace.h or frame.h

	* src/core/iconcache.c (meta_read_icons): temporarily break this
	to get the build to work, want to commit the large rearrangement
	before fixing this file not to include theme.h


svn path=/trunk/; revision=3491
2007-12-19 21:17:50 +00:00
Thomas Thurman
3880951458 Post-release bump to 2.21.8.
2007-12-19  Thomas Thurman  <thomas@thurman.org.uk>

        * configure.in: Post-release bump to 2.21.8.



svn path=/trunk/; revision=3490
2007-12-19 12:15:29 +00:00
Thomas Thurman
a63d5801ae print "Subversion" and not "CVS".
2007-12-19  Thomas Thurman  <tthurman@gnome.org>

        * configure.in: print "Subversion" and not "CVS".


svn path=/trunk/; revision=3486
2007-12-19 11:04:16 +00:00
Thomas Thurman
d052782caf compositor enabled by default.
2007-12-18  Thomas Thurman  <tthurman@gnome.org>

        * configure.in: compositor enabled by default.


svn path=/trunk/; revision=3484
2007-12-19 04:34:11 +00:00
Iain Holmes
c2a6eeaf5e Merge compositor branch.
2007-12-18  Iain Holmes  <iain@gnome.org>

        * configure.in, src/theme.c, src/display.c,
      src/theme.h, src/display.h, src/theme-parser.c,
      src/compositor.c, src/c-screen.c, src/compositor.h,
      src/c-screen.h, src/ui.c, src/screen.c, src/ui.h,
      src/screen.h, src/c-window.c, src/c-window.h,
      src/theme-viewer.c, src/Makefile.am: Merge compositor branch.


svn path=/trunk/; revision=3483
2007-12-19 03:49:50 +00:00
Thomas Thurman
623e4dc05c Post-release bump to 2.21.5.
2007-12-14  Thomas Thurman  <thomas@thurman.org.uk>

        * configure.in: Post-release bump to 2.21.5.



svn path=/trunk/; revision=3475
2007-12-15 03:31:34 +00:00
Thomas Thurman
a8583668eb Post-release bump to 2.21.3.
2007-11-17  Thomas Thurman  <thomas@thurman.org.uk>

        * configure.in: Post-release bump to 2.21.3.


svn path=/trunk/; revision=3414
2007-11-18 04:40:22 +00:00
Thomas Thurman
f4e327f69c Post-release bump to 2.21.2.
2007-11-11  Thomas Thurman  <thomas@thurman.org.uk>

        * configure.in: Post-release bump to 2.21.2.

2007-11-11  Thomas Thurman  <thomas@thurman.org.uk>

        * NEWS: 2.21.1 release.



svn path=/trunk/; revision=3389
2007-11-12 04:48:04 +00:00
Thomas Thurman
8a023b00f2 Post-branch bump to 2.21.1.
2007-10-14  Thomas Thurman  <thomas@thurman.org.uk>

        * configure.in: Post-branch bump to 2.21.1.


svn path=/trunk/; revision=3357
2007-10-15 02:38:56 +00:00
Kjartan Maraas
34cfd6fafd Remove circular dep metacity<->gnomecc.
2007-10-03  Kjartan Maraas  <kmaraas@gnome.org>

	* configure.in: Remove circular dep metacity<->gnomecc.

svn path=/trunk/; revision=3355
2007-10-03 06:53:29 +00:00
Elijah Newren
8780fd5e44 post-release version bump to 2.20.1
2007-09-15  Elijah Newren  <newren gmail com>

	* configure.in: post-release version bump to 2.20.1

svn path=/trunk/; revision=3343
2007-09-16 03:01:16 +00:00