From a434613354ab42f78fad9e6f560eae0b8dc1308f Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Tue, 26 Apr 2016 05:59:56 +0200
Subject: hw/nxagent/NXproperty.c: Shrink file, drop duplicate code that can
 identically be found in dix/property.c.

---
 nx-X11/programs/Xserver/dix/Imakefile  | 4 ++--
 nx-X11/programs/Xserver/dix/property.c | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'nx-X11/programs/Xserver/dix')

diff --git a/nx-X11/programs/Xserver/dix/Imakefile b/nx-X11/programs/Xserver/dix/Imakefile
index 3e71898b6..48f0eeb1b 100644
--- a/nx-X11/programs/Xserver/dix/Imakefile
+++ b/nx-X11/programs/Xserver/dix/Imakefile
@@ -18,6 +18,7 @@ NXAGENT_SKIP_SRCS =                  \
                     events.c         \
                     extension.c      \
                     glyphcurs.c      \
+                    property.c       \
                     resource.c       \
                     window.c         \
                     $(NULL)
@@ -25,6 +26,7 @@ NXAGENT_SKIP_OBJS =                  \
                     events.o         \
                     extension.o      \
                     glyphcurs.o      \
+                    property.o       \
                     resource.o       \
                     window.o         \
                     $(NULL)
@@ -42,7 +44,6 @@ SRCS =                          \
        globals.c                \
        grabs.c                  \
        main.c                   \
-       property.c               \
        region.c                 \
        swaprep.c                \
        swapreq.c                \
@@ -66,7 +67,6 @@ OBJS =                          \
        globals.o                \
        grabs.o                  \
        main.o                   \
-       property.o               \
        region.o                 \
        swaprep.o                \
        swapreq.o                \
diff --git a/nx-X11/programs/Xserver/dix/property.c b/nx-X11/programs/Xserver/dix/property.c
index 6041595ce..b3b650dda 100644
--- a/nx-X11/programs/Xserver/dix/property.c
+++ b/nx-X11/programs/Xserver/dix/property.c
@@ -188,6 +188,7 @@ found:
     return Success;
 }
 
+#ifndef NXAGENT_SERVER
 int 
 ProcChangeProperty(ClientPtr client)
 {	      
@@ -368,6 +369,7 @@ ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format,
     }
     return(Success);
 }
+#endif /* NXAGENT_SERVER */
 
 int
 DeleteProperty(WindowPtr pWin, Atom propName)
@@ -446,6 +448,8 @@ NullPropertyReply(
     return(client->noClientException);
 }
 
+#ifndef NXAGENT_SERVER
+
 /*****************
  * GetProperty
  *    If type Any is specified, returns the property from the specified
@@ -600,6 +604,7 @@ ProcGetProperty(ClientPtr client)
     }
     return(client->noClientException);
 }
+#endif /* NXAGENT_SERVER */
 
 int
 ProcListProperties(ClientPtr client)
-- 
cgit v1.2.3