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.
This commit is contained in:
Jon Nettleton
2009-06-10 12:29:20 +02:00
committed by Owen W. Taylor
parent 9127993d84
commit 51a6467968
218 changed files with 536 additions and 8022 deletions

View File

@ -1,33 +1,33 @@
@INTLTOOL_DESKTOP_RULE@
icondir=$(pkgdatadir)/icons
icon_DATA=metacity-window-demo.png
icon_DATA=mutter-window-demo.png
INCLUDES=@METACITY_WINDOW_DEMO_CFLAGS@ @METACITY_MESSAGE_CFLAGS@ \
-DMETACITY_ICON_DIR=\"$(pkgdatadir)/icons\" \
-DMETACITY_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\"
INCLUDES=@MUTTER_WINDOW_DEMO_CFLAGS@ @MUTTER_MESSAGE_CFLAGS@ \
-DMUTTER_ICON_DIR=\"$(pkgdatadir)/icons\" \
-DMUTTER_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\"
metacity_message_SOURCES= \
metacity-message.c
mutter_message_SOURCES= \
mutter-message.c
metacity_window_demo_SOURCES= \
metacity-window-demo.c
mutter_window_demo_SOURCES= \
mutter-window-demo.c
metacity_mag_SOURCES= \
metacity-mag.c
mutter_mag_SOURCES= \
mutter-mag.c
metacity_grayscale_SOURCES= \
metacity-grayscale.c
mutter_grayscale_SOURCES= \
mutter-grayscale.c
bin_PROGRAMS=metacity-message metacity-window-demo
bin_PROGRAMS=mutter-message mutter-window-demo
## cheesy hacks I use, don't really have any business existing. ;-)
noinst_PROGRAMS=metacity-mag metacity-grayscale
noinst_PROGRAMS=mutter-mag mutter-grayscale
metacity_message_LDADD= @METACITY_MESSAGE_LIBS@
metacity_window_demo_LDADD= @METACITY_WINDOW_DEMO_LIBS@
metacity_mag_LDADD= @METACITY_WINDOW_DEMO_LIBS@
metacity_grayscale_LDADD = @METACITY_WINDOW_DEMO_LIBS@
mutter_message_LDADD= @MUTTER_MESSAGE_LIBS@
mutter_window_demo_LDADD= @MUTTER_WINDOW_DEMO_LIBS@
mutter_mag_LDADD= @MUTTER_WINDOW_DEMO_LIBS@
mutter_grayscale_LDADD = @MUTTER_WINDOW_DEMO_LIBS@
EXTRA_DIST=$(icon_DATA)

View File

@ -1,4 +1,4 @@
/* Metacity send-magic-messages app */
/* Mutter send-magic-messages app */
/*
* Copyright (C) 2002 Havoc Pennington
@ -41,7 +41,7 @@ send_restart (void)
xev.xclient.display = gdk_display;
xev.xclient.window = gdk_x11_get_default_root_xwindow ();
xev.xclient.message_type = XInternAtom (gdk_display,
"_METACITY_RESTART_MESSAGE",
"_MUTTER_RESTART_MESSAGE",
False);
xev.xclient.format = 32;
xev.xclient.data.l[0] = 0;
@ -69,7 +69,7 @@ send_reload_theme (void)
xev.xclient.display = gdk_display;
xev.xclient.window = gdk_x11_get_default_root_xwindow ();
xev.xclient.message_type = XInternAtom (gdk_display,
"_METACITY_RELOAD_THEME_MESSAGE",
"_MUTTER_RELOAD_THEME_MESSAGE",
False);
xev.xclient.format = 32;
xev.xclient.data.l[0] = 0;
@ -97,7 +97,7 @@ send_set_keybindings (gboolean enabled)
xev.xclient.display = gdk_display;
xev.xclient.window = gdk_x11_get_default_root_xwindow ();
xev.xclient.message_type = XInternAtom (gdk_display,
"_METACITY_SET_KEYBINDINGS_MESSAGE",
"_MUTTER_SET_KEYBINDINGS_MESSAGE",
False);
xev.xclient.format = 32;
xev.xclient.data.l[0] = enabled;
@ -126,7 +126,7 @@ send_toggle_verbose (void)
xev.xclient.display = gdk_display;
xev.xclient.window = gdk_x11_get_default_root_xwindow ();
xev.xclient.message_type = XInternAtom (gdk_display,
"_METACITY_TOGGLE_VERBOSE",
"_MUTTER_TOGGLE_VERBOSE",
False);
xev.xclient.format = 32;
xev.xclient.data.l[0] = 0;
@ -148,7 +148,7 @@ static void
usage (void)
{
g_printerr (_("Usage: %s\n"),
"metacity-message (restart|reload-theme|enable-keybindings|disable-keybindings|toggle-verbose)");
"mutter-message (restart|reload-theme|enable-keybindings|disable-keybindings|toggle-verbose)");
exit (1);
}
@ -173,7 +173,7 @@ main (int argc, char **argv)
else if (strcmp (argv[1], "toggle-verbose") == 0)
{
#ifndef WITH_VERBOSE_MODE
g_printerr (_("Metacity was compiled without support for verbose mode\n"));
g_printerr (_("Mutter was compiled without support for verbose mode\n"));
return 1;
#else
send_toggle_verbose ();

View File

@ -1,4 +1,4 @@
/* Metacity window types/properties demo app */
/* Mutter window types/properties demo app */
/*
* Copyright (C) 2002 Havoc Pennington
@ -202,7 +202,7 @@ main (int argc, char **argv)
gtk_init (&argc, &argv);
err = NULL;
pixbuf = gdk_pixbuf_new_from_file (METACITY_ICON_DIR"/metacity-window-demo.png",
pixbuf = gdk_pixbuf_new_from_file (MUTTER_ICON_DIR"/mutter-window-demo.png",
&err);
if (pixbuf)
{

View File

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB