From d0e109f96cc4137498d42e7a1e688ffd2957892d Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Sat, 1 Jun 2002 17:03:25 +0000 Subject: [PATCH] add some missing \n (meta_session_init): remove the #if 0 interact 2002-06-01 Havoc Pennington * src/session.c: add some missing \n (meta_session_init): remove the #if 0 interact callback from our initial SmcOpenConnection call, this arg to SmcOpenConnection doesn't exist. --- ChangeLog | 7 +++++++ src/session.c | 12 +++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index fe80d2c67..175bca0fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2002-06-01 Havoc Pennington + + * src/session.c: add some missing \n + (meta_session_init): remove the #if 0 interact callback from our + initial SmcOpenConnection call, this arg to SmcOpenConnection + doesn't exist. + 2002-06-01 Havoc Pennington * src/session.c: put in more debug spew about the session diff --git a/src/session.c b/src/session.c index 0c776e38e..ed8570200 100644 --- a/src/session.c +++ b/src/session.c @@ -238,12 +238,6 @@ meta_session_init (const char *previous_client_id, mask = SmcSaveYourselfProcMask | SmcDieProcMask | SmcSaveCompleteProcMask | SmcShutdownCancelledProcMask; - -#if 0 - /* note this isn't in the mask above */ - callbacks.interact.callback = interact_callback; - callbacks.interact.client_data = NULL; -#endif callbacks.save_yourself.callback = save_yourself_callback; callbacks.save_yourself.client_data = NULL; @@ -496,13 +490,13 @@ static void save_complete_callback (SmcConn smc_conn, SmPointer client_data) { /* nothing */ - meta_topic (META_DEBUG_SM, "SaveComplete received"); + meta_topic (META_DEBUG_SM, "SaveComplete received\n"); } static void shutdown_cancelled_callback (SmcConn smc_conn, SmPointer client_data) { - meta_topic (META_DEBUG_SM, "Shutdown cancelled received"); + meta_topic (META_DEBUG_SM, "Shutdown cancelled received\n"); if (session_connection != NULL && (current_state != STATE_IDLE && current_state != STATE_FROZEN)) @@ -518,7 +512,7 @@ interact_callback (SmcConn smc_conn, SmPointer client_data) /* nothing */ gboolean shutdown; - meta_topic (META_DEBUG_SM, "Interaction permission received"); + meta_topic (META_DEBUG_SM, "Interaction permission received\n"); shutdown = GPOINTER_TO_INT (client_data);