Remove progress_box.png and its halo option from solar plugin

diff --git a/src/plugins/splash/solar/Makefile.am b/src/plugins/splash/solar/Makefile.am
index 77ef5b90c78841eb8f15a136f8455293bfba37fd..53cc86b5b389f5b858a7710e5a398e8651fc81fd 100644 (file)
--- a/src/plugins/splash/solar/Makefile.am
+++ b/src/plugins/splash/solar/Makefile.am
@@ -24,7 +24,7 @@ solar_la_SOURCES = $(srcdir)/plugin.c
 plymouthdir = $(datadir)/plymouth/solar
 plymouth_DATA = bullet.png entry.png lock.png                                 \
                 background.png star.png box.png                               \
-                comet1.png progress_box.png progress_bar.png
+                comet1.png progress_bar.png
 #                planet1.png planet2.png planet3.png planet4.png planet5.png
 
 EXTRA_DIST = $(plymouth_DATA)

diff --git a/src/plugins/splash/solar/plugin.c b/src/plugins/splash/solar/plugin.c
index e5829394be6f2bf8bfa655c294fff64b71651d3e..976175e588f5204d2834d4fc64431938d6fc25ba 100644 (file)
--- a/src/plugins/splash/solar/plugin.c
+++ b/src/plugins/splash/solar/plugin.c
@@ -69,7 +69,6 @@
 /*#define SHOW_PLANETS */
 #define SHOW_COMETS
 #define SHOW_PROGRESS_BAR
-/*#define SHOW_PROGRESS_BAR_HALO */
 /*#define SHOW_LOGO_HALO */
 
 
@@ -160,9 +159,6 @@ struct _ply_boot_splash_plugin
 #endif
 #ifdef  SHOW_PROGRESS_BAR
   ply_image_t *progress_barimage;
-#ifdef  SHOW_PROGRESS_BAR_HALO
-  ply_image_t *highlight_scaled_progress_box_image;
-#endif
 #endif
 
   ply_image_t *scaled_background_image;
@@ -1021,17 +1017,6 @@ setup_solar (ply_boot_splash_plugin_t *plugin)
 #endif
 
 #ifdef  SHOW_PROGRESS_BAR
-#ifdef SHOW_PROGRESS_BAR_HALO  
-  plugin->highlight_scaled_progress_box_image = ply_image_resize (plugin->scaled_progress_box_image, ply_image_get_width(plugin->scaled_progress_box_image)+HALO_BLUR*2, ply_image_get_height(plugin->scaled_progress_box_image)+HALO_BLUR*2);
-  highlight_image (plugin->highlight_scaled_progress_box_image, plugin->scaled_progress_box_image, HALO_BLUR);
-  
-  sprite = add_sprite (plugin, plugin->highlight_scaled_progress_box_image, SPRITE_TYPE_STATIC, NULL);
-  sprite->x=x-HALO_BLUR;
-  sprite->y=y-HALO_BLUR;
-  sprite->z=10000;
-  
-#endif
-  
   progress_t* progress = malloc(sizeof(progress_t));
   
   progress->image = plugin->progress_barimage;

diff --git a/src/plugins/splash/solar/progress_box.png b/src/plugins/splash/solar/progress_box.png
deleted file mode 100644 (file)
index a4a3e99..0000000
Binary files a/src/plugins/splash/solar/progress_box.png and /dev/null differ