diff options
| author | Iain Holmes <iain@src.gnome.org> | 2007-11-16 22:27:23 +0000 |
|---|---|---|
| committer | Iain Holmes <iain@src.gnome.org> | 2007-11-16 22:27:23 +0000 |
| commit | 254be3ca3d11cf63eef7862378e92dd739d4b3d8 (patch) | |
| tree | 24caaf551f09deed7d43624c309d3c644a39b2f8 | |
| parent | 288b0831ea5d17e668270b79979a57e9f7bcd811 (diff) | |
| download | metacity-254be3ca3d11cf63eef7862378e92dd739d4b3d8.tar.gz | |
Don't free the root pixmap ID...nautilus gets all pissy
svn path=/branches/iains-blingtastic-bucket-o-bling/; revision=3402
| -rw-r--r-- | src/compositor.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/compositor.c b/src/compositor.c index 5eb5740a..1cdcf811 100644 --- a/src/compositor.c +++ b/src/compositor.c @@ -534,10 +534,9 @@ root_tile (MetaScreen *screen) Atom pixmap_atom; pixmap = None; - - background_atoms[0] = display->atom_x_root_pixmap; - background_atoms[1] = display->atom_x_set_root; - background_atoms[2] = display->atom_e_set_root; + background_atoms[0] = XInternAtom (display->xdisplay, "_XROOTPMAP_ID", False); + background_atoms[1] = XInternAtom (display->xdisplay, "_XSETROOT_ID", False); + background_atoms[2] = XInternAtom (display->xdisplay, "ESETROOT_PMAP_ID", False); pixmap_atom = XInternAtom (display->xdisplay, "PIXMAP", False); for (p = 0; p < 3; p++) @@ -564,7 +563,7 @@ root_tile (MetaScreen *screen) } } } - + if (!pixmap) { pixmap = XCreatePixmap (display->xdisplay, screen->xroot, 1, 1, @@ -593,8 +592,8 @@ root_tile (MetaScreen *screen) XRenderFillRectangle (display->xdisplay, PictOpSrc, picture, &c, 0, 0, 1, 1); + XFreePixmap (display->xdisplay, pixmap); } - XFreePixmap (display->xdisplay, pixmap); return picture; } |