xserver: Branch 'server-1.11-branch' - 2 commits

[Jeremy Huddleston]

 hw/xquartz/X11Application.m    |    3 +++
 hw/xquartz/bundle/mk_bundke.sh |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 42234f3cdb3f0619f3b3dd9e79d7e092b20bd7d7
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Fri Feb 17 13:44:12 2012 -0800

    XQuartz: Short-circuit activateX:
    
    This also avoids a deadlock when calling activateX: before the server
    thread has initialized
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
    (cherry picked from commit cb6a32da27f09261c4d561c19d1877c750d98cc3)

diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index 5b38eae..048e787 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -191,6 +191,9 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
 }
 
 - (void) activateX:(OSX_BOOL)state {
+    if (_x_active == state)
+        return;
+
     DEBUG_LOG("state=%d, _x_active=%d, \n", state, _x_active);
     if (state) {
         if(bgMouseLocationUpdated) {
commit 53069ffd8610f2f5c89cbb87ebdf44272a5b6355
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Fri Feb 17 13:54:57 2012 -0800

    XQuartz: Actually install the new locales
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
    (cherry picked from commit 1562c4a1ca748d2c4a8c69d57ba09ff7ca9cc453)

diff --git a/hw/xquartz/bundle/mk_bundke.sh b/hw/xquartz/bundle/mk_bundke.sh
index 58d5f6a..288c6a9 100755
--- a/hw/xquartz/bundle/mk_bundke.sh
+++ b/hw/xquartz/bundle/mk_bundke.sh
@@ -6,7 +6,7 @@ SRCDIR=$1
 BUILDDIR=$2
 BUNDLE_ROOT=$3
 
-localities="Dutch English French German Italian Japanese Spanish da fi ko no pl pt pt_PT ru sv zh_CN zh_TW"
+localities="Dutch English French German Italian Japanese Spanish ar ca cs da el fi he hr hu ko no pl pt pt_PT ro ru sk sv th tr uk zh_CN zh_TW"
 for lang in ${localities} ; do
     [ -d ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj ] && rm -rf ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj
     mkdir -p ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj/main.nib