From: Peter Jones <pjones@redhat.com>
Date: Mon, 16 Jun 2008 22:05:50 +0000 (-0400)
Subject: Revert "Supress erroneous warning during shutdown.", it's completely wrong.
X-Git-Tag: 0.4.0~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bdfa510fbefcaddb24dac99f0f7b811bad2298df;p=thirdparty%2Fplymouth.git

Revert "Supress erroneous warning during shutdown.", it's completely wrong.

This reverts commit 2698c0899929420ed566be02ce0e3e8e91ad0e5f.
---

diff --git a/src/client/ply-boot-client.c b/src/client/ply-boot-client.c
index 06587b63..e75309de 100644
--- a/src/client/ply-boot-client.c
+++ b/src/client/ply-boot-client.c
@@ -504,7 +504,6 @@ ply_boot_client_tell_daemon_to_quit (ply_boot_client_t                  *client,
 {
   assert (client != NULL);
 
-  client->disconnect_handler = NULL;
   ply_boot_client_queue_request (client, PLY_BOOT_PROTOCOL_REQUEST_TYPE_QUIT,
                                  NULL, handler, failed_handler, user_data);
 }
diff --git a/src/client/plymouth.c b/src/client/plymouth.c
index d76a474f..f5a201b0 100644
--- a/src/client/plymouth.c
+++ b/src/client/plymouth.c
@@ -163,14 +163,11 @@ main (int    argc,
                                                (ply_boot_client_response_handler_t)
                                                on_failure, loop);
   else if (should_quit)
-    {
-      ply_boot_client_tell_daemon_to_quit (client,
-                                           (ply_boot_client_response_handler_t)
-                                           on_success,
-                                           (ply_boot_client_response_handler_t)
-                                           on_failure, loop);
-      ply_boot_client_disconnect(client);
-    }
+    ply_boot_client_tell_daemon_to_quit (client,
+                                         (ply_boot_client_response_handler_t)
+                                         on_success,
+                                         (ply_boot_client_response_handler_t)
+                                         on_failure, loop);
   else if (should_ping)
     ply_boot_client_ping_daemon (client, 
                                  (ply_boot_client_response_handler_t)