3 files changed, 3 insertions, 17 deletions
diff --git a/hw/xwin/winclipboard/thread.c b/hw/xwin/winclipboard/thread.c
index 36a1b4e45..a9565fe22 100644
--- a/hw/xwin/winclipboard/thread.c
+++ b/hw/xwin/winclipboard/thread.c
@@ -55,12 +55,6 @@
 #define WIN_CLIPBOARD_WINDOW_TITLE		"xwinclip"
 
 /*
- * References to external symbols
- */
-
-extern Bool g_fUnicodeClipboard;
-
-/*
  * Global variables
  */
 
@@ -69,7 +63,6 @@ static jmp_buf g_jmpEntry;
 static XIOErrorHandler g_winClipboardOldIOErrorHandler;
 static pthread_t g_winClipboardProcThread;
 
-Bool g_fUseUnicode = FALSE;
 int xfixes_event_base;
 int xfixes_error_base;
 
@@ -93,7 +86,7 @@ static int
  */
 
 Bool
-winClipboardProc(char *szDisplay)
+winClipboardProc(Bool fUseUnicode, char *szDisplay)
 {
     Atom atomClipboard;
     int iReturn;
@@ -110,18 +103,11 @@ winClipboardProc(char *szDisplay)
     Display *pDisplay = NULL;
     Window iWindow = None;
     int iRetries;
-    Bool fUseUnicode;
     int iSelectError;
     Bool fShutdown = FALSE;
 
     winDebug("winClipboardProc - Hello\n");
 
-    /* Do we use Unicode clipboard? */
-    fUseUnicode = g_fUnicodeClipboard;
-
-    /* Save the Unicode support flag in a global */
-    g_fUseUnicode = fUseUnicode;
-
     /* Allow multiple threads to access Xlib */
     if (XInitThreads() == 0) {
         ErrorF("winClipboardProc - XInitThreads failed.\n");
diff --git a/hw/xwin/winclipboard/winclipboard.h b/hw/xwin/winclipboard/winclipboard.h
index 7aaa341d4..52481301b 100644
--- a/hw/xwin/winclipboard/winclipboard.h
+++ b/hw/xwin/winclipboard/winclipboard.h
@@ -27,7 +27,7 @@
 #ifndef WINCLIPBOARD_H
 #define WINCLIPBOARD_H
 
-Bool winClipboardProc(char *szDisplay);
+Bool winClipboardProc(Bool fUseUnicode, char *szDisplay);
 
 void winFixClipboardChain(void);
 
diff --git a/hw/xwin/winclipboardinit.c b/hw/xwin/winclipboardinit.c
index 3324661df..8aef8fe02 100644
--- a/hw/xwin/winclipboardinit.c
+++ b/hw/xwin/winclipboardinit.c
@@ -82,7 +82,7 @@ winClipboardThreadProc(void *arg)
       /* Flag that clipboard client has been launched */
       g_fClipboardStarted = TRUE;
 
-      fShutdown = winClipboardProc(szDisplay);
+      fShutdown = winClipboardProc(g_fUnicodeClipboard, szDisplay);
 
       /* Flag that clipboard client has stopped */
       g_fClipboardStarted = FALSE;