From 578938f1cdd5a06dd6fa28167d575ec980322a5d Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 16 Nov 2009 13:46:01 +0000 Subject: Update to git master branch of xserver. --- xorg-server/hw/xwin/winclipboardthread.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'xorg-server/hw/xwin/winclipboardthread.c') diff --git a/xorg-server/hw/xwin/winclipboardthread.c b/xorg-server/hw/xwin/winclipboardthread.c index 8eb825fa8..e5b2dc1e0 100644 --- a/xorg-server/hw/xwin/winclipboardthread.c +++ b/xorg-server/hw/xwin/winclipboardthread.c @@ -38,27 +38,15 @@ #ifdef __CYGWIN__ #include #endif -#include "X11/Xauth.h" #include "misc.h" -/* - * Constants - */ - -#define AUTH_NAME "MIT-MAGIC-COOKIE-1" - - /* * References to external symbols */ extern Bool g_fUnicodeClipboard; extern unsigned long serverGeneration; -#if defined(XCSECURITY) -extern unsigned int g_uiAuthDataLen; -extern char *g_pAuthData; -#endif extern Bool g_fClipboardStarted; extern HWND g_hwndClipboard; extern void *g_pClipboardDisplay; @@ -154,13 +142,8 @@ winClipboardProc (void *pvNotUsed) pthread_exit (NULL); } -#if defined(XCSECURITY) /* Use our generated cookie for authentication */ - XSetAuthorization (AUTH_NAME, - strlen (AUTH_NAME), - g_pAuthData, - g_uiAuthDataLen); -#endif + winSetAuthorization(); /* Set error handler */ XSetErrorHandler (winClipboardErrorHandler); -- cgit v1.2.3