isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 01:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

add some missing \n (meta_session_init): remove the #if 0 interact

Browse Source 
2002-06-01  Havoc Pennington  <hp@pobox.com>

	* 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.
This commit is contained in:
Havoc Pennington 2002-06-01 17:03:25 +00:00 committed by Havoc Pennington
parent 9d68b98bc9
commit d0e109f96c
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2002-06-01 Havoc Pennington <hp@pobox.com>
* 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 <hp@pobox.com> 2002-06-01 Havoc Pennington <hp@pobox.com>
* src/session.c: put in more debug spew about the session * src/session.c: put in more debug spew about the session

12
src/session.c
View File

@ -238,12 +238,6 @@ meta_session_init (const char *previous_client_id,
mask = SmcSaveYourselfProcMask | SmcDieProcMask | mask = SmcSaveYourselfProcMask | SmcDieProcMask |
SmcSaveCompleteProcMask | SmcShutdownCancelledProcMask; 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.callback = save_yourself_callback;
callbacks.save_yourself.client_data = NULL; callbacks.save_yourself.client_data = NULL;
@ -496,13 +490,13 @@ static void
save_complete_callback (SmcConn smc_conn, SmPointer client_data) save_complete_callback (SmcConn smc_conn, SmPointer client_data)
{ {
/* nothing */ /* nothing */
meta_topic (META_DEBUG_SM, "SaveComplete received"); meta_topic (META_DEBUG_SM, "SaveComplete received\n");
} }
static void static void
shutdown_cancelled_callback (SmcConn smc_conn, SmPointer client_data) 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 && if (session_connection != NULL &&
(current_state != STATE_IDLE && current_state != STATE_FROZEN)) (current_state != STATE_IDLE && current_state != STATE_FROZEN))
@ -518,7 +512,7 @@ interact_callback (SmcConn smc_conn, SmPointer client_data)
/* nothing */ /* nothing */
gboolean shutdown; 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); shutdown = GPOINTER_TO_INT (client_data);