diff options
| author | marha <marha@users.sourceforge.net> | 2010-02-28 19:34:41 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-02-28 19:34:41 +0000 |
| commit | fedd99993946dd8fc22b60e3611e447f3b8092ca (patch) | |
| tree | f1486f18c003876c504227d5c2fc602371524aba /xorg-server/hw/xwin/winmultiwindowwm.c | |
| parent | 94399647b31b4d87cc009954dd213475993a9011 (diff) | |
| parent | 1ad46cbf3a9963f3d6d8c687480a80d359ec15f8 (diff) | |
| download | vcxsrv-fedd99993946dd8fc22b60e3611e447f3b8092ca.tar.gz vcxsrv-fedd99993946dd8fc22b60e3611e447f3b8092ca.tar.bz2 vcxsrv-fedd99993946dd8fc22b60e3611e447f3b8092ca.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xwin/winmultiwindowwm.c')
| -rw-r--r-- | xorg-server/hw/xwin/winmultiwindowwm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xorg-server/hw/xwin/winmultiwindowwm.c b/xorg-server/hw/xwin/winmultiwindowwm.c index 781abf32c..ea1ff517d 100644 --- a/xorg-server/hw/xwin/winmultiwindowwm.c +++ b/xorg-server/hw/xwin/winmultiwindowwm.c @@ -853,7 +853,7 @@ winMultiWindowXMsgProc (void *pArg) if (pProcArg->pDisplay == NULL)
{
winDebug ("winMultiWindowXMsgProc - Could not open display, try: %d, "
- "sleeping: %d\n\f",
+ "sleeping: %d\n",
iRetries + 1, WIN_CONNECT_DELAY);
++iRetries;
sleep (WIN_CONNECT_DELAY);
@@ -1223,7 +1223,7 @@ winInitMultiWindowWM (WMInfoPtr pWMInfo, WMProcArgPtr pProcArg) if (pWMInfo->pDisplay == NULL)
{
ErrorF ("winInitMultiWindowWM - Could not open display, try: %d, "
- "sleeping: %d\n\f",
+ "sleeping: %d\n",
iRetries + 1, WIN_CONNECT_DELAY);
++iRetries;
sleep (WIN_CONNECT_DELAY);
@@ -1335,7 +1335,7 @@ winMultiWindowWMErrorHandler (Display *pDisplay, XErrorEvent *pErr) static int
winMultiWindowWMIOErrorHandler (Display *pDisplay)
{
- ErrorF ("\nwinMultiWindowWMIOErrorHandler!\n\n");
+ ErrorF ("winMultiWindowWMIOErrorHandler!\n\n");
if (g_shutdown)
pthread_exit(NULL);
@@ -1384,7 +1384,7 @@ winMultiWindowXMsgProcErrorHandler (Display *pDisplay, XErrorEvent *pErr) static int
winMultiWindowXMsgProcIOErrorHandler (Display *pDisplay)
{
- ErrorF ("\nwinMultiWindowXMsgProcIOErrorHandler!\n\n");
+ ErrorF ("winMultiWindowXMsgProcIOErrorHandler!\n\n");
/* Restart at the main entry point */
longjmp (g_jmpXMsgProcEntry, WIN_JMP_ERROR_IO);
|