From 6445d16fd5fe17138e28f53dd8c67cc3d7066a5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Sandmann?= Date: Fri, 31 Mar 2006 21:45:29 +0000 Subject: [PATCH] Release the GL window here. Disconect from the magnifier, not the stacker. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fri Mar 31 16:44:56 2006 Søren Sandmann * src/c-screen.c (meta_screen_info_unredirect): Release the GL window here. Disconect from the magnifier, not the stacker. --- ChangeLog | 5 +++++ src/c-screen.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 35531aa95..8ffadfcb4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Mar 31 16:44:56 2006 Søren Sandmann + + * src/c-screen.c (meta_screen_info_unredirect): Release the GL + window here. Disconect from the magnifier, not the stacker. + Fri Mar 31 12:24:26 2006 Søren Sandmann * src/c-screen.c (meta_screen_info_redirect): Only use magnifier diff --git a/src/c-screen.c b/src/c-screen.c index dc5e1ec8c..9a2c64fc9 100644 --- a/src/c-screen.c +++ b/src/c-screen.c @@ -344,11 +344,14 @@ meta_screen_info_unredirect (MetaScreenInfo *info) g_print ("unredirecting %lx\n", WS_RESOURCE_XID (root)); #endif - g_signal_handler_disconnect (info->stacker, info->repaint_id); + g_signal_handler_disconnect (info->magnifier, info->repaint_id); g_object_unref (info->stacker); ws_window_unredirect_subwindows (root); +#if 0 ws_window_unmap (info->gl_window); +#endif + ws_screen_release_gl_window (ws_screen); ws_display_sync (info->display); }