(!1654) Xnest: replace X(Un)InstallColormap() by xcb_(un)install_colormap()
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
		
							parent
							
								
									8489fd6166
								
							
						
					
					
						commit
						b27fd4039e
					
				| 
						 | 
					@ -309,7 +309,7 @@ xnestDirectInstallColormaps(ScreenPtr pScreen)
 | 
				
			||||||
        dixLookupResourceByType((void **) &pCmap, pCmapIDs[i], X11_RESTYPE_COLORMAP,
 | 
					        dixLookupResourceByType((void **) &pCmap, pCmapIDs[i], X11_RESTYPE_COLORMAP,
 | 
				
			||||||
                                serverClient, DixInstallAccess);
 | 
					                                serverClient, DixInstallAccess);
 | 
				
			||||||
        if (pCmap)
 | 
					        if (pCmap)
 | 
				
			||||||
            XInstallColormap(xnestDisplay, xnestColormap(pCmap));
 | 
					            xcb_install_colormap(xnestUpstreamInfo.conn, xnestColormap(pCmap));
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -330,7 +330,7 @@ xnestDirectUninstallColormaps(ScreenPtr pScreen)
 | 
				
			||||||
        dixLookupResourceByType((void **) &pCmap, pCmapIDs[i], X11_RESTYPE_COLORMAP,
 | 
					        dixLookupResourceByType((void **) &pCmap, pCmapIDs[i], X11_RESTYPE_COLORMAP,
 | 
				
			||||||
                                serverClient, DixUninstallAccess);
 | 
					                                serverClient, DixUninstallAccess);
 | 
				
			||||||
        if (pCmap)
 | 
					        if (pCmap)
 | 
				
			||||||
            XUninstallColormap(xnestDisplay, xnestColormap(pCmap));
 | 
					            xcb_uninstall_colormap(xnestUpstreamInfo.conn, xnestColormap(pCmap));
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue