From ae40e51693fedaccec8f0b9ec9c9eca0559f3540 Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <fourdan.olivier@wanadoo.fr>
Date: Sat, 19 Aug 2006 20:48:24 +0000
Subject: [PATCH] Plug a few leaks
(Old svn revision: 22836)
---
src/compositor.c | 1 +
src/focus.c | 9 +--------
src/mypixmap.c | 2 +-
src/netwm.c | 7 +++++--
4 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/src/compositor.c b/src/compositor.c
index 15bea2408..f7ea4a336 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -832,6 +832,7 @@ root_tile (ScreenInfo *screen_info)
c.alpha = 0xffff;
XRenderFillRectangle (dpy, PictOpSrc, picture, &c, 0, 0, 1, 1);
}
+ XFreePixmap (dpy, pixmap);
return picture;
}
diff --git a/src/focus.c b/src/focus.c
index adff20c12..692fd1333 100644
--- a/src/focus.c
+++ b/src/focus.c
@@ -607,14 +607,7 @@ clientUngrabMouseButton (Client * c)
TRACE ("ungrabing buttons for client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
- if (screen_info->params->raise_with_any_button)
- {
- ungrabButton(clientGetXDisplay (c), AnyButton, AnyModifier, c->window);
- }
- else
- {
- ungrabButton(clientGetXDisplay (c), Button1, AnyModifier, c->window);
- }
+ ungrabButton(clientGetXDisplay (c), AnyButton, AnyModifier, c->window);
/* We've ungrabbed way too much, so regrab the regular buttons/modifiers */
clientGrabButtons (c);
}
diff --git a/src/mypixmap.c b/src/mypixmap.c
index e32a649bf..6b80707c1 100644
--- a/src/mypixmap.c
+++ b/src/mypixmap.c
@@ -887,7 +887,7 @@ xfwmPixmapRenderGdkPixbuf (xfwmPixmap * pm, GdkPixbuf *pixbuf)
}
else
{
- destw = gdk_pixmap_foreign_new (pm->pixmap);
+ destw = gdk_pixmap_foreign_new (pm->pixmap);
}
if (!destw)
diff --git a/src/netwm.c b/src/netwm.c
index 83e6bb5ea..87926b3c8 100644
--- a/src/netwm.c
+++ b/src/netwm.c
@@ -764,8 +764,11 @@ clientSetNetClientList (ScreenInfo * screen_info, Atom a, GList * list)
if (size < 1)
{
XDeleteProperty (myScreenGetXDisplay (screen_info), screen_info->xroot, a);
+ return;
}
- else if ((listw = (Window *) malloc ((size + 1) * sizeof (Window))))
+
+ listw = g_new (Window, size + 1);
+ if (listw)
{
TRACE ("%i windows in list for %i clients", size, screen_info->client_count);
for (i = 0, index_dest = listw, index_src = list; i < size;
@@ -776,7 +779,7 @@ clientSetNetClientList (ScreenInfo * screen_info, Atom a, GList * list)
}
XChangeProperty (myScreenGetXDisplay (screen_info), screen_info->xroot, a, XA_WINDOW, 32, PropModeReplace,
(unsigned char *) listw, size);
- free (listw);
+ g_free (listw);
}
}
--
GitLab