[X2Go-Commits] [nx-libs] 01/01: Add tirpc libs, as printed out by pkg-config.
git-admin at x2go.org
git-admin at x2go.org
Tue Mar 6 02:12:41 CET 2018
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch 3.6.x-rpm-debug
in repository nx-libs.
commit 52e790f04a203e46637a21de812a2cb9ab835272
Author: Mihai Moldovan <ionic at ionic.de>
Date: Tue Mar 6 02:12:37 2018 +0100
Add tirpc libs, as printed out by pkg-config.
---
nx-X11/programs/Xserver/Imakefile | 3 ++-
nx-X11/programs/Xserver/Xext/saver.c | 7 ++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile
index 5d86a53..3a883fc 100644
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -295,10 +295,11 @@ PIXMANLIB = `pkg-config --libs pixman-1`
ZLIB = $$(pkg-config --exists 'zlib' >/dev/null 2>&1 && pkg-config --libs 'zlib' || echo "-lz")
PNGLIB = `pkg-config --libs libpng`
JPEGLIB = -ljpeg
+TIRPCLIB = $$(pkg-config --exists 'tirpc' >/dev/null 2>&1 && pkg-config --libs 'tirpc')
NXAGENT = hw/nxagent/LibraryTargetName(nxagent)
NXCOMPEXT = hw/nxagent/compext/LibraryTargetName(compext)
-NXAGENTLIBS = PreFbLibs $(NXAGENT) FbPostFbLibs $(NXCOMPEXT) $(NXAGENT) $(MI)
+NXAGENTLIBS = PreFbLibs $(NXAGENT) FbPostFbLibs $(NXCOMPEXT) $(NXAGENT) $(MI) $(TIRPCLIB)
NXAGENTSYSLIBS = $(LDPRELIBS) $(XLIB) $(SYSLIBS) $(XPMLIB) $(XMLLIB)
NXCOMPEXTSYSLIBS = $(PIXMANLIB) $(ZLIB) $(PNGLIB) $(JPEGLIB)
#if HasParallelMake
diff --git a/nx-X11/programs/Xserver/Xext/saver.c b/nx-X11/programs/Xserver/Xext/saver.c
index 0b79a00..07d3ce3 100644
--- a/nx-X11/programs/Xserver/Xext/saver.c
+++ b/nx-X11/programs/Xserver/Xext/saver.c
@@ -509,6 +509,7 @@ SendScreenSaverNotify (pScreen, state, forced)
ScreenSaverEventPtr pEv;
unsigned long mask;
xScreenSaverNotifyEvent ev;
+ ClientPtr client;
int kind;
UpdateCurrentTimeIf ();
@@ -527,16 +528,20 @@ SendScreenSaverNotify (pScreen, state, forced)
kind = ScreenSaverInternal;
for (pEv = pPriv->events; pEv; pEv = pEv->next)
{
+ client = pEv->client;
+ if (client->clientGone)
+ continue;
if (!(pEv->mask & mask))
continue;
ev.type = ScreenSaverNotify + ScreenSaverEventBase;
ev.state = state;
+ ev.sequenceNumber = client->sequence;
ev.timestamp = currentTime.milliseconds;
ev.root = pScreen->root->drawable.id;
ev.window = savedScreenInfo[pScreen->myNum].wid;
ev.kind = kind;
ev.forced = forced;
- WriteEventsToClient (pEv->client, 1, (xEvent *) &ev);
+ WriteEventsToClient (client, 1, (xEvent *) &ev);
}
}
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
More information about the x2go-commits
mailing list