Commit b2af0c68 authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel

Clipboard: make nxagentInitClipboard return a Boolean

parent fa7fb749
......@@ -2062,7 +2062,11 @@ WindowPtr nxagentGetClipboardWindow(Atom property)
}
}
int nxagentInitClipboard(WindowPtr pWin)
/*
* Initialize the clipboard
* Returns: True for success else False
*/
Bool nxagentInitClipboard(WindowPtr pWin)
{
Window iWindow = nxagentWindow(pWin);
......@@ -2111,7 +2115,7 @@ int nxagentInitClipboard(WindowPtr pWin)
fprintf(stderr, "%s: PANIC! Could not create NX_CUT_BUFFER_SERVER atom\n", __func__);
#endif
return -1;
return False;
}
#ifdef TEST
......@@ -2208,7 +2212,7 @@ int nxagentInitClipboard(WindowPtr pWin)
"Could not create NX_CUT_BUFFER_CLIENT atom.\n", __func__);
#endif
return -1;
return False;
}
}
......@@ -2225,5 +2229,5 @@ int nxagentInitClipboard(WindowPtr pWin)
}
#endif
return 1;
return True;
}
......@@ -47,7 +47,7 @@ extern XFixesAgentInfoRec nxagentXFixesInfo;
* data with the X server.
*/
extern int nxagentInitClipboard(WindowPtr pWindow);
extern Bool nxagentInitClipboard(WindowPtr pWindow);
/*
* Called whenever a client or a window is
......
......@@ -2802,7 +2802,7 @@ Bool nxagentReconnectAllWindows(void *p0)
fprintf(stderr, "nxagentReconnectAllWindows: All windows reconfigured.\n");
#endif
if (nxagentInitClipboard(screenInfo.screens[0]->root) == -1)
if (!nxagentInitClipboard(screenInfo.screens[0]->root))
{
#ifdef WARNING
fprintf(stderr, "nxagentReconnectAllWindows: WARNING! Couldn't initialize the clipboard.\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment