diff options
| author | Peter Jones <pjones@redhat.com> | 2008-06-16 18:05:50 -0400 |
|---|---|---|
| committer | Peter Jones <pjones@pjones2.localdomain> | 2008-06-16 18:05:50 -0400 |
| commit | bdfa510fbefcaddb24dac99f0f7b811bad2298df (patch) | |
| tree | 431070e66fcf247ba249c59bced098357432ac4e | |
| parent | 2698c0899929420ed566be02ce0e3e8e91ad0e5f (diff) | |
| download | plymouth-bdfa510fbefcaddb24dac99f0f7b811bad2298df.tar.gz plymouth-bdfa510fbefcaddb24dac99f0f7b811bad2298df.tar.xz plymouth-bdfa510fbefcaddb24dac99f0f7b811bad2298df.zip | |
Revert "Supress erroneous warning during shutdown.", it's completely wrong.
This reverts commit 2698c0899929420ed566be02ce0e3e8e91ad0e5f.
| -rw-r--r-- | src/client/ply-boot-client.c | 1 | ||||
| -rw-r--r-- | src/client/plymouth.c | 13 |
2 files changed, 5 insertions, 9 deletions
diff --git a/src/client/ply-boot-client.c b/src/client/ply-boot-client.c index 06587b6..e75309d 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 d76a474..f5a201b 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) |