Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nx-libs
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dimbor
nx-libs
Commits
f511fba3
Commit
f511fba3
authored
Jan 05, 2018
by
Ulrich Sibiller
Committed by
Mike Gabriel
Feb 05, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reconnect.c: Fix wrong function names in TEST output
parent
87afc32f
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
10 deletions
+10
-10
Reconnect.c
nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
+10
-10
No files found.
nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
View file @
f511fba3
...
@@ -463,7 +463,7 @@ Bool nxagentReconnectSession(void)
...
@@ -463,7 +463,7 @@ Bool nxagentReconnectSession(void)
failedStep
=
DISPLAY_STEP
;
failedStep
=
DISPLAY_STEP
;
#ifdef TEST
#ifdef TEST
fprintf
(
stderr
,
"nxagentReconnect: WARNING! Failed display reconnection.
\n
"
);
fprintf
(
stderr
,
"nxagentReconnect
Session
: WARNING! Failed display reconnection.
\n
"
);
#endif
#endif
goto
nxagentReconnectError
;
goto
nxagentReconnectError
;
...
@@ -491,7 +491,7 @@ Bool nxagentReconnectSession(void)
...
@@ -491,7 +491,7 @@ Bool nxagentReconnectSession(void)
else
else
{
{
#ifdef WARNING
#ifdef WARNING
fprintf
(
stderr
,
"nxagentReconnect: WARNING! Unable to retrieve all the fonts currently in use. "
fprintf
(
stderr
,
"nxagentReconnect
Session
: WARNING! Unable to retrieve all the fonts currently in use. "
"Missing fonts have been replaced.
\n
"
);
"Missing fonts have been replaced.
\n
"
);
#endif
#endif
...
@@ -594,7 +594,7 @@ Bool nxagentReconnectSession(void)
...
@@ -594,7 +594,7 @@ Bool nxagentReconnectSession(void)
#ifdef WARNING
#ifdef WARNING
if
(
nxagentVerbose
==
1
)
if
(
nxagentVerbose
==
1
)
{
{
fprintf
(
stderr
,
"nxagentReconnect: Failed to reset keyboard device.
\n
"
);
fprintf
(
stderr
,
"nxagentReconnect
Session
: Failed to reset keyboard device.
\n
"
);
}
}
#endif
#endif
...
@@ -638,7 +638,7 @@ Bool nxagentReconnectSession(void)
...
@@ -638,7 +638,7 @@ Bool nxagentReconnectSession(void)
if
(
nxagentSessionState
!=
SESSION_GOING_UP
)
if
(
nxagentSessionState
!=
SESSION_GOING_UP
)
{
{
#ifdef WARNING
#ifdef WARNING
fprintf
(
stderr
,
"nxagentReconnect: WARNING! Unexpected session state [%s] while reconnecting.
\n
"
,
fprintf
(
stderr
,
"nxagentReconnect
Session
: WARNING! Unexpected session state [%s] while reconnecting.
\n
"
,
DECODE_SESSION_STATE
(
nxagentSessionState
));
DECODE_SESSION_STATE
(
nxagentSessionState
));
#endif
#endif
...
@@ -666,7 +666,7 @@ Bool nxagentReconnectSession(void)
...
@@ -666,7 +666,7 @@ Bool nxagentReconnectSession(void)
*/
*/
#ifdef TEST
#ifdef TEST
fprintf
(
stderr
,
"nxagentReconnect: Setting the NX flush policy to deferred.
\n
"
);
fprintf
(
stderr
,
"nxagentReconnect
Session
: Setting the NX flush policy to deferred.
\n
"
);
#endif
#endif
NXSetDisplayPolicy
(
nxagentDisplay
,
NXPolicyDeferred
);
NXSetDisplayPolicy
(
nxagentDisplay
,
NXPolicyDeferred
);
...
@@ -680,7 +680,7 @@ nxagentReconnectError:
...
@@ -680,7 +680,7 @@ nxagentReconnectError:
if
(
failedStep
==
DISPLAY_STEP
)
if
(
failedStep
==
DISPLAY_STEP
)
{
{
#ifdef TEST
#ifdef TEST
fprintf
(
stderr
,
"nxagentReconnect: Reconnection failed in display step. Restoring options.
\n
"
);
fprintf
(
stderr
,
"nxagentReconnect
Session
: Reconnection failed in display step. Restoring options.
\n
"
);
#endif
#endif
nxagentRestoreOptions
();
nxagentRestoreOptions
();
...
@@ -695,19 +695,19 @@ nxagentReconnectError:
...
@@ -695,19 +695,19 @@ nxagentReconnectError:
#ifdef WARNING
#ifdef WARNING
if
(
nxagentVerbose
==
1
)
if
(
nxagentVerbose
==
1
)
{
{
fprintf
(
stderr
,
"nxagentReconnect: WARNING! The reconnect error message is not set. Failed step is [%d].
\n
"
,
fprintf
(
stderr
,
"nxagentReconnect
Session
: WARNING! The reconnect error message is not set. Failed step is [%d].
\n
"
,
failedStep
);
failedStep
);
}
}
#endif
#endif
#ifdef TEST
#ifdef TEST
fprintf
(
stderr
,
"nxagentReconnect: Reconnection failed due to a display error.
\n
"
);
fprintf
(
stderr
,
"nxagentReconnect
Session
: Reconnection failed due to a display error.
\n
"
);
#endif
#endif
}
}
else
else
{
{
#ifdef TEST
#ifdef TEST
fprintf
(
stderr
,
"nxagentReconnect: Reconnection failed with reason '%s'
\n
"
,
fprintf
(
stderr
,
"nxagentReconnect
Session
: Reconnection failed with reason '%s'
\n
"
,
nxagentGetReconnectError
());
nxagentGetReconnectError
());
#endif
#endif
}
}
...
@@ -721,7 +721,7 @@ nxagentReconnectError:
...
@@ -721,7 +721,7 @@ nxagentReconnectError:
#ifdef TEST
#ifdef TEST
else
else
{
{
fprintf
(
stderr
,
"nxagentReconnect: Cannot launch the dialog without a valid display.
\n
"
);
fprintf
(
stderr
,
"nxagentReconnect
Session
: Cannot launch the dialog without a valid display.
\n
"
);
}
}
#endif
#endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment