From 7709d66b38e076ba98f26cbdcb9f766ccd34984b Mon Sep 17 00:00:00 2001 From: Uli Schlachter Date: Tue, 1 Apr 2014 16:15:44 +0200 Subject: [PATCH] Revert "root: Make sure cairo doesn't cache our temporary connection" (FS#1245) This reverts commit c1cb7883b596cb49b3a4fc898b29cc251c1d72b8. The cairo surface used for uploading the wallpaper doesn't use a temporary connection but is on our main connection since commit 5024843e9. Thus, the above commit broke all of our cairo drawing instead of just making cairo not touch our temporary connection. --- root.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/root.c b/root.c index d6258c3ad..6ad962e28 100644 --- a/root.c +++ b/root.c @@ -79,7 +79,6 @@ root_set_wallpaper(cairo_pattern_t *pattern) uint16_t height = screen->height_in_pixels; bool result = false; cairo_surface_t *surface; - cairo_device_t *device; cairo_t *cr; if (xcb_connection_has_error(c)) @@ -97,7 +96,6 @@ root_set_wallpaper(cairo_pattern_t *pattern) * the new one directly and doesn't need GetImage and PutImage. */ surface = cairo_xcb_surface_create(globalconf.connection, p, draw_default_visual(screen), width, height); - device = cairo_device_reference(cairo_surface_get_device(surface)); cr = cairo_create(surface); /* Paint the pattern to the surface */ cairo_set_source(cr, pattern); @@ -106,9 +104,6 @@ root_set_wallpaper(cairo_pattern_t *pattern) cairo_destroy(cr); cairo_surface_finish(surface); cairo_surface_destroy(surface); - /* Finish the device so we safely call xcb_disconnect() */ - cairo_device_finish(device); - cairo_device_destroy(device); xcb_aux_sync(globalconf.connection); root_set_wallpaper_pixmap(c, p);