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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 7ac73f3c771b3a2b3628043c58bbb64ffe52d64c
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Apr 2 22:08:18 2002 +0000

            Fixed a fix, shoulda' been a #ifndef to exclude unnecessary code.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@939 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 1b4ee8a..84498c4 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,11 @@
 2002-04-02  Richard Williamson  <rjw at apple.com>
 
+        Fixed a fix, shoulda' been a #ifndef to exclude unnecessary code.
+        
+	* src/kdelibs/khtml/rendering/render_replaced.cpp: (RenderWidget::detach):
+
+2002-04-02  Richard Williamson  <rjw at apple.com>
+
         More noisy bulletproofing.  Still need to find source of problem.
         
 	* src/kwq/KWQKHTMLPart.mm: (KHTMLPart::~KHTMLPart), (KHTMLPart::slotData),
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 1b4ee8a..84498c4 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,11 @@
 2002-04-02  Richard Williamson  <rjw at apple.com>
 
+        Fixed a fix, shoulda' been a #ifndef to exclude unnecessary code.
+        
+	* src/kdelibs/khtml/rendering/render_replaced.cpp: (RenderWidget::detach):
+
+2002-04-02  Richard Williamson  <rjw at apple.com>
+
         More noisy bulletproofing.  Still need to find source of problem.
         
 	* src/kwq/KWQKHTMLPart.mm: (KHTMLPart::~KHTMLPart), (KHTMLPart::slotData),
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 1b4ee8a..84498c4 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,11 @@
 2002-04-02  Richard Williamson  <rjw at apple.com>
 
+        Fixed a fix, shoulda' been a #ifndef to exclude unnecessary code.
+        
+	* src/kdelibs/khtml/rendering/render_replaced.cpp: (RenderWidget::detach):
+
+2002-04-02  Richard Williamson  <rjw at apple.com>
+
         More noisy bulletproofing.  Still need to find source of problem.
         
 	* src/kwq/KWQKHTMLPart.mm: (KHTMLPart::~KHTMLPart), (KHTMLPart::slotData),
diff --git a/WebCore/khtml/rendering/render_replaced.cpp b/WebCore/khtml/rendering/render_replaced.cpp
index ef55f05..49bd9d6 100644
--- a/WebCore/khtml/rendering/render_replaced.cpp
+++ b/WebCore/khtml/rendering/render_replaced.cpp
@@ -142,7 +142,7 @@ void RenderWidget::detach()
         if ( m_view )
             m_view->removeChild( m_widget );
 
-#ifdef APPLE_CHANGES
+#ifndef APPLE_CHANGES
         // References the widget here is not safe.
         m_widget->removeEventFilter( this );
         m_widget->setMouseTracking( false );
diff --git a/WebCore/src/kdelibs/khtml/rendering/render_replaced.cpp b/WebCore/src/kdelibs/khtml/rendering/render_replaced.cpp
index ef55f05..49bd9d6 100644
--- a/WebCore/src/kdelibs/khtml/rendering/render_replaced.cpp
+++ b/WebCore/src/kdelibs/khtml/rendering/render_replaced.cpp
@@ -142,7 +142,7 @@ void RenderWidget::detach()
         if ( m_view )
             m_view->removeChild( m_widget );
 
-#ifdef APPLE_CHANGES
+#ifndef APPLE_CHANGES
         // References the widget here is not safe.
         m_widget->removeEventFilter( this );
         m_widget->setMouseTracking( false );

-- 
WebKit Debian packaging