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

x11/session: Set the context as client data on connection watch

Browse Source 
It was already assumed to be the context, but we never set it as such,
so things just crashed instead. Now when we set it up correctly,
hopefully that won't happen anymore.

Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/2406
Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/2267
Closes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5078
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2609>
This commit is contained in:
Jonas Ådahl 2022-09-02 16:49:29 +02:00 committed by Marge Bot
parent b1cc591ef5
commit 60b382c4e3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/x11/session.c
View File

@ -173,7 +173,7 @@ ice_io_error_handler (IceConn connection)
} }
static void static void
ice_init (void) ice_init (MetaContext *context)
{ {
static gboolean ice_initted = FALSE; static gboolean ice_initted = FALSE;
@ -187,7 +187,7 @@ ice_init (void)
if (ice_installed_handler == default_handler) if (ice_installed_handler == default_handler)
ice_installed_handler = NULL; ice_installed_handler = NULL;
IceAddConnectionWatch (new_ice_connection, NULL); IceAddConnectionWatch (new_ice_connection, context);
ice_initted = TRUE; ice_initted = TRUE;
} }
@ -270,7 +270,7 @@ meta_session_init (MetaContext *context,
saved_client_id = NULL; saved_client_id = NULL;
} }
ice_init (); ice_init (context);
mask = SmcSaveYourselfProcMask | SmcDieProcMask | mask = SmcSaveYourselfProcMask | SmcDieProcMask |
SmcSaveCompleteProcMask | SmcShutdownCancelledProcMask; SmcSaveCompleteProcMask | SmcShutdownCancelledProcMask;