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

[vicki]

The following commit has been merged in the debian/unstable branch:
commit 85ea0a3d32349fe57ea423aa803522a7b0a3f312
Author: vicki <vicki at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 23 19:04:13 2004 +0000

            Reviewed by Vicki.
    
            - fixed deployment build
    
            * kwq/KWQLineEdit.mm: (QLineEdit::QLineEdit): Move view initializer inside
            block with exceptions blocked.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6245 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 31aa356..ff037c9 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2004-03-23  Darin Adler  <darin at apple.com>
+
+        Reviewed by Vicki.
+
+        - fixed deployment build
+
+        * kwq/KWQLineEdit.mm: (QLineEdit::QLineEdit): Move view initializer inside
+        block with exceptions blocked.
+
 2004-03-22  David Hyatt  <hyatt at apple.com>
 
 	Wire up NSSearchField to WebCore.  Add support for placeholder strings, autosaving of recent items, the ability to show/hide
diff --git a/WebCore/kwq/KWQLineEdit.mm b/WebCore/kwq/KWQLineEdit.mm
index f8263a4..92204fc 100644
--- a/WebCore/kwq/KWQLineEdit.mm
+++ b/WebCore/kwq/KWQLineEdit.mm
@@ -39,9 +39,8 @@ QLineEdit::QLineEdit(Type type)
     , m_performSearch(this, SIGNAL(performSearch()))
     , m_type(type)
 {
-    id view = nil;
-
     KWQ_BLOCK_EXCEPTIONS;
+    id view = nil;
     switch (type) {
         case Normal:
             view = [KWQTextField alloc];
@@ -53,6 +52,7 @@ QLineEdit::QLineEdit(Type type)
             view = [KWQSearchField alloc];
             break;
     }
+    ASSERT(view);
     [view initWithQLineEdit:this];
     m_controller = [view controller];
     setView(view);

-- 
WebKit Debian packaging