summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/core/window.c4
-rw-r--r--src/ui/theme-parser.c2
-rw-r--r--src/ui/theme.c2
-rw-r--r--src/ui/tile-preview.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/core/window.c b/src/core/window.c
index 5ec4af09..cb687471 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -8707,13 +8707,13 @@ meta_window_get_xwindow (MetaWindow *window)
*
* Returns the #MetaWindow for the window that is pointed to by the
* WM_TRANSIENT_FOR hint on this window (see XGetTransientForHint()
- * or XSetTransientForHint()). Metacity keeps transient windows above their
+ * or XSetTransientForHint()). Marco keeps transient windows above their
* parents. A typical usage of this hint is for a dialog that wants to stay
* above its associated window.
*
* Return value: (transfer none): the window this window is transient for, or
* %NULL if the WM_TRANSIENT_FOR hint is unset or does not point to a toplevel
- * window that Metacity knows about.
+ * window that Marco knows about.
*/
MetaWindow *
meta_window_get_transient_for (MetaWindow *window)
diff --git a/src/ui/theme-parser.c b/src/ui/theme-parser.c
index 8f7c76fd..1a632d4f 100644
--- a/src/ui/theme-parser.c
+++ b/src/ui/theme-parser.c
@@ -3464,7 +3464,7 @@ find_version (const char **attribute_names,
/* Returns whether the version element was successfully parsed.
* If successfully parsed, then two additional items are returned:
*
- * satisfied: whether this version of Mutter meets the version check
+ * satisfied: whether this version of Marco meets the version check
* minimum_required: minimum version of theme format required by version check
*/
static gboolean
diff --git a/src/ui/theme.c b/src/ui/theme.c
index 913ae885..6f463b3d 100644
--- a/src/ui/theme.c
+++ b/src/ui/theme.c
@@ -1174,7 +1174,7 @@ meta_color_spec_new_from_string (const char *str,
if (!debug_set)
{
- debug = g_getenv ("MUTTER_DISABLE_FALLBACK_COLOR") != NULL;
+ debug = g_getenv ("MARCO_DISABLE_FALLBACK_COLOR") != NULL;
debug_set = TRUE;
}
diff --git a/src/ui/tile-preview.c b/src/ui/tile-preview.c
index f98713b4..1f61e07b 100644
--- a/src/ui/tile-preview.c
+++ b/src/ui/tile-preview.c
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* Mutter tile-preview marks the area a window will *ehm* snap to */
+/* Marco tile-preview marks the area a window will *ehm* snap to */
/*
* Copyright (C) 2010 Florian Müllner