From 2bcd7c839b9f48c2f4383805aa2773bada37ae62 Mon Sep 17 00:00:00 2001
From: Tomas Frydrych <tf@o-hand.com>
Date: Tue, 7 Oct 2008 14:58:34 +0100
Subject: [PATCH] Renamed simple plugin to 'default'

---
 src/compositor/clutter-plugins/Makefile.am             | 10 +++++-----
 src/compositor/clutter-plugins/{simple.c => default.c} |  4 ++--
 src/metacity.schemas.in                                |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename src/compositor/clutter-plugins/{simple.c => default.c} (99%)

diff --git a/src/compositor/clutter-plugins/Makefile.am b/src/compositor/clutter-plugins/Makefile.am
index 00bac8d4f..3899b6a10 100644
--- a/src/compositor/clutter-plugins/Makefile.am
+++ b/src/compositor/clutter-plugins/Makefile.am
@@ -5,11 +5,11 @@ if WITH_CLUTTER
 
 INCLUDES=@METACITY_CFLAGS@ -I $(top_srcdir)/src/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 -DMETACITY_MAJOR_VERSION=$(METACITY_MAJOR_VERSION) -DMETACITY_MINOR_VERSION=$(METACITY_MINOR_VERSION) -DMETACITY_MICRO_VERSION=$(METACITY_MICRO_VERSION) -DMETACITY_CLUTTER_PLUGIN_API_VERSION=$(METACITY_CLUTTER_PLUGIN_API_VERSION) -DMETACITY_PKGLIBDIR=\"$(pkglibdir)\"
 
-simple_la_CFLAGS   = -fPIC
-simple_la_SOURCES  = simple.c
-simple_la_LDFLAGS  = -module -avoid-version
-simple_la_LIBADD   = @CLUTTER_LIBS@
-pkglib_LTLIBRARIES = simple.la
+default_la_CFLAGS   = -fPIC
+default_la_SOURCES  = default.c
+default_la_LDFLAGS  = -module -avoid-version
+default_la_LIBADD   = @CLUTTER_LIBS@
+pkglib_LTLIBRARIES = default.la
 
 # post-install hook to remove the .la and .a files we are not interested in
 # (There is no way to stop libtool generating static libs locally, and we
diff --git a/src/compositor/clutter-plugins/simple.c b/src/compositor/clutter-plugins/default.c
similarity index 99%
rename from src/compositor/clutter-plugins/simple.c
rename to src/compositor/clutter-plugins/default.c
index 4bfa44e4a..ecfd009f3 100644
--- a/src/compositor/clutter-plugins/simple.c
+++ b/src/compositor/clutter-plugins/default.c
@@ -38,7 +38,7 @@
 #define MAP_TIMEOUT       250
 #define SWITCH_TIMEOUT    500
 
-#define ACTOR_DATA_KEY "MCCP-Simple-actor-data"
+#define ACTOR_DATA_KEY "MCCP-Default-actor-data"
 
 typedef struct PluginPrivate PluginPrivate;
 typedef struct ActorPrivate  ActorPrivate;
@@ -78,7 +78,7 @@ MetaCompositorClutterPlugin META_COMPOSITOR_CLUTTER_PLUGIN_STRUCT =
     .version_api   = METACITY_CLUTTER_PLUGIN_API_VERSION,
 
     /* Human readable name (for use in UI) */
-    .name = "Simple Effects",
+    .name = "Default Effects",
 
     /* Which types of events this plugin supports */
     .features = META_COMPOSITOR_CLUTTER_PLUGIN_MINIMIZE   |
diff --git a/src/metacity.schemas.in b/src/metacity.schemas.in
index 993746bdc..b9cb74908 100644
--- a/src/metacity.schemas.in
+++ b/src/metacity.schemas.in
@@ -361,7 +361,7 @@
       <applyto>/apps/metacity/general/clutter_plugins</applyto>
       <owner>metacity</owner>
       <type>list</type>
-      <default>[simple]</default>
+      <default>[default]</default>
       <locale name="C">
         <short>Clutter Plugins</short>
         <long>