xserver: Branch 'master'

[Jeremy Huddleston]

 hw/xquartz/X11Application.m |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 23f3f0e27dc90b7b3a375f2a5dd094e6f53552b5
Author: Jeremy Huddleston <jeremy at yuffie.local>
Date:   Sun Jan 13 14:00:25 2008 -0800

    XQuartz: Moved SetFrontProcess haco to set_front_process
    So it is done by the other thread...
    (cherry picked from commit 7429379eb1001ee3dc769daa8fe6b3aef1b9cc8a)

diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index f688985..be5511d 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -314,7 +314,11 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
 }
 
 - (void) set_front_process:unused {
-//    [self activateX:YES];
+    /* Hackery needed due to argv[0] hackery */
+    //    [self activateX:YES];
+    ProcessSerialNumber psn = { 0, kCurrentProcess };
+    SetFrontProcess(&psn);
+
     QuartzMessageServerThread(kXDarwinBringAllToFront, 0);
 }
 
@@ -711,10 +715,6 @@ void X11ApplicationSetWindowMenuCheck (int idx) {
 
 void X11ApplicationSetFrontProcess (void) {
     message_kit_thread (@selector (set_front_process:), nil);
-
-    /* Hackery needed due to argv[0] hackery */
-    ProcessSerialNumber psn = { 0, kCurrentProcess };
-    SetFrontProcess(&psn);
 }
 
 void X11ApplicationSetCanQuit (int state) {