From: Ray Strode <rstrode@redhat.com>
Date: Fri, 3 Oct 2008 20:39:01 +0000 (-0400)
Subject: Tell GDM to start on vt1 for every plugin
X-Git-Tag: 0.6.0~100
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a37ce94fc5db98a275704e3eacc502aca9cd54d;p=thirdparty%2Fplymouth.git

Tell GDM to start on vt1 for every plugin
---

diff --git a/src/main.c b/src/main.c
index 7c782c81..23387237 100644
--- a/src/main.c
+++ b/src/main.c
@@ -288,6 +288,17 @@ on_hide_splash (state_t *state)
     }
 }
 
+#ifdef PLY_ENABLE_GDM_TRANSITION
+static void
+tell_gdm_to_transition (void)
+{
+  int fd;
+
+  fd = creat ("/var/spool/gdm/force-display-on-active-vt", 0644);
+  close (fd);
+}
+#endif
+
 static void
 on_quit (state_t *state,
          bool     retain_splash)
@@ -305,6 +316,8 @@ on_quit (state_t *state,
     }
   ply_trace ("exiting event loop");
   ply_event_loop_exit (state->loop, 0);
+
+  tell_gdm_to_transition ();
 }
 
 static ply_boot_server_t *
diff --git a/src/plugins/splash/solar/plugin.c b/src/plugins/splash/solar/plugin.c
index b3281034..d81f30e5 100644
--- a/src/plugins/splash/solar/plugin.c
+++ b/src/plugins/splash/solar/plugin.c
@@ -201,17 +201,6 @@ create_plugin (void)
   return plugin;
 }
 
-#ifdef PLY_ENABLE_GDM_TRANSITION
-static void
-tell_gdm_to_transition (void)
-{
-  int fd;
-
-  fd = creat ("/var/spool/gdm/force-display-on-active-vt", 0644);
-  close (fd);
-}
-#endif
-
 void
 destroy_plugin (ply_boot_splash_plugin_t *plugin)
 {
@@ -248,11 +237,6 @@ destroy_plugin (ply_boot_splash_plugin_t *plugin)
   ply_label_free (plugin->label);
   ply_list_free (plugin->sprites);
 
-#ifdef PLY_ENABLE_GDM_TRANSITION
-  if (plugin->is_visible)
-    tell_gdm_to_transition ();
-#endif
-
   free (plugin);
 }
 
diff --git a/src/plugins/splash/spinfinity/plugin.c b/src/plugins/splash/spinfinity/plugin.c
index 95a995e3..79b1eda1 100644
--- a/src/plugins/splash/spinfinity/plugin.c
+++ b/src/plugins/splash/spinfinity/plugin.c
@@ -110,17 +110,6 @@ create_plugin (void)
   return plugin;
 }
 
-#ifdef PLY_ENABLE_GDM_TRANSITION
-static void
-tell_gdm_to_transition (void)
-{
-  int fd;
-
-  fd = creat ("/var/spool/gdm/force-display-on-active-vt", 0644);
-  close (fd);
-}
-#endif
-
 void
 destroy_plugin (ply_boot_splash_plugin_t *plugin)
 {
@@ -143,11 +132,6 @@ destroy_plugin (ply_boot_splash_plugin_t *plugin)
   ply_label_free (plugin->label);
   ply_progress_bar_free (plugin->progress_bar);
 
-#ifdef PLY_ENABLE_GDM_TRANSITION
-  if (plugin->is_visible)
-    tell_gdm_to_transition ();
-#endif
-
   free (plugin);
 }