aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/NXproperty.c41
1 files changed, 23 insertions, 18 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c
index 4e61f26f0..8c18047fd 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c
@@ -169,19 +169,20 @@ ProcChangeProperty(ClientPtr client)
#ifdef NXAGENT_ARTSD
{
- /* Do not process MCOPGLOBALS property changes,
- they are already set reflecting the server side settings.
- Just return success.
- */
- if (stuff->property == mcop_local_atom)
- return client->noClientException;
+ /*
+ * Do not process MCOPGLOBALS property changes,
+ * they are already set reflecting the server side settings.
+ * Just return success.
+ */
+ if (stuff->property == mcop_local_atom)
+ return client->noClientException;
}
#endif
#ifdef NXAGENT_SERVER
/* prevent clients from changing the NX_AGENT_VERSION property */
if (stuff->property == MakeAtom("NX_AGENT_VERSION", strlen("NX_AGENT_VERSION"), True))
- return client->noClientException;
+ return client->noClientException;
#endif
err = ChangeWindowProperty(pWin, stuff->property, stuff->type, (int)format,
@@ -189,23 +190,27 @@ ProcChangeProperty(ClientPtr client)
if (err != Success)
return err;
else
+#ifdef NXAGENT_SERVER
{
- if (nxagentOption(Rootless))
- {
- nxagentExportProperty(pWin, stuff->property, stuff->type, (int) format,
- (int) mode, len, (void *) &stuff[1]);
- }
+ if (nxagentOption(Rootless))
+ {
+ nxagentExportProperty(pWin, stuff->property, stuff->type, (int) format,
+ (int) mode, len, (void *) &stuff[1]);
+ }
- nxagentGuessClientHint(client, stuff->property, (char *) &stuff[1]);
+ nxagentGuessClientHint(client, stuff->property, (char *) &stuff[1]);
- nxagentGuessShadowHint(client, stuff->property);
+ nxagentGuessShadowHint(client, stuff->property);
- #ifdef NX_DEBUG_INPUT
- nxagentGuessDumpInputInfo(client, stuff->property, (char *) &stuff[1]);
- #endif
+ #ifdef NX_DEBUG_INPUT
+ nxagentGuessDumpInputInfo(client, stuff->property, (char *) &stuff[1]);
+ #endif
- return client->noClientException;
+ return client->noClientException;
}
+#else
+ return client->noClientException;
+#endif
}
/*****************