From 2ff5448bcca8cba4b62026d5493cb08aaf2838d8 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Wed, 18 Jul 2012 08:33:31 +0200
Subject: fontconfig mesa xserver git update 18 Jul 2012

---
 xorg-server/hw/xwin/winclipboardxevents.c | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'xorg-server/hw/xwin/winclipboardxevents.c')

diff --git a/xorg-server/hw/xwin/winclipboardxevents.c b/xorg-server/hw/xwin/winclipboardxevents.c
index 59b1f0715..ce533c59f 100644
--- a/xorg-server/hw/xwin/winclipboardxevents.c
+++ b/xorg-server/hw/xwin/winclipboardxevents.c
@@ -36,12 +36,6 @@
 #include "winclipboard.h"
 #include "misc.h"
 
-/*
- * References to external symbols
- */
-
-extern Bool g_fUnicodeSupport;
-
 /*
  * Process any pending X events
  */
@@ -228,10 +222,6 @@ winClipboardFlushXEvents(HWND hwnd,
             else
                 xiccesStyle = XStringStyle;
 
-            /*
-             * FIXME: Can't pass CF_UNICODETEXT on Windows 95/98/Me
-             */
-
             /* Get a pointer to the clipboard text, in desired format */
             if (fUseUnicode) {
                 /* Retrieve clipboard data */
@@ -687,10 +677,10 @@ winClipboardFlushXEvents(HWND hwnd,
             free(pwszUnicodeStr);
             if (hGlobal && pszGlobalData)
                 GlobalUnlock(hGlobal);
-            if (fSetClipboardData && g_fUnicodeSupport)
+            if (fSetClipboardData) {
                 SetClipboardData(CF_UNICODETEXT, NULL);
-            if (fSetClipboardData)
                 SetClipboardData(CF_TEXT, NULL);
+            }
             return WIN_XEVENTS_NOTIFY;
 
         case SelectionClear:
-- 
cgit v1.2.3