core: Also reset the XSelectInput for WnckScreen and WnckApplication

We don't want to break apps that have set some specific mask with
XSelectInput.

1 files changed, 11 insertions, 4 deletions

diff --git a/libwnck/application.c b/libwnck/application.c
index edd32e6..f10c334 100644
--- a/libwnck/application.c
+++ b/libwnck/application.c
@@ -60,6 +60,8 @@ struct _WnckApplicationPrivate
   int pid;
   char *name;
 
+  int orig_event_mask;
+
   WnckWindow *name_window;    /* window we are using name of */
 
   GdkPixbuf *icon;
@@ -186,6 +188,11 @@ wnck_application_finalize (GObject *object)
 
   application = WNCK_APPLICATION (object);
 
+  _wnck_select_input (WNCK_SCREEN_XSCREEN (application->priv->screen),
+                      application->priv->xwindow,
+                      application->priv->orig_event_mask,
+                      FALSE);
+
   application->priv->xwindow = None;
 
   g_list_free (application->priv->windows);
@@ -566,10 +573,10 @@ _wnck_application_create (Window      xwindow,
   /* Note that xwindow may correspond to a WnckWindow's xwindow,
    * so we select events needed by either
    */
-  _wnck_select_input (xscreen,
-                      application->priv->xwindow,
-                      WNCK_APP_WINDOW_EVENT_MASK,
-                      TRUE);
+  application->priv->orig_event_mask = _wnck_select_input (xscreen,
+                                                           application->priv->xwindow,
+                                                           WNCK_APP_WINDOW_EVENT_MASK,
+                                                           TRUE);
 
   return application;
 }