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

cblu cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:53:03 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit f8a97ce1c95c064231f5e84931a893e69c78c1ba
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 12 02:19:20 2001 +0000

    Added another .copy() to get around Gramp's + QConstString problem
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@491 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/khtml/html/html_objectimpl.cpp b/WebCore/khtml/html/html_objectimpl.cpp
index 2d54688..37becc9 100644
--- a/WebCore/khtml/html/html_objectimpl.cpp
+++ b/WebCore/khtml/html/html_objectimpl.cpp
@@ -207,7 +207,11 @@ void HTMLEmbedElementImpl::parseAttribute(AttrImpl *attr)
         break;
      case ATTR_CODE:
      case ATTR_SRC:
+#ifdef _KWQ_
+         url = khtml::parseURL(attr->val()).string().copy();
+#else
          url = khtml::parseURL(attr->val()).string();
+#endif
          break;
      case ATTR_WIDTH:
         addCSSLength( CSS_PROP_WIDTH, attr->value() );
diff --git a/WebCore/src/kdelibs/khtml/html/html_objectimpl.cpp b/WebCore/src/kdelibs/khtml/html/html_objectimpl.cpp
index 2d54688..37becc9 100644
--- a/WebCore/src/kdelibs/khtml/html/html_objectimpl.cpp
+++ b/WebCore/src/kdelibs/khtml/html/html_objectimpl.cpp
@@ -207,7 +207,11 @@ void HTMLEmbedElementImpl::parseAttribute(AttrImpl *attr)
         break;
      case ATTR_CODE:
      case ATTR_SRC:
+#ifdef _KWQ_
+         url = khtml::parseURL(attr->val()).string().copy();
+#else
          url = khtml::parseURL(attr->val()).string();
+#endif
          break;
      case ATTR_WIDTH:
         addCSSLength( CSS_PROP_WIDTH, attr->value() );

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list