From: Ray Strode <rstrode@redhat.com>
Date: Thu, 14 May 2009 14:10:27 +0000 (-0400)
Subject: [splash] Rename spinfinity plugin to throbgress
X-Git-Tag: 0.7.0~177
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3cd5b5f2e0a1f6467154c970bad6b47f3f69d889;p=thirdparty%2Fplymouth.git

[splash] Rename spinfinity plugin to throbgress

It's the theme that makes it spinfinity,
not the plugin.  The plugin is more generic.
---

diff --git a/configure.ac b/configure.ac
index 19da340e..fb261914 100644
--- a/configure.ac
+++ b/configure.ac
@@ -201,7 +201,7 @@ AC_OUTPUT([Makefile
            src/plymouth-1.pc
            src/plugins/Makefile
            src/plugins/splash/Makefile
-           src/plugins/splash/spinfinity/Makefile
+           src/plugins/splash/throbgress/Makefile
            src/plugins/splash/fade-in/Makefile
            src/plugins/splash/text/Makefile
            src/plugins/splash/details/Makefile
diff --git a/src/plugins/splash/Makefile.am b/src/plugins/splash/Makefile.am
index dda7f86c..5cb9ad63 100644
--- a/src/plugins/splash/Makefile.am
+++ b/src/plugins/splash/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = spinfinity fade-in text details solar two-step
+SUBDIRS = throbgress fade-in text details solar two-step
 MAINTAINERCLEANFILES = Makefile.in
 
 if ADD_DEFAULT_PLUGIN_LINK
diff --git a/src/plugins/splash/spinfinity/Makefile.am b/src/plugins/splash/throbgress/Makefile.am
similarity index 82%
rename from src/plugins/splash/spinfinity/Makefile.am
rename to src/plugins/splash/throbgress/Makefile.am
index 3b17c21b..c4ca0a8a 100644
--- a/src/plugins/splash/spinfinity/Makefile.am
+++ b/src/plugins/splash/throbgress/Makefile.am
@@ -7,9 +7,9 @@ INCLUDES = -I$(top_srcdir)                                                    \
            -I$(srcdir)
 
 plugindir = $(libdir)/plymouth
-plugin_LTLIBRARIES = spinfinity.la
+plugin_LTLIBRARIES = throbgress.la
 
-spinfinity_la_CFLAGS = $(PLYMOUTH_CFLAGS)                                    \
+throbgress_la_CFLAGS = $(PLYMOUTH_CFLAGS)                                    \
                        -DPLYMOUTH_IMAGE_DIR=\"$(datadir)/plymouth/\"         \
                        -DPLYMOUTH_TIME_DIR=\"$(localstatedir)/lib/plymouth/\"\
                        -DPLYMOUTH_LOGO_FILE=\"$(logofile)\"                  \
@@ -17,10 +17,10 @@ spinfinity_la_CFLAGS = $(PLYMOUTH_CFLAGS)                                    \
                        -DPLYMOUTH_BACKGROUND_END_COLOR=$(background_end_color)   \
                        -DPLYMOUTH_BACKGROUND_START_COLOR=$(background_start_color)
 
-spinfinity_la_LDFLAGS = -module -avoid-version -export-dynamic
-spinfinity_la_LIBADD = $(PLYMOUTH_LIBS)                                      \
+throbgress_la_LDFLAGS = -module -avoid-version -export-dynamic
+throbgress_la_LIBADD = $(PLYMOUTH_LIBS)                                      \
                        ../../../libply/libply.la                             \
                        ../../../libplybootsplash/libplybootsplash.la
-spinfinity_la_SOURCES = $(srcdir)/plugin.c
+throbgress_la_SOURCES = $(srcdir)/plugin.c
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/plugins/splash/spinfinity/plugin.c b/src/plugins/splash/throbgress/plugin.c
similarity index 99%
rename from src/plugins/splash/spinfinity/plugin.c
rename to src/plugins/splash/throbgress/plugin.c
index df8c4418..604d4046 100644
--- a/src/plugins/splash/spinfinity/plugin.c
+++ b/src/plugins/splash/throbgress/plugin.c
@@ -1,4 +1,4 @@
-/* spinfinity.c - boot splash plugin
+/* throbgress.c - boot splash plugin
  *
  * Copyright (C) 2007, 2008 Red Hat, Inc.
  *
@@ -111,7 +111,7 @@ create_plugin (ply_key_file_t *key_file)
   plugin = calloc (1, sizeof (ply_boot_splash_plugin_t));
 
   plugin->logo_image = ply_image_new (PLYMOUTH_LOGO_FILE);
-  image_dir = ply_key_file_get_value (key_file, "spinfinity", "ImageDir");
+  image_dir = ply_key_file_get_value (key_file, "throbgress", "ImageDir");
 
   asprintf (&image_path, "%s/lock.png", image_dir);
   plugin->lock_image = ply_image_new (image_path);
diff --git a/themes/spinfinity/spinfinity.plymouth.in b/themes/spinfinity/spinfinity.plymouth.in
index 9c11c3bd..d4a94690 100644
--- a/themes/spinfinity/spinfinity.plymouth.in
+++ b/themes/spinfinity/spinfinity.plymouth.in
@@ -1,7 +1,7 @@
 [Plymouth Theme]
 Name=Spinfinity
 Description=Simple theme that shows a rotating infinity sign in the center of the screen
-ModuleName=spinfinity
+ModuleName=throbgress
 
-[spinfinity]
+[throbgress]
 ImageDir=@PLYMOUTH_THEME_PATH@/spinfinity