[splash] Rename glow plugin to two-step

Now the "glow" theme is just one possible manifestation of the
"two-step" plugin.

diff --git a/configure.ac b/configure.ac
index 5a04311581b048907ad22de7c667e67321949ec8..19da340e2b9969e0b87efcf00483a6526e1838eb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -206,7 +206,7 @@ AC_OUTPUT([Makefile
            src/plugins/splash/text/Makefile
            src/plugins/splash/details/Makefile
            src/plugins/splash/solar/Makefile
-           src/plugins/splash/glow/Makefile
+           src/plugins/splash/two-step/Makefile
            src/plugins/controls/Makefile
            src/plugins/controls/label/Makefile
            src/Makefile

diff --git a/src/plugins/splash/Makefile.am b/src/plugins/splash/Makefile.am
index 9e1a1cef787b829d0e587558a5e61faac60552f8..dda7f86c9f11374909912ddb6cd095404899bd38 100644 (file)
--- a/src/plugins/splash/Makefile.am
+++ b/src/plugins/splash/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = spinfinity fade-in text details solar glow
+SUBDIRS = spinfinity fade-in text details solar two-step
 MAINTAINERCLEANFILES = Makefile.in
 
 if ADD_DEFAULT_PLUGIN_LINK

diff --git a/src/plugins/splash/glow/Makefile.am b/src/plugins/splash/two-step/Makefile.am
similarity index 79%
rename from src/plugins/splash/glow/Makefile.am
rename to src/plugins/splash/two-step/Makefile.am
index ad7d9ba6de9b4ad8ebb52440bd9b170e046d2881..988fbee457828a2ea335fb8775dc1971fea69fc2 100644 (file)
--- a/src/plugins/splash/glow/Makefile.am
+++ b/src/plugins/splash/two-step/Makefile.am
@@ -7,18 +7,18 @@ INCLUDES = -I$(top_srcdir)                                                    \
            -I$(srcdir)
 
 plugindir = $(libdir)/plymouth
-plugin_LTLIBRARIES = glow.la
+plugin_LTLIBRARIES = two-step.la
 
-glow_la_CFLAGS =    $(PLYMOUTH_CFLAGS)                                       \
+two_step_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)
-glow_la_LDFLAGS =   -module -avoid-version -export-dynamic
-glow_la_LIBADD =    $(PLYMOUTH_LIBS)                                         \
+two_step_la_LDFLAGS =   -module -avoid-version -export-dynamic
+two_step_la_LIBADD =    $(PLYMOUTH_LIBS)                                      \
                     ../../../libply/libply.la                                 \
                     ../../../libplybootsplash/libplybootsplash.la
-glow_la_SOURCES = $(srcdir)/plugin.c
+two_step_la_SOURCES = $(srcdir)/plugin.c
 
 MAINTAINERCLEANFILES = Makefile.in

diff --git a/src/plugins/splash/glow/plugin.c b/src/plugins/splash/two-step/plugin.c
similarity index 98%
rename from src/plugins/splash/glow/plugin.c
rename to src/plugins/splash/two-step/plugin.c
index 2c7f4cdcbc05443cf32193ee76a7a9b04771a797..e1499b2cc8e8640b887ca4ec860a8bd2ecdd33dd 100644 (file)
--- a/src/plugins/splash/glow/plugin.c
+++ b/src/plugins/splash/two-step/plugin.c
@@ -114,7 +114,7 @@ create_plugin (ply_key_file_t *key_file)
   srand ((int) ply_get_timestamp ());
   plugin = calloc (1, sizeof (ply_boot_splash_plugin_t));
 
-  image_dir = ply_key_file_get_value (key_file, "glow", "ImageDir");
+  image_dir = ply_key_file_get_value (key_file, "two-step", "ImageDir");
 
   asprintf (&image_path, "%s/lock.png", image_dir);
   plugin->lock_image = ply_image_new (image_path);
@@ -128,14 +128,14 @@ create_plugin (ply_key_file_t *key_file)
   plugin->label = ply_label_new ();
   plugin->animation_dir = image_dir;
 
-  alignment = ply_key_file_get_value (key_file, "glow", "HorizontalAlignment");
+  alignment = ply_key_file_get_value (key_file, "two-step", "HorizontalAlignment");
   if (alignment != NULL)
     plugin->animation_horizontal_alignment = strtod (alignment, NULL);
   else
     plugin->animation_horizontal_alignment = .5;
   free (alignment);
 
-  alignment = ply_key_file_get_value (key_file, "glow", "VerticalAlignment");
+  alignment = ply_key_file_get_value (key_file, "two-step", "VerticalAlignment");
   if (alignment != NULL)
     plugin->animation_vertical_alignment = strtod (alignment, NULL);
   else

diff --git a/themes/glow/glow.plymouth.in b/themes/glow/glow.plymouth.in
index f97790486151c1aed7e7aafb3d75f0dc5dcefb36..686dbe4e2b37124569d5d7c68cecbd4a72bc5852 100644 (file)
--- a/themes/glow/glow.plymouth.in
+++ b/themes/glow/glow.plymouth.in
@@ -1,9 +1,9 @@
 [Plymouth Theme]
 Name=Bizcom Glow
 Description=Corporate theme with pie chart boot progress followed by a glowing emerging logo
-ModuleName=glow
+ModuleName=two-step
 
-[glow]
+[two-step]
 ImageDir=@PLYMOUTH_THEME_PATH@/glow
 HorizontalAlignment=.25
 VerticalAlignment=.5