From 67ee22c6d9f7e86099f1e2e7585dc9717c074614 Mon Sep 17 00:00:00 2001
From: Francisco Ryan Tolmasky I <francisco@280north.com>
Date: Tue, 18 Nov 2008 20:12:31 -0800
Subject: [PATCH 1/2] Fix for nib2cib with new timeout system.

Reviewed by me.
---
 Tools/Utilities/bridge.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Tools/Utilities/bridge.js b/Tools/Utilities/bridge.js
index f38f92ce8..176a8a21c 100644
--- a/Tools/Utilities/bridge.js
+++ b/Tools/Utilities/bridge.js
@@ -54,16 +54,20 @@ window.prompt  = function(obj)
 // This implementation is single-threaded (like browsers) but requires a call to serviceTimeouts()
 // Also includes beginning of a multithreaded implementation (commented out)
 
-window.setTimeout = function(callback, delay)
+window.setNativeTimeout = function(callback, delay)
 {
     return _scheduleTimeout(callback, delay, false);
 }
 
-window.setInterval = function(callback, delay)
+window.setTimeout = window.setNativeTimeout;
+
+window.setNativeInterval = function(callback, delay)
 {
     return _scheduleTimeout(callback, delay, true);
 }
 
+window.setInterval = window.setInterval;
+
 window.clearTimeout = function(id)
 {
     if (_timeouts[id])
@@ -549,7 +553,7 @@ XMLHttpRequest.prototype.send = function(body)
     if (this.onreadystatechange)
     {
          if (this.async)
-             setTimeout(this.onreadystatechange, 0);
+             setNativeTimeout(this.onreadystatechange, 0);
          else
              this.onreadystatechange();
     }

From 30f905a25300fd05596c0747e55b7807f7016240 Mon Sep 17 00:00:00 2001
From: Francisco Ryan Tolmasky I <francisco@280north.com>
Date: Tue, 18 Nov 2008 20:17:24 -0800
Subject: [PATCH 2/2] Changed imports to @imports.

Reviewed by me.
---
 AppKit/CPAlert.j | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/AppKit/CPAlert.j b/AppKit/CPAlert.j
index 4072adbb8..4bdd9ba1b 100644
--- a/AppKit/CPAlert.j
+++ b/AppKit/CPAlert.j
@@ -23,17 +23,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-import <Foundation/CPObject.j>
-import <Foundation/CPString.j>
+@import <Foundation/CPObject.j>
+@import <Foundation/CPString.j>
 
-import <AppKit/CPApplication.j>
-import <AppKit/CPButton.j>
-import <AppKit/CPColor.j>
-import <AppKit/CPFont.j>
-import <AppKit/CPImage.j>
-import <AppKit/CPImageView.j>
-import <AppKit/CPPanel.j>
-import <AppKit/CPTextField.j>
+@import <AppKit/CPApplication.j>
+@import <AppKit/CPButton.j>
+@import <AppKit/CPColor.j>
+@import <AppKit/CPFont.j>
+@import <AppKit/CPImage.j>
+@import <AppKit/CPImageView.j>
+@import <AppKit/CPPanel.j>
+@import <AppKit/CPTextField.j>
 
 /*
     @global
@@ -240,4 +240,4 @@ var CPAlertWarningImage,
     [_alertPanel close];
 }
 
-@end
\ No newline at end of file
+@end