Merge lp:~smspillaz/xig/xig.disconnect-signals into lp:xig

[Sam Spilsbury]

Disconnect signals the remote client is interested in when it goes away.

[Robert Ancell (robert-ancell)]

From me via IRC:

"What you really should do is the server should connected to the destroyed signal for the resources and remove them that way
 so you're explicitly destroying the references from both sides, but the server should be implicitly destroying them
 (or the other way around). The patch has both the server and client responsible which is dangerous if one of them gets out of sync.

So there's two ways we can do this - the client destroys itself, and the server detects that and destroys all its resources, or the client destroys all its resources then itself, and the server doesn't care"

and Sam said "So I think the best way to handle this is to have a XigClientResource which XigSelection and XigDrawable inherit"

Which is correct.

review: Needs Fixing

[Robert Ancell (robert-ancell)]

Whoops wrong merge. This merge is just blocked on the other one

Unmerged revisions

256. By Sam Spilsbury on 2012-01-21

Disconnect stale signals too to avoid a race where the signals are dispatched
after the remote client is unrefd

255. By Sam Spilsbury on 2012-01-21

Clean up after clients - remove stale resource id's and selections. Also
handle the edge case where clients die and leave stuff behind.

254. By Sam Spilsbury on 2012-01-21

Write message length according to format, not actual length as that's too much

=== modified file 'src/xig-server.c'
--- src/xig-server.c	2012-01-21 13:31:23 +0000
+++ src/xig-server.c	2012-01-21 13:31:23 +0000
@@ -189,6 +189,20 @@
     g_hash_table_remove (server->priv->drawables, GINT_TO_POINTER (xig_drawable_get_id (XIG_DRAWABLE (pixmap))));
 }
 
+static void
+xig_disconnect_client_recursive (XigRemoteClient *client, XigWindow *window)
+{
+    GList *children = xig_window_get_children (window);
+
+    g_signal_handlers_disconnect_matched (window, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, client);
+
+    while (children)
+    {
+        XigWindow *child = XIG_WINDOW (children->data);
+        xig_disconnect_client_recursive (client, child);
+        children = g_list_next (children);
+    }
+}
 
 static void
 xig_remote_client_disconnected_cb (XigRemoteClient *client, XigServer *server)
@@ -220,6 +234,18 @@
         list = g_list_next (list);
     }
 
+    GList     *screens = server->priv->screens;
+
+    while (screens)
+    {
+        XigScreen *screen = (XigScreen *) screens->data;
+        XigWindow *root = xig_screen_get_root (screen);
+
+        xig_disconnect_client_recursive (client, root);
+
+        screens = g_list_next (screens);
+    }
+
     g_list_free (orig);
 
     g_object_unref (client);