From: Ray Strode <rstrode@redhat.com>
Date: Thu, 3 May 2012 20:52:52 +0000 (-0400)
Subject: drm: rename ENABLE_GDM_TRANSITION to ENABLE_GDM_DEPRECATED_TRANSITION
X-Git-Tag: 0.8.5~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1a19b4572aff896d3408784d3d1a306b33a27e66;p=thirdparty%2Fplymouth.git

drm: rename ENABLE_GDM_TRANSITION to ENABLE_GDM_DEPRECATED_TRANSITION

Most distributions no longer use this transition, which relies
on plymouth quitting before X starts.

For clarity, rename the #define to include the word DEPRECATED
---

diff --git a/configure.ac b/configure.ac
index d872b184..116a4f15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -223,7 +223,7 @@ AM_CONDITIONAL(ENABLE_TESTS,  [test "$enable_tests" = yes])
 AC_ARG_ENABLE(gdm-transition, AS_HELP_STRING([--enable-gdm-transition],[enable smooth transition to gdm]),enable_gdm_transition=$enableval,enable_gdm_transition=no)
 
 if test x$enable_gdm_transition = xyes; then
-  AC_DEFINE(PLY_ENABLE_GDM_TRANSITION, 1, [Enable smooth transition to GDM])
+  AC_DEFINE(PLY_ENABLE_DEPRECATED_GDM_TRANSITION, 1, [Enable deprecated smooth transition to GDM])
 fi
 
 AC_ARG_ENABLE(upstart-monitoring, AS_HELP_STRING([--enable-upstart-monitoring],[listen for messages on the Upstart D-Bus interface]),enable_upstart_monitoring=$enableval,enable_upstart_monitoring=no)
diff --git a/src/main.c b/src/main.c
index f471f015..c8c9f551 100644
--- a/src/main.c
+++ b/src/main.c
@@ -973,7 +973,7 @@ on_hide_splash (state_t *state)
   dump_details_and_quit_splash (state);
 }
 
-#ifdef PLY_ENABLE_GDM_TRANSITION
+#ifdef PLY_ENABLE_DEPRECATED_GDM_TRANSITION
 static void
 tell_gdm_to_transition (void)
 {
@@ -997,7 +997,7 @@ quit_program (state_t *state)
       pid_file = NULL;
     }
 
-#ifdef PLY_ENABLE_GDM_TRANSITION
+#ifdef PLY_ENABLE_DEPRECATED_GDM_TRANSITION
   if (state->should_retain_splash &&
       state->mode == PLY_MODE_BOOT)
     {
diff --git a/src/plugins/renderers/drm/plugin.c b/src/plugins/renderers/drm/plugin.c
index 6f4ba077..90d40e73 100644
--- a/src/plugins/renderers/drm/plugin.c
+++ b/src/plugins/renderers/drm/plugin.c
@@ -512,7 +512,7 @@ load_driver (ply_renderer_backend_t *backend)
  * since it can map the kernel console, which gives us the ability to do
  * a more seamless transition when plymouth quits before X starts
  */
-#if defined(PLY_ENABLE_GDM_TRANSITION) && defined(PLY_ENABLE_LIBDRM_INTEL)
+#if defined(PLY_ENABLE_DEPRECATED_GDM_TRANSITION) && defined(PLY_ENABLE_LIBDRM_INTEL)
   if (backend->driver_interface == NULL && strcmp (driver_name, "i915") == 0)
     {
       backend->driver_interface = ply_renderer_i915_driver_get_interface ();
@@ -847,7 +847,7 @@ create_heads_for_active_connectors (ply_renderer_backend_t *backend)
 
   ply_hashtable_free (heads_by_controller_id);
 
-#ifdef PLY_ENABLE_GDM_TRANSITION
+#ifdef PLY_ENABLE_DEPRECATED_GDM_TRANSITION
   /* If the driver doesn't support mapping the fb console
    * then we can't get a smooth crossfade transition to
    * the display manager unless we use the /dev/fb interface