dix: Remove redundant ChangeWindowProperty
Use dixChangeWindowProperty(serverClient, ...) instead. Signed-off-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
		
							parent
							
								
									4affa75a90
								
							
						
					
					
						commit
						eb36924ead
					
				| 
						 | 
					@ -354,14 +354,6 @@ dixChangeWindowProperty(ClientPtr pClient, WindowPtr pWin, Atom property,
 | 
				
			||||||
    return Success;
 | 
					    return Success;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
int
 | 
					 | 
				
			||||||
ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format,
 | 
					 | 
				
			||||||
                     int mode, unsigned long len, void *value, Bool sendevent)
 | 
					 | 
				
			||||||
{
 | 
					 | 
				
			||||||
    return dixChangeWindowProperty(serverClient, pWin, property, type, format,
 | 
					 | 
				
			||||||
                                   mode, len, value, sendevent);
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
int
 | 
					int
 | 
				
			||||||
DeleteProperty(ClientPtr client, WindowPtr pWin, Atom propName)
 | 
					DeleteProperty(ClientPtr client, WindowPtr pWin, Atom propName)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -448,9 +448,10 @@ xf86UpdateHasVTProperty(Bool hasVT)
 | 
				
			||||||
    if (property_name == BAD_RESOURCE)
 | 
					    if (property_name == BAD_RESOURCE)
 | 
				
			||||||
        FatalError("Failed to retrieve \"HAS_VT\" atom\n");
 | 
					        FatalError("Failed to retrieve \"HAS_VT\" atom\n");
 | 
				
			||||||
    for (i = 0; i < xf86NumScreens; i++) {
 | 
					    for (i = 0; i < xf86NumScreens; i++) {
 | 
				
			||||||
        ChangeWindowProperty(xf86ScrnToScreen(xf86Screens[i])->root,
 | 
					        dixChangeWindowProperty(serverClient,
 | 
				
			||||||
                             property_name, XA_INTEGER, 32,
 | 
					                                xf86ScrnToScreen(xf86Screens[i])->root,
 | 
				
			||||||
                             PropModeReplace, 1, &value, TRUE);
 | 
					                                property_name, XA_INTEGER, 32,
 | 
				
			||||||
 | 
					                                PropModeReplace, 1, &value, TRUE);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -67,15 +67,6 @@ extern _X_EXPORT int dixChangeWindowProperty(ClientPtr pClient,
 | 
				
			||||||
                                             void *value,
 | 
					                                             void *value,
 | 
				
			||||||
                                             Bool sendevent);
 | 
					                                             Bool sendevent);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
extern _X_EXPORT int ChangeWindowProperty(WindowPtr pWin,
 | 
					 | 
				
			||||||
                                          Atom property,
 | 
					 | 
				
			||||||
                                          Atom type,
 | 
					 | 
				
			||||||
                                          int format,
 | 
					 | 
				
			||||||
                                          int mode,
 | 
					 | 
				
			||||||
                                          unsigned long len,
 | 
					 | 
				
			||||||
                                          void *value,
 | 
					 | 
				
			||||||
                                          Bool sendevent);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
extern _X_EXPORT int DeleteProperty(ClientPtr /*client */ ,
 | 
					extern _X_EXPORT int DeleteProperty(ClientPtr /*client */ ,
 | 
				
			||||||
                                    WindowPtr /*pWin */ ,
 | 
					                                    WindowPtr /*pWin */ ,
 | 
				
			||||||
                                    Atom /*propName */ );
 | 
					                                    Atom /*propName */ );
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue