xserver: Branch 'master'

[Peter Hutterer]

 Xi/xiproperty.c    |    2 +-
 include/exevents.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fd2d40b7ec5d685dac55453eb1f2da672dc83126
Author: Peter Hutterer <peter.hutterer at redhat.com>
Date:   Wed Dec 3 11:31:48 2008 +1000

    Xi: change XIUnRegisterPropertyHandler to XIUnregisterPropertyHandler
    
    CamelCase can be taken too far, and AFAICT there's no consumers of that
    function yet anyway.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at redhat.com>

diff --git a/Xi/xiproperty.c b/Xi/xiproperty.c
index b057428..e79a2ed 100644
--- a/Xi/xiproperty.c
+++ b/Xi/xiproperty.c
@@ -121,7 +121,7 @@ XIRegisterPropertyHandler(DeviceIntPtr         dev,
 }
 
 void
-XIUnRegisterPropertyHandler(DeviceIntPtr dev, long id)
+XIUnregisterPropertyHandler(DeviceIntPtr dev, long id)
 {
     XIPropertyHandlerPtr curr, prev = NULL;
 
diff --git a/include/exevents.h b/include/exevents.h
index be65210..2a7ec97 100644
--- a/include/exevents.h
+++ b/include/exevents.h
@@ -240,7 +240,7 @@ extern _X_EXPORT long XIRegisterPropertyHandler(
                                Atom property)
 );
 
-extern _X_EXPORT void XIUnRegisterPropertyHandler(
+extern _X_EXPORT void XIUnregisterPropertyHandler(
         DeviceIntPtr          dev,
         long                  id
 );