shell,compositor-x11: Fix trivial memory leaks
authorRyo Munakata <ryomnktml@gmail.com>
Sun, 8 Mar 2015 10:17:06 +0000 (19:17 +0900)
committerPekka Paalanen <pekka.paalanen@collabora.co.uk>
Mon, 9 Mar 2015 07:26:46 +0000 (09:26 +0200)
Signed-off-by: Ryo Munakata <ryomnktml@gmail.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
desktop-shell/shell.c
src/compositor-x11.c

index aae304d..826692f 100644 (file)
@@ -6453,6 +6453,8 @@ shell_destroy(struct wl_listener *listener, void *data)
                wl_client_destroy(shell->child.client);
        }
 
+       wl_event_source_remove(shell->screensaver.timer);
+
        wl_list_remove(&shell->idle_listener.link);
        wl_list_remove(&shell->wake_listener.link);
 
index aa1e519..e9735c5 100644 (file)
@@ -1454,6 +1454,8 @@ x11_compositor_get_wm_info(struct x11_compositor *c)
                if (atom[i] == c->atom.net_wm_state_fullscreen)
                        c->has_net_wm_state_fullscreen = 1;
        }
+
+       free(reply);
 }
 
 static void