aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGerd Moellmann2001-01-11 12:49:00 +0000
committerGerd Moellmann2001-01-11 12:49:00 +0000
commit513c58069edda2091e4b1905554573151921e1ab (patch)
tree60209033ba2edbe219e3997eb61c1a047e653a30 /src
parent926861fbc1bbcc0f7143be623e517ab1156ddae7 (diff)
downloademacs-513c58069edda2091e4b1905554573151921e1ab.tar.gz
emacs-513c58069edda2091e4b1905554573151921e1ab.zip
(x_free_colors, x_free_dpy_colors): Do the
unregister_colors before calling XFreeColors.
Diffstat (limited to 'src')
-rw-r--r--src/xfaces.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xfaces.c b/src/xfaces.c
index 65f912ef24d..e890dc790fd 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -701,11 +701,11 @@ x_free_colors (f, pixels, npixels)
701 necessary and some servers don't allow it. So don't do it. */ 701 necessary and some servers don't allow it. So don't do it. */
702 if (class != StaticColor && class != StaticGray && class != TrueColor) 702 if (class != StaticColor && class != StaticGray && class != TrueColor)
703 { 703 {
704 XFreeColors (FRAME_X_DISPLAY (f), FRAME_X_COLORMAP (f),
705 pixels, npixels, 0);
706#ifdef DEBUG_X_COLORS 704#ifdef DEBUG_X_COLORS
707 unregister_colors (pixels, npixels); 705 unregister_colors (pixels, npixels);
708#endif 706#endif
707 XFreeColors (FRAME_X_DISPLAY (f), FRAME_X_COLORMAP (f),
708 pixels, npixels, 0);
709 } 709 }
710} 710}
711 711
@@ -729,10 +729,10 @@ x_free_dpy_colors (dpy, screen, cmap, pixels, npixels)
729 necessary and some servers don't allow it. So don't do it. */ 729 necessary and some servers don't allow it. So don't do it. */
730 if (class != StaticColor && class != StaticGray && class != TrueColor) 730 if (class != StaticColor && class != StaticGray && class != TrueColor)
731 { 731 {
732 XFreeColors (dpy, cmap, pixels, npixels, 0);
733#ifdef DEBUG_X_COLORS 732#ifdef DEBUG_X_COLORS
734 unregister_colors (pixels, npixels); 733 unregister_colors (pixels, npixels);
735#endif 734#endif
735 XFreeColors (dpy, cmap, pixels, npixels, 0);
736 } 736 }
737} 737}
738 738