xserver: Branch 'xorg-server-1.4-apple'

[Jeremy Huddleston]

 hw/xquartz/X11Controller.m |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 7713d7ab66e74b212a6c0d634a3ad82373e178db
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Fri Sep 19 13:15:07 2008 -0700

    XQuartz: "Disable" the text when syncing is disabled.

diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
index db7ca2d..bbc5fd1 100644
--- a/hw/xquartz/X11Controller.m
+++ b/hw/xquartz/X11Controller.m
@@ -641,9 +641,9 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn row:(int)row
     [sync_clipboard_to_pasteboard setEnabled:pbproxy_active];
     [sync_primary_immediately setEnabled:pbproxy_active];
 
-    // This doesn't seem to work.
-    [sync_text1 setEnabled:pbproxy_active];
-    [sync_text2 setEnabled:pbproxy_active];
+    // setEnabled doesn't do this...
+    [sync_text1 setTextColor:pbproxy_active ? [NSColor controlTextColor] : [NSColor disabledControlTextColor]];
+    [sync_text2 setTextColor:pbproxy_active ? [NSColor controlTextColor] : [NSColor disabledControlTextColor]];
     
     /* after adding prefs here, also add to [X11Application read_defaults]
      and prefs_show */
@@ -696,9 +696,9 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn row:(int)row
     [sync_clipboard_to_pasteboard setEnabled:pbproxy_active];
     [sync_primary_immediately setEnabled:pbproxy_active];
 
-    // This doesn't seem to work.
-    [sync_text1 setEnabled:pbproxy_active];
-    [sync_text2 setEnabled:pbproxy_active];
+    // setEnabled doesn't do this...
+    [sync_text1 setTextColor:pbproxy_active ? [NSColor controlTextColor] : [NSColor disabledControlTextColor]];
+    [sync_text2 setTextColor:pbproxy_active ? [NSColor controlTextColor] : [NSColor disabledControlTextColor]];
 
     [enable_fullscreen setIntValue:!quartzEnableRootless];
     // TODO: Add fullscreen support