[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.4/kdelibs/khtml/rendering
From:       Maks Orlovich <maksim () kde ! org>
Date:       2010-05-16 15:56:21
Message-ID: 20100516155621.535A4AC8B5 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1127443 by orlovich:

Backport: don't double-escape URLs.
Thanks to reavertm for testing.

BUG: 237734


 M  +4 -4      render_media.cpp  


--- branches/KDE/4.4/kdelibs/khtml/rendering/render_media.cpp #1127442:1127443
@@ -95,14 +95,14 @@
 {
     RenderWidget::updateFromElement();
 
-    QUrl url = mediaElement()->src().string();
-    if (player()->mediaObject()->currentSource().url() != url) {
+    KUrl kurl(mediaElement()->src().string());
+    if (player()->mediaObject()->currentSource().url() != kurl) {
         if (!document()->docLoader()->willLoadMediaElement(mediaElement()->src()))
             return;
         if (mediaElement()->autoplay()) 
-            player()->play(url);
+            player()->play(kurl);
         else
-            player()->load(url);            
+            player()->load(kurl);            
     }
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]