[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[mjs]

The following commit has been merged in the debian/unstable branch:
commit a310f291a57c32f2490e1f76ac4f2df7af024c78
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 10 03:21:48 2003 +0000

            - fixed crash I just added.
    
            * kwq/KWQWidget.mm:
            (QWidget::setCursor): Move BLOCK_NS_EXCEPTIONS macros so
    	you don't `break' out of the blocking code.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5163 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 27c4f01..5540d23 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,13 @@
 2003-10-09  Maciej Stachowiak  <mjs at apple.com>
 
+        - fixed crash I just added.
+
+        * kwq/KWQWidget.mm:
+        (QWidget::setCursor): Move BLOCK_NS_EXCEPTIONS macros so
+	you don't `break' out of the blocking code.
+
+2003-10-09  Maciej Stachowiak  <mjs at apple.com>
+
         Reviewed by Ken.
 
 	More Cocoa exception blocking work.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 27c4f01..5540d23 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,13 @@
 2003-10-09  Maciej Stachowiak  <mjs at apple.com>
 
+        - fixed crash I just added.
+
+        * kwq/KWQWidget.mm:
+        (QWidget::setCursor): Move BLOCK_NS_EXCEPTIONS macros so
+	you don't `break' out of the blocking code.
+
+2003-10-09  Maciej Stachowiak  <mjs at apple.com>
+
         Reviewed by Ken.
 
 	More Cocoa exception blocking work.
diff --git a/WebCore/kwq/KWQWidget.mm b/WebCore/kwq/KWQWidget.mm
index 4ff2132..b22d935 100644
--- a/WebCore/kwq/KWQWidget.mm
+++ b/WebCore/kwq/KWQWidget.mm
@@ -352,15 +352,15 @@ bool QWidget::isVisible() const
 void QWidget::setCursor(const QCursor &cur)
 {
     volatile id view = data->view;
+    KWQ_BLOCK_NS_EXCEPTIONS;
     while (view) {
-	KWQ_BLOCK_NS_EXCEPTIONS;
         if ([view respondsToSelector:@selector(setDocumentCursor:)]) {
             [view setDocumentCursor:cur.handle()];
             break;
         }
         view = [view superview];
-	KWQ_UNBLOCK_NS_EXCEPTIONS;
     }
+    KWQ_UNBLOCK_NS_EXCEPTIONS;
 }
 
 QCursor QWidget::cursor()

-- 
WebKit Debian packaging