[splash] Rename fade-in plugin to fade-throbber

We're trying to keep a distinction between
plugin and theme.

diff --git a/configure.ac b/configure.ac
index 2a5dffb09c713d7e4373d22c6acfdb45b8c7ff30..bcd7d7b024caaba22d4c47dcf6ee08c89ee53aaf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -105,10 +105,10 @@ AC_SUBST(background_start_color)
 AC_ARG_WITH(background-end-color-stop, AC_HELP_STRING([--with-background-end-color-stop], [first color end in background gradients used by boot splash plugins]),background_end_color=${withval},background_end_color=0x3a362f)
 AC_SUBST(background_end_color)
 
-AC_ARG_WITH(default-plugin, AC_HELP_STRING([--with-default-plugin=fade-in], [Plugin to use by default]),default_plugin_name=${withval},default_plugin_name=fade-in)
+AC_ARG_WITH(default-plugin, AC_HELP_STRING([--with-default-plugin=fade-throbber], [Plugin to use by default]),default_plugin_name=${withval},default_plugin_name=fade-throbber)
 AM_CONDITIONAL(ADD_DEFAULT_PLUGIN_LINK,
                [test "$default_plugin_name" = "spinfinity" \
-                  -o "$default_plugin_name" = "fade-in"    \
+                  -o "$default_plugin_name" = "fade-throbber"    \
                   -o "$default_plugin_name" = "text"       \
                   -o "$default_plugin_name" = "glow"       \
                   -o "$default_plugin_name" = "solar"      \
@@ -202,7 +202,7 @@ AC_OUTPUT([Makefile
            src/plugins/Makefile
            src/plugins/splash/Makefile
            src/plugins/splash/throbgress/Makefile
-           src/plugins/splash/fade-in/Makefile
+           src/plugins/splash/fade-throbber/Makefile
            src/plugins/splash/text/Makefile
            src/plugins/splash/details/Makefile
            src/plugins/splash/space-flares/Makefile

diff --git a/src/plugins/splash/Makefile.am b/src/plugins/splash/Makefile.am
index a1baa09f89d3d510e328c310a7dc3b1edcdf203c..f8316ececaac6daf5b51a312c0804c1f7bff7307 100644 (file)
--- a/src/plugins/splash/Makefile.am
+++ b/src/plugins/splash/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = throbgress fade-in text details space-flares two-step
+SUBDIRS = throbgress fade-throbber text details space-flares two-step
 MAINTAINERCLEANFILES = Makefile.in
 
 if ADD_DEFAULT_PLUGIN_LINK

diff --git a/src/plugins/splash/fade-in/Makefile.am b/src/plugins/splash/fade-throbber/Makefile.am
similarity index 77%
rename from src/plugins/splash/fade-in/Makefile.am
rename to src/plugins/splash/fade-throbber/Makefile.am
index 63e79681a2d4f6fab9990841834c0f1cb846b7cc..4cabfe5e8927c1a0dc6d33e83d0acf7cd4f04e52 100644 (file)
--- a/src/plugins/splash/fade-in/Makefile.am
+++ b/src/plugins/splash/fade-throbber/Makefile.am
@@ -7,18 +7,18 @@ INCLUDES = -I$(top_srcdir)                                                    \
            -I$(srcdir)
 
 plugindir = $(libdir)/plymouth
-plugin_LTLIBRARIES = fade-in.la
+plugin_LTLIBRARIES = fade-throbber.la
 
-fade_in_la_CFLAGS = $(PLYMOUTH_CFLAGS)                                        \
+fade_throbber_la_CFLAGS = $(PLYMOUTH_CFLAGS)                                        \
                     -DPLYMOUTH_IMAGE_DIR=\"$(datadir)/plymouth/\"             \
                     -DPLYMOUTH_LOGO_FILE=\"$(logofile)\"                      \
                     -DPLYMOUTH_BACKGROUND_COLOR=$(background_color)           \
                     -DPLYMOUTH_BACKGROUND_END_COLOR=$(background_end_color)   \
                     -DPLYMOUTH_BACKGROUND_START_COLOR=$(background_start_color)
-fade_in_la_LDFLAGS = -module -avoid-version -export-dynamic
-fade_in_la_LIBADD = $(PLYMOUTH_LIBS)                                          \
+fade_throbber_la_LDFLAGS = -module -avoid-version -export-dynamic
+fade_throbber_la_LIBADD = $(PLYMOUTH_LIBS)                                          \
                     ../../../libply/libply.la                                 \
                     ../../../libplybootsplash/libplybootsplash.la
-fade_in_la_SOURCES = $(srcdir)/plugin.c
+fade_throbber_la_SOURCES = $(srcdir)/plugin.c
 
 MAINTAINERCLEANFILES = Makefile.in

diff --git a/src/plugins/splash/fade-in/plugin.c b/src/plugins/splash/fade-throbber/plugin.c
similarity index 99%
rename from src/plugins/splash/fade-in/plugin.c
rename to src/plugins/splash/fade-throbber/plugin.c
index 5a7a3492da82e2629c9a911fb9697f6621737303..c92518d89cce2256161bf303a17d44c7cf258c5e 100644 (file)
--- a/src/plugins/splash/fade-in/plugin.c
+++ b/src/plugins/splash/fade-throbber/plugin.c
@@ -1,4 +1,4 @@
-/* fade-in.c - boot splash plugin
+/* fade-throbber.c - boot splash plugin
  *
  * Copyright (C) 2007, 2008 Red Hat, Inc.
  *
@@ -103,7 +103,7 @@ create_plugin (ply_key_file_t *key_file)
   plugin->start_time = 0.0;
 
   plugin->logo_image = ply_image_new (PLYMOUTH_LOGO_FILE);
-  image_dir = ply_key_file_get_value (key_file, "fade-in", "ImageDir");
+  image_dir = ply_key_file_get_value (key_file, "fade-throbber", "ImageDir");
 
   asprintf (&image_path, "%s/star.png", image_dir);
   plugin->star_image = ply_image_new (image_path);

diff --git a/themes/fade-in/fade-in.plymouth.in b/themes/fade-in/fade-in.plymouth.in
index 532e720b5f6f8d622ad050d75ecbdfcb033c43eb..0b66fa1e0caf10f101c95d3aec740deab675a2ab 100644 (file)
--- a/themes/fade-in/fade-in.plymouth.in
+++ b/themes/fade-in/fade-in.plymouth.in
@@ -1,7 +1,7 @@
 [Plymouth Theme]
 Name=Fade In
 Description=Simple theme that fades in and out with shimmering stars
-ModuleName=fade-in
+ModuleName=fade-throbber
 
-[fade-in]
+[fade-throbber]
 ImageDir=@PLYMOUTH_THEME_PATH@/fade-in