Make daemon pass client sent password prompt to splash plugins

They don't currently do anything with the message but they
at least now get it so they conceivably could.

diff --git a/src/libplybootsplash/ply-boot-splash-plugin.h b/src/libplybootsplash/ply-boot-splash-plugin.h
index cc4b39a0ea7b48f1fe88ac6d22a66b49c4997c1a..920bdccba737bf35b8beac55c88190344cb5d523 100644 (file)
--- a/src/libplybootsplash/ply-boot-splash-plugin.h
+++ b/src/libplybootsplash/ply-boot-splash-plugin.h
@@ -54,6 +54,7 @@ typedef struct
                                ply_window_t             *window);
 
   void (* ask_for_password) (ply_boot_splash_plugin_t *plugin,
+                             const char               *prompt,
                              ply_answer_t             *answer);
 } ply_boot_splash_plugin_interface_t;
 

diff --git a/src/main.c b/src/main.c
index 205cad1c856bccf98359d8242b65e31e298b1336..afa0f82fd1b384c4277a2c75b2f2d75b421d9891 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -135,6 +135,7 @@ show_default_splash (state_t *state)
 
 static void
 on_ask_for_password (state_t      *state,
+                     const char   *prompt,
                      ply_answer_t *answer)
 {
   if (state->boot_splash == NULL)
@@ -145,7 +146,8 @@ on_ask_for_password (state_t      *state,
       return;
     }
 
-  ply_boot_splash_ask_for_password (state->boot_splash, answer);
+  ply_boot_splash_ask_for_password (state->boot_splash,
+                                    prompt, answer);
 }
 
 static void

diff --git a/src/ply-boot-server.c b/src/ply-boot-server.c
index 8d6dee0aedf7778add7045744aeee0dd2858be04..ce053bfa9478c3b8822b95ca956d45704387a3b6 100644 (file)
--- a/src/ply-boot-server.c
+++ b/src/ply-boot-server.c
@@ -302,6 +302,7 @@ ply_boot_connection_on_request (ply_boot_connection_t *connection)
 
       if (server->ask_for_password_handler != NULL)
         server->ask_for_password_handler (server->user_data,
+                                          argument,
                                           answer,
                                           server);
       /* will reply later

diff --git a/src/ply-boot-server.h b/src/ply-boot-server.h
index 9550ffe0f446573deba85ca5de6051fbc1828588..acc95dc69c3b22d63abedbf6e31ac94ccc1a093d 100644 (file)
--- a/src/ply-boot-server.h
+++ b/src/ply-boot-server.h
@@ -50,6 +50,7 @@ typedef void (* ply_boot_server_password_answer_handler_t) (void              *a
                                                             const char        *password,
                                                             ply_boot_server_t *server);
 typedef void (* ply_boot_server_ask_for_password_handler_t) (void              *user_data,
+                                                             const char        *prompt,
                                                              ply_answer_t      *answer,
                                                              ply_boot_server_t *server);
 

diff --git a/src/ply-boot-splash.c b/src/ply-boot-splash.c
index 3fd63318ca3fc4863a6dd3b4f42fccb5e4108594..69b7c3561f18da2eeb0272795ab4ebbc98819967 100644 (file)
--- a/src/ply-boot-splash.c
+++ b/src/ply-boot-splash.c
@@ -216,6 +216,7 @@ ply_boot_splash_update_output (ply_boot_splash_t *splash,
 
 void
 ply_boot_splash_ask_for_password (ply_boot_splash_t *splash,
+                                  const char        *prompt,
                                   ply_answer_t      *answer)
 {
 
@@ -231,6 +232,7 @@ ply_boot_splash_ask_for_password (ply_boot_splash_t *splash,
     }
 
   splash->plugin_interface->ask_for_password (splash->plugin,
+                                              prompt,
                                               answer);
 }
 

diff --git a/src/ply-boot-splash.h b/src/ply-boot-splash.h
index 367af1e7dbd4de1e019e7ef8a527bf5c074a25a2..94c032ce628aaecba75468fdf7245514e9044a00 100644 (file)
--- a/src/ply-boot-splash.h
+++ b/src/ply-boot-splash.h
@@ -47,6 +47,7 @@ void ply_boot_splash_update_output (ply_boot_splash_t *splash,
                                     size_t             size);
 
 void ply_boot_splash_ask_for_password (ply_boot_splash_t *splash,
+                                       const char        *prompt,
                                        ply_answer_t      *answer);
 void ply_boot_splash_hide (ply_boot_splash_t *splash);
 void ply_boot_splash_attach_to_event_loop (ply_boot_splash_t *splash,

diff --git a/src/splash-plugins/details/plugin.c b/src/splash-plugins/details/plugin.c
index ae52b15217f5bf3e67a473a1d6086fdd1cabaf5b..50e13abe8f9c82c598e18d0cad54c2f4c4cd6ceb 100644 (file)
--- a/src/splash-plugins/details/plugin.c
+++ b/src/splash-plugins/details/plugin.c
@@ -57,6 +57,7 @@
 #define BACKSPACE "\b\033[0K"
 
 void ask_for_password (ply_boot_splash_plugin_t *plugin,
+                       const char               *prompt,
                        ply_answer_t             *answer);
 
 ply_boot_splash_plugin_interface_t *ply_boot_splash_plugin_get_interface (void);
@@ -217,6 +218,7 @@ hide_splash_screen (ply_boot_splash_plugin_t *plugin,
 
 void
 ask_for_password (ply_boot_splash_plugin_t *plugin,
+                  const char               *prompt,
                   ply_answer_t             *answer)
 {
   plugin->pending_password_answer = answer;

diff --git a/src/splash-plugins/fade-in/plugin.c b/src/splash-plugins/fade-in/plugin.c
index f7b75907310de4c359eea3951bc3a7e69aef8cba..2641217e3f68c7b5134d98de1beb1abfe514aab8 100644 (file)
--- a/src/splash-plugins/fade-in/plugin.c
+++ b/src/splash-plugins/fade-in/plugin.c
@@ -627,6 +627,7 @@ show_password_entry (ply_boot_splash_plugin_t *plugin)
 
 void
 ask_for_password (ply_boot_splash_plugin_t *plugin,
+                  const char               *prompt,
                   ply_answer_t             *answer)
 {
   plugin->pending_password_answer = answer;

diff --git a/src/splash-plugins/spinfinity/plugin.c b/src/splash-plugins/spinfinity/plugin.c
index 3b76518f17dc8a3f7c2738f8e4e73bea0bbab83f..f2653d554f2d956c7279f2d6fd796fa0d8abf2e2 100644 (file)
--- a/src/splash-plugins/spinfinity/plugin.c
+++ b/src/splash-plugins/spinfinity/plugin.c
@@ -446,6 +446,7 @@ show_password_entry (ply_boot_splash_plugin_t *plugin)
 
 void
 ask_for_password (ply_boot_splash_plugin_t *plugin,
+                  const char               *prompt,
                   ply_answer_t             *answer)
 {
   plugin->pending_password_answer = answer;

diff --git a/src/splash-plugins/text/plugin.c b/src/splash-plugins/text/plugin.c
index d5c011bbc404a322c539f8a84b571d255ec2c442..4e85a5753aebb29b4035a646ae0da6def1ef90e8 100644 (file)
--- a/src/splash-plugins/text/plugin.c
+++ b/src/splash-plugins/text/plugin.c
@@ -280,6 +280,7 @@ hide_splash_screen (ply_boot_splash_plugin_t *plugin,
 
 void
 ask_for_password (ply_boot_splash_plugin_t *plugin,
+                  const char               *prompt,
                   ply_answer_t             *answer)
 {
   int window_width, window_height;