[splash] Rename solar plugin to space-flares

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

diff --git a/configure.ac b/configure.ac
index fb261914f0ebb693ca751023b30ad82c789ead6d..2a5dffb09c713d7e4373d22c6acfdb45b8c7ff30 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -205,7 +205,7 @@ AC_OUTPUT([Makefile
            src/plugins/splash/fade-in/Makefile
            src/plugins/splash/text/Makefile
            src/plugins/splash/details/Makefile
-           src/plugins/splash/solar/Makefile
+           src/plugins/splash/space-flares/Makefile
            src/plugins/splash/two-step/Makefile
            src/plugins/controls/Makefile
            src/plugins/controls/label/Makefile

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

diff --git a/src/plugins/splash/solar/Makefile.am b/src/plugins/splash/space-flares/Makefile.am
similarity index 77%
rename from src/plugins/splash/solar/Makefile.am
rename to src/plugins/splash/space-flares/Makefile.am
index f39dfc6fb0dd589398a8ba155777e48b19562c2e..b1c8510f6329bc7bb64e5325a9f05102b7d19feb 100644 (file)
--- a/src/plugins/splash/solar/Makefile.am
+++ b/src/plugins/splash/space-flares/Makefile.am
@@ -7,18 +7,18 @@ INCLUDES = -I$(top_srcdir)                                                    \
            -I$(srcdir)
 
 plugindir = $(libdir)/plymouth
-plugin_LTLIBRARIES = solar.la
+plugin_LTLIBRARIES = space-flares.la
 
-solar_la_CFLAGS =    $(PLYMOUTH_CFLAGS)                                       \
+space_flares_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)
-solar_la_LDFLAGS =   -module -avoid-version -export-dynamic
-solar_la_LIBADD =    $(PLYMOUTH_LIBS)                                         \
+space_flares_la_LDFLAGS =   -module -avoid-version -export-dynamic
+space_flares_la_LIBADD =    $(PLYMOUTH_LIBS)                                         \
                     ../../../libply/libply.la                                 \
                     ../../../libplybootsplash/libplybootsplash.la
-solar_la_SOURCES = $(srcdir)/plugin.c
+space_flares_la_SOURCES = $(srcdir)/plugin.c
 
 MAINTAINERCLEANFILES = Makefile.in

diff --git a/src/plugins/splash/solar/plugin.c b/src/plugins/splash/space-flares/plugin.c
similarity index 99%
rename from src/plugins/splash/solar/plugin.c
rename to src/plugins/splash/space-flares/plugin.c
index 45ee033a7f9304567a562cd25facb50e52916485..014d1789e954fc3b3967aa642ca751f63c38378e 100644 (file)
--- a/src/plugins/splash/solar/plugin.c
+++ b/src/plugins/splash/space-flares/plugin.c
@@ -220,7 +220,7 @@ create_plugin (ply_key_file_t *key_file)
 
   plugin->logo_image = ply_image_new (PLYMOUTH_LOGO_FILE);
 
-  image_dir = ply_key_file_get_value (key_file, "solar", "ImageDir");
+  image_dir = ply_key_file_get_value (key_file, "space-flares", "ImageDir");
 
   asprintf (&image_path, "%s/lock.png", image_dir);
   plugin->lock_image = ply_image_new (image_path);
@@ -935,7 +935,7 @@ on_boot_progress (ply_boot_splash_plugin_t *plugin,
 }
 
 void 
-setup_solar (ply_boot_splash_plugin_t *plugin);
+setup_scene (ply_boot_splash_plugin_t *plugin);
 
 static void
 start_animation (ply_boot_splash_plugin_t *plugin)
@@ -951,7 +951,7 @@ start_animation (ply_boot_splash_plugin_t *plugin)
   ply_frame_buffer_get_size (plugin->frame_buffer, &area);
 
   plugin->now = ply_get_timestamp ();
-  setup_solar (plugin);
+  setup_scene (plugin);
   ply_window_draw_area (plugin->window, area.x, area.y, area.width, area.height);
 
   if (plugin->mode == PLY_BOOT_SPLASH_MODE_SHUTDOWN)
@@ -1235,7 +1235,7 @@ void highlight_image (ply_image_t *highlighted_image, ply_image_t *orig_image, i
  
 }
 void 
-setup_solar (ply_boot_splash_plugin_t *plugin)
+setup_scene (ply_boot_splash_plugin_t *plugin)
 {
   ply_frame_buffer_area_t screen_area;
   sprite_t *sprite;

diff --git a/themes/solar/solar.plymouth.in b/themes/solar/solar.plymouth.in
index d2e63f472a6790feb782f5cdcd2e628cade9f9ac..a5565635998fe0e79f73341c1207196f4db1f8b8 100644 (file)
--- a/themes/solar/solar.plymouth.in
+++ b/themes/solar/solar.plymouth.in
@@ -1,7 +1,7 @@
 [Plymouth Theme]
 Name=Solar
 Description=Space theme with violent flaring blue star
-ModuleName=solar
+ModuleName=space-flares
 
-[solar]
+[space-flares]
 ImageDir=@PLYMOUTH_THEME_PATH@/solar