From 6ae091cc27f90bd431e4d9564c760fa209f8efb8 Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Thu, 3 Aug 2017 09:41:21 +0200 Subject: debian/patches: refresh all patches. Removes some fuzziness and adds the -p diff option to show the C function name in hunk headers. --- .../0210_nxagent_save_session_state.full.patch | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'debian/patches/0210_nxagent_save_session_state.full.patch') diff --git a/debian/patches/0210_nxagent_save_session_state.full.patch b/debian/patches/0210_nxagent_save_session_state.full.patch index 223d0bc7a..222746300 100644 --- a/debian/patches/0210_nxagent_save_session_state.full.patch +++ b/debian/patches/0210_nxagent_save_session_state.full.patch @@ -3,7 +3,7 @@ Author: Oleksandr Shneyder --- a/nx-X11/programs/Xserver/hw/nxagent/Args.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c -@@ -60,6 +60,7 @@ +@@ -60,6 +60,7 @@ is" without express or implied warranty. #endif #include "Handlers.h" #include "Error.h" @@ -11,7 +11,7 @@ Author: Oleksandr Shneyder /* * NX includes and definitions. -@@ -1090,6 +1091,11 @@ +@@ -1090,6 +1091,11 @@ static void nxagentParseOptions(char *na return; } @@ -23,7 +23,7 @@ Author: Oleksandr Shneyder else if (!strcmp(name, "fullscreen")) { if (nxagentReconnectTrap == True) -@@ -1369,6 +1375,11 @@ +@@ -1369,6 +1375,11 @@ void nxagentProcessOptionsFile() validateString(nxagentOptionFile)); #endif @@ -37,7 +37,7 @@ Author: Oleksandr Shneyder return; --- a/nx-X11/programs/Xserver/hw/nxagent/Init.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c -@@ -63,7 +63,7 @@ +@@ -63,7 +63,7 @@ is" without express or implied warranty. #include "NX.h" #include "NXlib.h" @@ -46,7 +46,7 @@ Author: Oleksandr Shneyder /* * Set here the required log level. */ -@@ -233,6 +233,7 @@ +@@ -233,6 +233,7 @@ void InitOutput(ScreenInfo *screenInfo, fprintf(stderr, "Info: Agent running with pid '%d'.\n", getpid()); fprintf(stderr, "Session: Starting session at '%s'.\n", GetTimeAsString()); @@ -56,7 +56,7 @@ Author: Oleksandr Shneyder /* --- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c -@@ -118,6 +118,33 @@ +@@ -118,6 +118,33 @@ void *reconnectLossyLevel[STEP_NONE]; static enum RECONNECTION_STEP failedStep; @@ -90,7 +90,7 @@ Author: Oleksandr Shneyder int nxagentHandleConnectionStates(void) { #ifdef TEST -@@ -211,6 +238,7 @@ +@@ -211,6 +238,7 @@ TODO: This should be reset only when fprintf(stderr, "Session: Display failure detected at '%s'.\n", GetTimeAsString()); fprintf(stderr, "Session: Suspending session at '%s'.\n", GetTimeAsString()); @@ -98,7 +98,7 @@ Author: Oleksandr Shneyder } nxagentDisconnectSession(); -@@ -265,6 +293,7 @@ +@@ -265,6 +293,7 @@ TODO: This should be reset only when fprintf(stderr, "Session: Session suspended at '%s'.\n", GetTimeAsString()); #endif } @@ -106,7 +106,7 @@ Author: Oleksandr Shneyder nxagentResetDisplayHandlers(); -@@ -622,6 +651,7 @@ +@@ -622,6 +651,7 @@ Bool nxagentReconnectSession(void) #else fprintf(stderr, "Session: Session resumed at '%s'.\n", GetTimeAsString()); #endif @@ -114,7 +114,7 @@ Author: Oleksandr Shneyder nxagentRemoveSplashWindow(NULL); -@@ -785,12 +815,14 @@ +@@ -785,12 +815,14 @@ void nxagentHandleConnectionChanges() if (nxagentSessionState == SESSION_GOING_DOWN) { fprintf(stderr, "Session: Suspending session at '%s'.\n", GetTimeAsString()); @@ -129,7 +129,7 @@ Author: Oleksandr Shneyder if (nxagentReconnectSession()) { -@@ -803,6 +835,7 @@ +@@ -803,6 +835,7 @@ void nxagentHandleConnectionChanges() fprintf(stderr, "Session: Display failure detected at '%s'.\n", GetTimeAsString()); fprintf(stderr, "Session: Suspending session at '%s'.\n", GetTimeAsString()); @@ -139,7 +139,7 @@ Author: Oleksandr Shneyder } --- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.h -@@ -34,6 +34,8 @@ +@@ -34,6 +34,8 @@ void nxagentInitReconnector(void); Bool nxagentReconnectSession(void); int nxagentHandleConnectionStates(void); void nxagentHandleConnectionChanges(void); @@ -150,7 +150,7 @@ Author: Oleksandr Shneyder { --- a/nx-X11/programs/Xserver/hw/nxagent/X/NXdispatch.c +++ b/nx-X11/programs/Xserver/hw/nxagent/X/NXdispatch.c -@@ -609,6 +609,7 @@ +@@ -609,6 +609,7 @@ Reply Total Cached Bits In Bits Out #endif nxagentSessionState = SESSION_UP; @@ -158,7 +158,7 @@ Author: Oleksandr Shneyder } #ifdef BLOCKS -@@ -823,6 +824,7 @@ +@@ -823,6 +824,7 @@ Reply Total Cached Bits In Bits Out */ fprintf(stderr, "Session: Terminating session at '%s'.\n", GetTimeAsString()); @@ -166,7 +166,7 @@ Author: Oleksandr Shneyder nxagentWaitDisplay(); -@@ -833,6 +835,7 @@ +@@ -833,6 +835,7 @@ Reply Total Cached Bits In Bits Out { NXShadowDestroy(); } -- cgit v1.2.3